libavcodec.hg: h264.c comparison

comparison h264.c @ 5798:7b058e5183ab libavcodec

Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture. Part of PAFF implementation. patch by Jeff Downs, heydowns a borg d com original thread: Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264 Date: 18/09/07 20:30

author	andoma
date	Mon, 08 Oct 2007 17:44:38 +0000
parents	cd21fd29cf7c
children	0be16259b7d8

comparison

equal deleted inserted replaced

-:cd21fd29cf7c
+:7b058e5183ab
 h->delayed_output_pic->reference= 0;
 h->delayed_output_pic= NULL;
 idr(h);
 if(h->s.current_picture_ptr)
 h->s.current_picture_ptr->reference= 0;
+h->s.first_field= 0;
 }
 /**
 * Find a Picture in the short term reference list by frame number.
 * @param frame_num frame number to search for
 memcpy(dst->block_offset,     src->block_offset, sizeof(dst->block_offset));
 dst->s.current_picture_ptr  = src->s.current_picture_ptr;
 dst->s.current_picture      = src->s.current_picture;
 dst->s.linesize             = src->s.linesize;
 dst->s.uvlinesize           = src->s.uvlinesize;
+dst->s.first_field          = src->s.first_field;
 dst->prev_poc_msb           = src->prev_poc_msb;
 dst->prev_poc_lsb           = src->prev_poc_lsb;
 dst->prev_frame_num_offset  = src->prev_frame_num_offset;
 dst->prev_frame_num         = src->prev_frame_num;
 *
 * @return 0 if okay, <0 if an error occured, 1 if decoding must not be multithreaded
 */
 static int decode_slice_header(H264Context *h, H264Context *h0){
 MpegEncContext * const s = &h->s;
+MpegEncContext * const s0 = &h0->s;
 unsigned int first_mb_in_slice;
 unsigned int pps_id;
 int num_ref_idx_active_override_flag;
 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE};
 unsigned int slice_type, tmp, i;
 int default_ref_list_done = 0;
+int last_pic_structure;
 s->dropable= h->nal_ref_idc == 0;
 first_mb_in_slice= get_ue_golomb(&s->gb);
 if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){
 h0->current_slice = 0;
+if (!s0->first_field)
 s->current_picture_ptr= NULL;
 }
 slice_type= get_ue_golomb(&s->gb);
 if(slice_type > 9){
 if (!s->context_initialized) {
 if(h != h0)
 return -1;  // we cant (re-)initialize context during parallel decoding
 if (MPV_common_init(s) < 0)
 return -1;
+s->first_field = 0;
 init_scan_tables(h);
 alloc_tables(h);
 for(i = 1; i < s->avctx->thread_count; i++) {
 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
 h->mb_mbaff = 0;
 h->mb_aff_frame = 0;
+last_pic_structure = s0->picture_structure;
 if(h->sps.frame_mbs_only_flag){
 s->picture_structure= PICT_FRAME;
 }else{
 if(get_bits1(&s->gb)) { //field_pic_flag
 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
 h->mb_aff_frame = h->sps.mb_aff;
 }
 }
 if(h0->current_slice == 0){
-if(frame_start(h) < 0)
+/* See if we have a decoded first field looking for a pair... */
+if (s0->first_field) {
+assert(s0->current_picture_ptr);
+assert(s0->current_picture_ptr->data[0]);
+assert(s0->current_picture_ptr->reference != DELAYED_PIC_REF);
+/* figure out if we have a complementary field pair */
+if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
+/*
+* Previous field is unmatched. Don't display it, but let it
+* remain for reference if marked as such.
+*/
+s0->current_picture_ptr = NULL;
+s0->first_field = FIELD_PICTURE;
+} else {
+if (h->nal_ref_idc &&
+s0->current_picture_ptr->reference &&
+s0->current_picture_ptr->frame_num != h->frame_num) {
+/*
+* This and previous field were reference, but had
+* different frame_nums. Consider this field first in
+* pair. Throw away previous field except for reference
+* purposes.
+*/
+s0->first_field = 1;
+s0->current_picture_ptr = NULL;
+} else {
+/* Second field in complementary pair */
+s0->first_field = 0;
+}
+}
+} else {
+/* Frame or first field in a potentially complementary pair */
+assert(!s0->current_picture_ptr);
+s0->first_field = FIELD_PICTURE;
+}
+if((!FIELD_PICTURE || s0->first_field) && frame_start(h) < 0) {
+s0->first_field = 0;
 return -1;
+}
 }
 if(h != h0)
 clone_slice(h, h0);
 s->current_picture_ptr->frame_num= h->frame_num; //FIXME frame_num cleanup
 /* pull back stuff from slices to master context */
 hx = h->thread_context[context_count - 1];
 s->mb_x = hx->s.mb_x;
 s->mb_y = hx->s.mb_y;
+s->dropable = hx->s.dropable;
+s->picture_structure = hx->s.picture_structure;
 for(i = 1; i < context_count; i++)
 h->s.error_count += h->thread_context[i]->s.error_count;
 }
 }
 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
 }
 #endif
 if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
 h->current_slice = 0;
+if (!s->first_field)
 s->current_picture_ptr= NULL;
 }
 for(;;){
 int consumed;
 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
 s->current_picture_ptr->pict_type= s->pict_type;
 h->prev_frame_num_offset= h->frame_num_offset;
 h->prev_frame_num= h->frame_num;
-if(s->current_picture_ptr->reference & s->picture_structure){
+if(!s->dropable) {
 h->prev_poc_msb= h->poc_msb;
 h->prev_poc_lsb= h->poc_lsb;
 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
 }
+/*
+* FIXME: Error handling code does not seem to support interlaced
+* when slices span multiple rows
+* The ff_er_add_slice calls don't work right for bottom
+* fields; they cause massive erroneous error concealing
+* Error marking covers both fields (top and bottom).
+* This causes a mismatched s->error_count
+* and a bad error table. Further, the error count goes to
+* INT_MAX when called for bottom field, because mb_y is
+* past end by one (callers fault) and resync_mb_y != 0
+* causes problems for the first MB line, too.
+*/
+if (!FIELD_PICTURE)
 ff_er_frame_end(s);
 MPV_frame_end(s);
+if (s->first_field) {
+/* Wait for second field. */
+*data_size = 0;
+} else {
 //FIXME do something with unavailable reference frames
 #if 0 //decode order
 *data_size = sizeof(AVFrame);
 #else
 if(out)
 *pict= *(AVFrame*)out;
 else
 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
+}
 }
 assert(pict->data[0] || !*data_size);
 ff_print_debug_info(s, pict);
 //printf("out %d\n", (int)pict->data[0]);

Mercurial > libavcodec.hg

comparison h264.c @ 5798:7b058e5183ab libavcodec