Mercurial > libavcodec.hg

diff vp8data.h @ 11990:3c51d7ac41c9 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify MV parsing, removes laying out 2 or 4 (16x8/8x8/8x16) MVs over all 16 subblocks (since we no longer need that), which should also lead to a minor speedup.
author rbultje
date Mon, 28 Jun 2010 16:04:14 +0000
parents 176c5deb6756
children cf675a4d5195
line wrap: on
line diff
--- a/vp8data.h	Mon Jun 28 13:50:55 2010 +0000
+++ b/vp8data.h	Mon Jun 28 16:04:14 2010 +0000
@@ -67,6 +67,7 @@
     VP8_SPLITMVMODE_8x16,        ///< 2 8x16 blocks (horizontal)
     VP8_SPLITMVMODE_8x8,         ///< 2x2 blocks of 8x8px each
     VP8_SPLITMVMODE_4x4,         ///< 4x4 blocks of 4x4px each
+    VP8_SPLITMVMODE_NONE,        ///< (only used in prediction) no split MVs
 };
 
 static const uint8_t vp8_pred4x4_mode[] =
@@ -119,7 +120,7 @@
       { -6, -7 }                            // '110', '111'
 };
 
-static const uint8_t vp8_mbsplits[4][16] = {
+static const uint8_t vp8_mbsplits[5][16] = {
     {  0,  0,  0,  0,  0,  0,  0,  0,
        1,  1,  1,  1,  1,  1,  1,  1  },
     {  0,  0,  1,  1,  0,  0,  1,  1,
@@ -127,7 +128,9 @@
     {  0,  0,  1,  1,  0,  0,  1,  1,
        2,  2,  3,  3,  2,  2,  3,  3  },
     {  0,  1,  2,  3,  4,  5,  6,  7,
-       8,  9, 10, 11, 12, 13, 14, 15  }
+       8,  9, 10, 11, 12, 13, 14, 15  },
+    {  0,  0,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  0,  0,  0  }
 };
 
 static const uint8_t vp8_mbfirstidx[4][16] = {