Handle Theora's continued runs in superblock coding.
authorDavid Conrad <lessen42@gmail.com>
Sun, 21 Feb 2010 00:10:58 +0000 (00:10 +0000)
committerDavid Conrad <lessen42@gmail.com>
Sun, 21 Feb 2010 00:10:58 +0000 (00:10 +0000)
This doesn't really matter yet since 4:2:0 1080p has only 3060 superblocks,
but larger resolutions or 4:4:4 1080p could hit this case.

Originally committed as revision 21930 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/vp3.c

index 5f871bc..18c6f24 100644 (file)
@@ -482,6 +482,9 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
             if (bit)
                 num_partial_superblocks += current_run;
 
+            if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN)
+                bit = get_bits1(gb);
+            else
                 bit ^= 1;
         }
 
@@ -512,6 +515,9 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
                 }
                 superblocks_decoded += current_run;
 
+                if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN)
+                    bit = get_bits1(gb);
+                else
                     bit ^= 1;
             }
         }