Mercurial > libavformat.hg

changeset 2073:59c2badf702a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix display of theora videos with visible size smaller than encoded size
author aurel
date Mon, 07 May 2007 15:43:01 +0000
parents d20edf2ef6d4
children 5a9a03da8fba
files oggparsetheora.c
diffstat 1 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/oggparsetheora.c	Mon May 07 13:30:08 2007 +0000
+++ b/oggparsetheora.c	Mon May 07 15:43:01 2007 +0000
@@ -53,6 +53,7 @@
 
     if (os->buf[os->pstart] == 0x80) {
         GetBitContext gb;
+        int width, height;
         int version;
 
         init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
@@ -70,13 +71,21 @@
             return -1;
         }
 
-        st->codec->width = get_bits(&gb, 16) << 4;
-        st->codec->height = get_bits(&gb, 16) << 4;
+        width  = get_bits(&gb, 16) << 4;
+        height = get_bits(&gb, 16) << 4;
+        avcodec_set_dimensions(st->codec, width, height);
 
         if (version >= 0x030400)
-            skip_bits(&gb, 164);
-        else if (version >= 0x030200)
-            skip_bits(&gb, 64);
+            skip_bits(&gb, 100);
+
+        width  = get_bits_long(&gb, 24);
+        height = get_bits_long(&gb, 24);
+        if (   width  <= st->codec->width  && width  > st->codec->width-16
+            && height <= st->codec->height && height > st->codec->height-16)
+            avcodec_set_dimensions(st->codec, width, height);
+
+        if (version >= 0x030200)
+            skip_bits(&gb, 16);
         st->codec->time_base.den = get_bits(&gb, 32);
         st->codec->time_base.num = get_bits(&gb, 32);
         st->time_base = st->codec->time_base;