Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 19:34:59 +0000 (21:34 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 19:34:59 +0000 (21:34 +0200)
* commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7':
  mpegvideo_parser: export pixel format and dimensions

Conflicts:
libavcodec/mpegvideo_parser.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/mpegvideo_parser.c

@@@ -44,9 -44,8 +44,11 @@@ static void mpegvideo_extract_headers(A
      int top_field_first, repeat_first_field, progressive_frame;
      int horiz_size_ext, vert_size_ext, bit_rate_ext;
      int did_set_size=0;
 +    int set_dim_ret = 0;
 +    int bit_rate = 0;
 +    int vbv_delay = 0;
+     int chroma_format;
+     enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE;
  //FIXME replace the crap with get_bits()
      s->repeat_pict = 0;
  
                  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){
 -                    ff_set_dimensions(avctx, pc->width, pc->height);
 +                    set_dim_ret = ff_set_dimensions(avctx, pc->width, pc->height);
                      did_set_size=1;
                  }
+                 pix_fmt = AV_PIX_FMT_YUV420P;
                  frame_rate_index = buf[3] & 0xf;
                  pc->frame_rate = avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_index];
 -                avctx->bit_rate = ((buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6))*400;
 +                bit_rate = (buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6);
                  avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
 +                avctx->ticks_per_frame = 1;
              }
              break;
          case EXT_START_CODE:
                          pc->progressive_sequence = buf[1] & (1 << 3);
                          avctx->has_b_frames= !(buf[5] >> 7);
  
 -                        pc->width  |=(horiz_size_ext << 12);
 -                        pc->height |=( vert_size_ext << 12);
 -                        avctx->bit_rate += (bit_rate_ext << 18) * 400;
+                         chroma_format = (buf[1] >> 1) & 3;
+                         switch (chroma_format) {
+                         case 1: pix_fmt = AV_PIX_FMT_YUV420P; break;
+                         case 2: pix_fmt = AV_PIX_FMT_YUV422P; break;
+                         case 3: pix_fmt = AV_PIX_FMT_YUV444P; break;
+                         }
 +                        pc->width  = (pc->width & 0xFFF) | (horiz_size_ext << 12);
 +                        pc->height = (pc->height& 0xFFF) | ( vert_size_ext << 12);
 +                        bit_rate = (bit_rate&0x3FFFF) | (bit_rate_ext << 18);
                          if(did_set_size)
 -                            ff_set_dimensions(avctx, pc->width, pc->height);
 -                        avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1) * 2;
 +                            set_dim_ret = ff_set_dimensions(avctx, pc->width, pc->height);
 +                        avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1);
                          avctx->framerate.den = pc->frame_rate.den * (frame_rate_ext_d + 1);
                          avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
 +                        avctx->ticks_per_frame = 2;
                      }
                      break;
                  case 0x8: /* picture coding extension */
          }
      }
   the_end: ;
 +    if (set_dim_ret < 0)
 +        av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions\n");
 +
 +    if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate) {
 +        avctx->rc_max_rate = 400*bit_rate;
 +    }
 +    if (bit_rate &&
 +        ((avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && bit_rate != 0x3FFFF) || vbv_delay != 0xFFFF)) {
 +        avctx->bit_rate = 400*bit_rate;
 +    }
+     if (pix_fmt != AV_PIX_FMT_NONE) {
+         s->format = pix_fmt;
+         s->width  = s->coded_width  = pc->width;
+         s->height = s->coded_height = pc->height;
+     }
  #if FF_API_AVCTX_TIMEBASE
      if (avctx->framerate.num)
 -        avctx->time_base = av_inv_q(avctx->framerate);
 +        avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1}));
  #endif
  }