diff options
| author | Haruhiko Yamagata <h.yamagata@nifty.com> | 2009-06-23 21:03:35 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-23 21:03:35 +0000 |
| commit | 2722c3a30d6c0b4fa41b48a356f4e1b6fac7ab12 (patch) | |
| tree | 7daa5a288f451686d6c3e60a17afd4249b8e2e01 | |
| parent | ce9dd8f50986e361bea5cfb15358b58e962160b9 (diff) | |
| download | ffmpeg-2722c3a30d6c0b4fa41b48a356f4e1b6fac7ab12.tar.gz | |
Fix H.264 picture reordering, 2nd try.
First, reverted one was r19239.
Patch by Haruhiko Yamagata, h D yamagata A nifty D com
Originally committed as revision 19258 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 55553ed313..368ccbfb10 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2240,6 +2240,7 @@ static int frame_start(H264Context *h){ * 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 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ 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 @@ static int decode_frame(AVCodecContext *avctx, //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 @@ static int decode_frame(AVCodecContext *avctx, 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; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 61ecc18a42..791dfc6c3b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -116,6 +116,7 @@ typedef struct Picture{ int field_poc[2]; ///< h264 top/bottom POC int poc; ///< h264 frame POC int frame_num; ///< h264 frame_num (raw frame_num from slice header) + int mmco_reseted; ///< h264 MMCO_RESET set this 1. Reordering code must not mix pictures before and after MMCO_RESET. int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num, pic_num & max_pic_num; long -> long_pic_num) */ int long_ref; ///< 1->long term reference 0->short term reference |