diff options
Diffstat (limited to 'libavcodec/mpegvideo_parser.c')
| -rw-r--r-- | libavcodec/mpegvideo_parser.c | 55 |
1 files changed, 41 insertions, 14 deletions
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 37808c6..f5ac63f 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -3,20 +3,20 @@ * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -44,6 +44,9 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, 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() @@ -57,6 +60,8 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, case PICTURE_START_CODE: if (bytes_left >= 2) { s->pict_type = (buf[1] >> 3) & 7; + if (bytes_left >= 4) + vbv_delay = ((buf[1] & 0x07) << 13) | (buf[2] << 5) | (buf[3] >> 3); } break; case SEQ_START_CODE: @@ -64,14 +69,15 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, 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: @@ -95,14 +101,15 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, case 3: pix_fmt = AV_PIX_FMT_YUV444P; break; } - pc->width |=(horiz_size_ext << 12); - pc->height |=( vert_size_ext << 12); - avctx->bit_rate += (bit_rate_ext << 18) * 400; + 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 */ @@ -148,6 +155,16 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, } } 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; @@ -157,7 +174,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, #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 } @@ -187,7 +204,7 @@ static int mpegvideo_parse(AVCodecParserContext *s, function should be negligible for uncorrupted streams */ mpegvideo_extract_headers(s, avctx, buf, buf_size); ff_dlog(NULL, "pict_type=%d frame_rate=%0.3f repeat_pict=%d\n", - s->pict_type, (double)avctx->time_base.den / avctx->time_base.num, s->repeat_pict); + s->pict_type, av_q2d(avctx->framerate), s->repeat_pict); *poutbuf = buf; *poutbuf_size = buf_size; @@ -199,18 +216,28 @@ static int mpegvideo_split(AVCodecContext *avctx, { int i; uint32_t state= -1; + int found=0; for(i=0; i<buf_size; i++){ state= (state<<8) | buf[i]; - if(state != 0x1B3 && state != 0x1B5 && state < 0x200 && state >= 0x100) + if(state == 0x1B3){ + found=1; + }else if(found && state != 0x1B5 && state < 0x200 && state >= 0x100) return i-3; } return 0; } +static int mpegvideo_parse_init(AVCodecParserContext *s) +{ + s->pict_type = AV_PICTURE_TYPE_NONE; // first frame might be partial + return 0; +} + AVCodecParser ff_mpegvideo_parser = { .codec_ids = { AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO }, .priv_data_size = sizeof(struct MpvParseContext), + .parser_init = mpegvideo_parse_init, .parser_parse = mpegvideo_parse, .parser_close = ff_parse_close, .split = mpegvideo_split, |
