diff options
Diffstat (limited to 'libavcodec/mpegvideo_parser.c')
| -rw-r--r-- | libavcodec/mpegvideo_parser.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index bec1b36975..7aa3660f7f 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,8 @@ 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 bit_rate = 0; + int vbv_delay = 0; //FIXME replace the crap with get_bits() s->repeat_pict = 0; @@ -55,6 +57,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: @@ -68,7 +72,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, frame_rate_index = buf[3] & 0xf; pc->frame_rate.den = avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_index].num; pc->frame_rate.num = avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_index].den; - 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; } break; @@ -88,7 +92,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, pc->width |=(horiz_size_ext << 12); pc->height |=( vert_size_ext << 12); - avctx->bit_rate += (bit_rate_ext << 18) * 400; + bit_rate = (bit_rate&0x3FFFF) | (bit_rate_ext << 18); if(did_set_size) ff_set_dimensions(avctx, pc->width, pc->height); avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1) * 2; @@ -139,6 +143,12 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, } } the_end: ; + if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate) { + avctx->rc_max_rate = 400*bit_rate; + } else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && bit_rate && + (bit_rate != 0x3FFFF || vbv_delay != 0xFFFF)) { + avctx->bit_rate = 400*bit_rate; + } } static int mpegvideo_parse(AVCodecParserContext *s, @@ -179,18 +189,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, |