diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2010-06-28 16:04:14 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-06-28 16:04:14 +0000 |
| commit | 7ed06b2be85b273f7ae4339b80dfda987a13b4b8 (patch) | |
| tree | 975d39dee2cbbd889c412e9d23c4dcdbfcd5e852 /libavcodec/vp8data.h | |
| parent | 7c4dcf81658103b9506adcbf848bd23efe3b0b4e (diff) | |
| download | ffmpeg-7ed06b2be85b273f7ae4339b80dfda987a13b4b8.tar.gz | |
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.
Originally committed as revision 23854 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp8data.h')
| -rw-r--r-- | libavcodec/vp8data.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 5c9dc6e9ba..e8bd82da79 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -67,6 +67,7 @@ enum inter_splitmvmode { 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 @@ static const int8_t vp8_small_mvtree[7][2] = { { -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 @@ static const uint8_t vp8_mbsplits[4][16] = { { 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] = { |