Commit 0b2346d3 authored by Michael Niedermayer's avatar Michael Niedermayer

lowres fixes for the parser

Originally committed as revision 3521 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8b392ae2
...@@ -297,8 +297,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, ...@@ -297,8 +297,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
break; break;
case SEQ_START_CODE: case SEQ_START_CODE:
if (bytes_left >= 4) { if (bytes_left >= 4) {
pc->width = avctx->width = (buf[0] << 4) | (buf[1] >> 4); pc->width = (buf[0] << 4) | (buf[1] >> 4);
pc->height = avctx->height = ((buf[1] & 0x0f) << 8) | buf[2]; pc->height = ((buf[1] & 0x0f) << 8) | buf[2];
avctx->width = -((-pc->width )>>avctx->lowres);
avctx->height = -((-pc->height)>>avctx->lowres);
frame_rate_index = buf[3] & 0xf; frame_rate_index = buf[3] & 0xf;
pc->frame_rate = avctx->frame_rate = frame_rate_tab[frame_rate_index]; pc->frame_rate = avctx->frame_rate = frame_rate_tab[frame_rate_index];
avctx->frame_rate_base = MPEG1_FRAME_RATE_BASE; avctx->frame_rate_base = MPEG1_FRAME_RATE_BASE;
...@@ -318,8 +320,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, ...@@ -318,8 +320,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
frame_rate_ext_d = (buf[5] & 0x1f); frame_rate_ext_d = (buf[5] & 0x1f);
pc->progressive_sequence = buf[1] & (1 << 3); pc->progressive_sequence = buf[1] & (1 << 3);
avctx->width = pc->width | (horiz_size_ext << 12); pc->width |=(horiz_size_ext << 12);
avctx->height = pc->height | (vert_size_ext << 12); pc->height |=( vert_size_ext << 12);
avctx->width = -((-pc->width )>>avctx->lowres);
avctx->height = -((-pc->height)>>avctx->lowres);
avctx->frame_rate = pc->frame_rate * (frame_rate_ext_n + 1); avctx->frame_rate = pc->frame_rate * (frame_rate_ext_n + 1);
avctx->frame_rate_base = MPEG1_FRAME_RATE_BASE * (frame_rate_ext_d + 1); avctx->frame_rate_base = MPEG1_FRAME_RATE_BASE * (frame_rate_ext_d + 1);
avctx->codec_id = CODEC_ID_MPEG2VIDEO; avctx->codec_id = CODEC_ID_MPEG2VIDEO;
...@@ -437,8 +441,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1, ...@@ -437,8 +441,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
init_get_bits(gb, buf, 8 * buf_size); init_get_bits(gb, buf, 8 * buf_size);
ret = ff_mpeg4_decode_picture_header(s, gb); ret = ff_mpeg4_decode_picture_header(s, gb);
if (s->width) { if (s->width) {
avctx->width = s->width; avctx->width = -((-s->width )>>avctx->lowres);
avctx->height = s->height; avctx->height = -((-s->height)>>avctx->lowres);
} }
pc->first_picture = 0; pc->first_picture = 0;
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment