virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

vp3: Read fps and aspect ratio in the decoder

Browse Source 
Originally committed as revision 22898 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad
2010-04-17 02:04:39 +00:00
parent ddc7e438e0
commit 8099d6c985
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/vp3.c
View File

@@ -1953,6 +1953,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
Vp3DecodeContext *s = avctx->priv_data; Vp3DecodeContext *s = avctx->priv_data;
int visible_width, visible_height, colorspace; int visible_width, visible_height, colorspace;
int offset_x = 0, offset_y = 0; int offset_x = 0, offset_y = 0;
AVRational fps;
s->theora = get_bits_long(gb, 24); s->theora = get_bits_long(gb, 24);
av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora); av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
@@ -1982,10 +1983,15 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
offset_y = get_bits(gb, 8); /* offset y, from bottom */ offset_y = get_bits(gb, 8); /* offset y, from bottom */
} }
skip_bits(gb, 32); /* fps numerator */ fps.num = get_bits_long(gb, 32);
skip_bits(gb, 32); /* fps denumerator */ fps.den = get_bits_long(gb, 32);
skip_bits(gb, 24); /* aspect numerator */ if (fps.num && fps.den) {
skip_bits(gb, 24); /* aspect denumerator */ av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
fps.den, fps.num, INT_MAX);
}
avctx->sample_aspect_ratio.num = get_bits_long(gb, 24);
avctx->sample_aspect_ratio.den = get_bits_long(gb, 24);
if (s->theora < 0x030200) if (s->theora < 0x030200)
skip_bits(gb, 5); /* keyframe frequency force */ skip_bits(gb, 5); /* keyframe frequency force */