do not fail if correct is not recognized

[ffmpeg] / libavformat / oggparsetheora.c

diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 9052bbbea060d945a75fb11cbd87ecb36405f94c..36848b15883e3c439bfdde2ca63e3fa2d8a16ef6 100644 (file)
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -23,10 +23,10 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
-#include "ogg2.h"
+#include "oggdec.h"
 
 typedef struct theora_params {
     int gpshift;
@@ -53,16 +53,14 @@ theora_header (AVFormatContext * s, int idx)
 
     if (os->buf[os->pstart] == 0x80) {
         GetBitContext gb;
+        int width, height;
         int version;
 
         init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
 
         skip_bits(&gb, 7*8); /* 0x80"theora" */
 
-        version = get_bits(&gb, 8) << 16;
-        version |= get_bits(&gb, 8) << 8;
-        version |= get_bits(&gb, 8);
-
+        version = get_bits_long(&gb, 24);
         if (version < 0x030100)
         {
             av_log(s, AV_LOG_ERROR,
@@ -70,19 +68,27 @@ theora_header (AVFormatContext * s, int idx)
             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);
-        st->codec->time_base.den = get_bits(&gb, 32);
-        st->codec->time_base.num = get_bits(&gb, 32);
+            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_long(&gb, 32);
+        st->codec->time_base.num = get_bits_long(&gb, 32);
         st->time_base = st->codec->time_base;
 
-        st->codec->sample_aspect_ratio.num = get_bits(&gb, 24);
-        st->codec->sample_aspect_ratio.den = get_bits(&gb, 24);
+        st->codec->sample_aspect_ratio.num = get_bits_long(&gb, 24);
+        st->codec->sample_aspect_ratio.den = get_bits_long(&gb, 24);
 
         if (version >= 0x030200)
             skip_bits(&gb, 38);
@@ -118,6 +124,9 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp)
     uint64_t iframe = gp >> thp->gpshift;
     uint64_t pframe = gp & thp->gpmask;
 
+    if(!pframe)
+        os->pflags |= PKT_FLAG_KEY;
+
     return iframe + pframe;
 }