Mercurial > libavcodec.hg
diff h264.c @ 9883:ffc0f9de5743 libavcodec
Fix H.264 picture reordering, 2nd try.
First, reverted one was r19239.
Patch by Haruhiko Yamagata, h D yamagata A nifty D com
author | cehoyos |
---|---|
date | Tue, 23 Jun 2009 21:03:35 +0000 |
parents | 7c769effb964 |
children | f86df3ebfef7 |
line wrap: on
line diff
--- a/h264.c Tue Jun 23 18:17:15 2009 +0000 +++ b/h264.c Tue Jun 23 21:03:35 2009 +0000 @@ -2240,6 +2240,7 @@ * See decode_nal_units(). */ s->current_picture_ptr->key_frame= 0; + s->current_picture_ptr->mmco_reseted= 0; assert(s->linesize && s->uvlinesize); @@ -3369,6 +3370,7 @@ h->poc_msb= h->frame_num= s->current_picture_ptr->frame_num= 0; + s->current_picture_ptr->mmco_reseted=1; break; default: assert(0); } @@ -7708,7 +7710,7 @@ //FIXME factorize this with the output code below out = h->delayed_pic[0]; out_idx = 0; - for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++) + for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reseted; i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i; @@ -7884,12 +7886,12 @@ out = h->delayed_pic[0]; out_idx = 0; - for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++) + for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reseted; i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i; } - cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame; + cross_idr = !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reseted; out_of_order = !cross_idr && out->poc < h->outputed_poc;