diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-28 19:34:00 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-28 19:34:00 +0400 |
commit | f3160192cfbb8601a1db0de83b2ffc53478d8183 (patch) | |
tree | b09de09719f1ea0bae9fdbd42ca2619f9b2fb955 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h | |
parent | 4526a724d02ca93fa26f5eec7a83e0e2d5a9bfb1 (diff) |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2087 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h index f4651c577..60837cfe4 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h @@ -62,6 +62,13 @@ enum inter_submvmode { VP8_SUBMVMODE_NEW4X4 }; +enum inter_splitmvmode { + VP8_SPLITMVMODE_16x8 = 0, ///< 2 16x8 blocks (vertical) + VP8_SPLITMVMODE_8x16, ///< 2 8x16 blocks (horizontal) + VP8_SPLITMVMODE_8x8, ///< 2x2 blocks of 8x8px each + VP8_SPLITMVMODE_4x4, ///< 4x4 blocks of 4x4px each +}; + static const uint8_t vp8_pred4x4_mode[] = { /* MPC custom code start */ @@ -129,10 +136,10 @@ static const uint8_t vp8_mbfirstidx[4][16] = { }; static const int8_t vp8_mbsplit_tree[3][2] = { - { -3, 1 }, // '0' - 16 individual MVs - { -2, 2 }, // '10' - quarter-based MVs - { -0, -1 } // '110' - top/bottom MVs, - // '111' - left/right MVs + { -VP8_SPLITMVMODE_4x4, 1 }, // '0' - 16 individual MVs + { -VP8_SPLITMVMODE_8x8, 2 }, // '10' - quarter-based MVs + { -VP8_SPLITMVMODE_16x8, // '110' - top/bottom MVs + -VP8_SPLITMVMODE_8x16 } // '111' - left/right MVs }; static const uint8_t vp8_mbsplit_count[4] = { 2, 2, 4, 16 }; static const uint8_t vp8_mbsplit_prob[3] = { 110, 111, 150 }; |