diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-06 03:21:20 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-06 03:21:20 +0400 |
commit | 4e27c0a1fef17d73bac5f871dfe10e9ed3676f82 (patch) | |
tree | a4eddcd9712b190c96595c9ed3abe517e4ac3c4f /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h | |
parent | f4c3e8e426ef40a7b081434b2e87e00bc18762a7 (diff) |
revert r2200; it causes crashes
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2201 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 | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h index a64b7d5b4..1bdac16be 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp8data.h @@ -55,6 +55,13 @@ enum inter_mvmode { VP8_MVMODE_SPLIT }; +enum inter_submvmode { + VP8_SUBMVMODE_LEFT4X4, + VP8_SUBMVMODE_TOP4X4, + VP8_SUBMVMODE_ZERO4X4, + VP8_SUBMVMODE_NEW4X4 +}; + enum inter_splitmvmode { VP8_SPLITMVMODE_16x8 = 0, ///< 2 16x8 blocks (vertical) VP8_SPLITMVMODE_8x16, ///< 2 8x16 blocks (horizontal) @@ -104,6 +111,13 @@ static const int vp8_mode_contexts[6][4] = { { 234, 188, 128, 28 }, }; +static const int8_t vp8_pred16x16_tree_mvinter[4][2] = { + { -VP8_MVMODE_ZERO, 1 }, // '0' + { -VP8_MVMODE_NEAREST, 2 }, // '10' + { -VP8_MVMODE_NEAR, 3 }, // '110' + { -VP8_MVMODE_NEW, -VP8_MVMODE_SPLIT } // '1110', '1111' +}; + static const uint8_t vp8_mbsplits[5][16] = { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, @@ -123,6 +137,12 @@ static const uint8_t vp8_mbfirstidx[4][16] = { 8, 9, 10, 11, 12, 13, 14, 15 } }; +static const int8_t vp8_mbsplit_tree[3][2] = { + { -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 }; @@ -134,6 +154,12 @@ static const uint8_t vp8_submv_prob[5][3] = { { 208, 1, 1 } }; +static const int8_t vp8_submv_ref_tree[3][2] = { + { -VP8_SUBMVMODE_LEFT4X4, 1 }, // '0' + { -VP8_SUBMVMODE_TOP4X4, 2 }, // '10' + { -VP8_SUBMVMODE_ZERO4X4, -VP8_SUBMVMODE_NEW4X4 } // '110', '111' +}; + static const uint8_t vp8_pred16x16_prob_intra[4] = { 145, 156, 163, 128 }; static const uint8_t vp8_pred16x16_prob_inter[4] = { 112, 86, 140, 37 }; @@ -301,20 +327,6 @@ static const uint8_t vp8_coeff_band[16] = 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 }; -/* Inverse of vp8_coeff_band: mappings of bands to coefficient indexes. - * Each list is -1-terminated. */ -static const int8_t vp8_coeff_band_indexes[8][10] = -{ - {0, -1}, - {1, -1}, - {2, -1}, - {3, -1}, - {5, -1}, - {6, -1}, - {4, 7, 8, 9, 10, 11, 12, 13, 14, -1}, - {15, -1} -}; - static const uint8_t vp8_dct_cat1_prob[] = { 159, 0 }; static const uint8_t vp8_dct_cat2_prob[] = { 165, 145, 0 }; static const uint8_t vp8_dct_cat3_prob[] = { 173, 148, 140, 0 }; |