[FFmpeg-cvslog] r20736 - in trunk/libavcodec: mpeg4video_parser.c mpegvideo_parser.c

[michael]

Author: michael
Date: Sat Dec  5 04:53:12 2009
New Revision: 20736

Log:
Make sure the parsers do not overwrite width/height as this can interfere
with the decoder.
Fixes issue1135.

Modified:
   trunk/libavcodec/mpeg4video_parser.c
   trunk/libavcodec/mpegvideo_parser.c

Modified: trunk/libavcodec/mpeg4video_parser.c
==============================================================================
--- trunk/libavcodec/mpeg4video_parser.c	Sat Dec  5 00:30:34 2009	(r20735)
+++ trunk/libavcodec/mpeg4video_parser.c	Sat Dec  5 04:53:12 2009	(r20736)
@@ -82,7 +82,7 @@ static int av_mpeg4_decode_header(AVCode
 
     init_get_bits(gb, buf, 8 * buf_size);
     ret = ff_mpeg4_decode_picture_header(s, gb);
-    if (s->width) {
+    if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) {
         avcodec_set_dimensions(avctx, s->width, s->height);
     }
     s1->pict_type= s->pict_type;

Modified: trunk/libavcodec/mpegvideo_parser.c
==============================================================================
--- trunk/libavcodec/mpegvideo_parser.c	Sat Dec  5 00:30:34 2009	(r20735)
+++ trunk/libavcodec/mpegvideo_parser.c	Sat Dec  5 04:53:12 2009	(r20736)
@@ -34,6 +34,7 @@ static void mpegvideo_extract_headers(AV
     int frame_rate_ext_n, frame_rate_ext_d;
     int picture_structure, top_field_first, repeat_first_field, progressive_frame;
     int horiz_size_ext, vert_size_ext, bit_rate_ext;
+    int did_set_size=0;
 //FIXME replace the crap with get_bits()
     s->repeat_pict = 0;
     buf_end = buf + buf_size;
@@ -51,7 +52,10 @@ static void mpegvideo_extract_headers(AV
             if (bytes_left >= 7) {
                 pc->width  = (buf[0] << 4) | (buf[1] >> 4);
                 pc->height = ((buf[1] & 0x0f) << 8) | buf[2];
+                if(!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height){
                 avcodec_set_dimensions(avctx, pc->width, pc->height);
+                    did_set_size=1;
+                }
                 frame_rate_index = buf[3] & 0xf;
                 pc->frame_rate.den = avctx->time_base.den = ff_frame_rate_tab[frame_rate_index].num;
                 pc->frame_rate.num = avctx->time_base.num = ff_frame_rate_tab[frame_rate_index].den;
@@ -77,6 +81,7 @@ static void mpegvideo_extract_headers(AV
                         pc->width  |=(horiz_size_ext << 12);
                         pc->height |=( vert_size_ext << 12);
                         avctx->bit_rate += (bit_rate_ext << 18) * 400;
+                        if(did_set_size)
                         avcodec_set_dimensions(avctx, pc->width, pc->height);
                         avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1) * 2;
                         avctx->time_base.num = pc->frame_rate.num * (frame_rate_ext_d + 1);