Mercurial > libavcodec.hg

changeset 11639:5698bf13b8e1 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vp3: Read fps and aspect ratio in the decoder
author conrad
date Sat, 17 Apr 2010 02:04:39 +0000
parents fb475c791336
children 15ab6f3c18a4
files vp3.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/vp3.c	Sat Apr 17 02:04:35 2010 +0000
+++ b/vp3.c	Sat Apr 17 02:04:39 2010 +0000
@@ -1953,6 +1953,7 @@
     Vp3DecodeContext *s = avctx->priv_data;
     int visible_width, visible_height, colorspace;
     int offset_x = 0, offset_y = 0;
+    AVRational fps;
 
     s->theora = get_bits_long(gb, 24);
     av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
@@ -1982,10 +1983,15 @@
         offset_y = get_bits(gb, 8); /* offset y, from bottom */
     }
 
-    skip_bits(gb, 32); /* fps numerator */
-    skip_bits(gb, 32); /* fps denumerator */
-    skip_bits(gb, 24); /* aspect numerator */
-    skip_bits(gb, 24); /* aspect denumerator */
+    fps.num = get_bits_long(gb, 32);
+    fps.den = get_bits_long(gb, 32);
+    if (fps.num && fps.den) {
+        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)
         skip_bits(gb, 5); /* keyframe frequency force */