Commit c28dbdf6 authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Adds 1D transforms for ADST/FlipADST to make 16" into nextgenv2

parents d324c6b0 1b175593
......@@ -103,20 +103,6 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 7,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 8,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 9,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 10,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 11,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 12,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 13,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 14,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 15,
VPX_BITS_8, 256)));
#endif // !CONFIG_EXT_TX
#endif // HAVE_SSE2
......
......@@ -102,20 +102,6 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 7,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 8,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 9,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 10,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 11,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 12,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 13,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 14,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 15,
VPX_BITS_8, 16)));
#endif // !CONFIG_EXT_TX
#endif // HAVE_SSE2
......
......@@ -102,20 +102,6 @@ INSTANTIATE_TEST_CASE_P(
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 7,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 8,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 9,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 10,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 11,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 12,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 13,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 14,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 15,
VPX_BITS_8, 64)));
#endif // !CONFIG_EXT_TX
#endif // HAVE_SSE2
......
......@@ -383,10 +383,10 @@ static INLINE int supertx_enabled(const MB_MODE_INFO *mbmi) {
#define USE_MSKTX_FOR_32X32 0
static const int num_ext_tx_set_inter[EXT_TX_SETS_INTER] = {
1, 19, 12, 2
1, 16, 12, 2
};
static const int num_ext_tx_set_intra[EXT_TX_SETS_INTRA] = {
1, 17, 10
1, 12, 10
};
#if EXT_TX_SIZES == 4
......@@ -437,17 +437,17 @@ static const int use_inter_ext_tx_for_txsize[EXT_TX_SETS_INTER][TX_SIZES] = {
// Transform types used in each intra set
static const int ext_tx_used_intra[EXT_TX_SETS_INTRA][TX_TYPES] = {
{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, },
{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, },
{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0},
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0},
};
// Transform types used in each inter set
static const int ext_tx_used_inter[EXT_TX_SETS_INTER][TX_TYPES] = {
{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1},
{ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0},
{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1},
{1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
};
static INLINE int get_ext_tx_types(TX_SIZE tx_size, BLOCK_SIZE bs,
......
......@@ -836,47 +836,27 @@ static const vpx_prob default_switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS]
const vpx_tree_index vp10_ext_tx_inter_tree[EXT_TX_SETS_INTER]
[TREE_SIZE(TX_TYPES)] = {
{ // ToDo(yaowu): remove used entry 0.
-IDTX, 2,
-V_DCT, 4,
-H_DCT, 6,
-DCT_DCT, 8,
-DST_DST, 10,
12, 22,
14, 16,
-DST_DCT, -DCT_DST,
18, 20,
-ADST_DCT, -DCT_ADST,
-FLIPADST_DCT, -DCT_FLIPADST,
24, 30,
26, 28,
-DST_ADST, -ADST_DST,
-DST_FLIPADST, -FLIPADST_DST,
32, 34,
-ADST_ADST, -FLIPADST_FLIPADST,
-ADST_FLIPADST, -FLIPADST_ADST,
0
}, {
-IDTX, 2,
-V_DCT, 4,
-H_DCT, 6,
-DCT_DCT, 8,
-DST_DST, 10,
12, 22,
14, 16,
-DST_DCT, -DCT_DST,
18, 20,
4, 14,
6, 8,
-V_DCT, -H_DCT,
10, 12,
-V_ADST, -H_ADST,
-V_FLIPADST, -H_FLIPADST,
-DCT_DCT, 16,
18, 24,
20, 22,
-ADST_DCT, -DCT_ADST,
-FLIPADST_DCT, -DCT_FLIPADST,
24, 30,
26, 28,
-DST_ADST, -ADST_DST,
-DST_FLIPADST, -FLIPADST_DST,
32, 34,
-ADST_ADST, -FLIPADST_FLIPADST,
-ADST_FLIPADST, -FLIPADST_ADST,
-ADST_FLIPADST, -FLIPADST_ADST
}, {
-IDTX, 2,
-V_DCT, 4,
-H_DCT, 6,
4, 6,
-V_DCT, -H_DCT,
-DCT_DCT, 8,
10, 16,
12, 14,
......@@ -893,39 +873,19 @@ const vpx_tree_index vp10_ext_tx_inter_tree[EXT_TX_SETS_INTER]
const vpx_tree_index vp10_ext_tx_intra_tree[EXT_TX_SETS_INTRA]
[TREE_SIZE(TX_TYPES)] = {
{ // ToDo(yaowu): remove unused entry 0.
-IDTX, 2,
-DCT_DCT, 4,
-DST_DST, 6,
8, 18,
10, 12,
-DST_DCT, -DCT_DST,
14, 16,
-ADST_DCT, -DCT_ADST,
-FLIPADST_DCT, -DCT_FLIPADST,
20, 26,
22, 24,
-DST_ADST, -ADST_DST,
-DST_FLIPADST, -FLIPADST_DST,
28, 30,
-ADST_ADST, -FLIPADST_FLIPADST,
-ADST_FLIPADST, -FLIPADST_ADST,
0
}, {
-IDTX, 2,
-DCT_DCT, 4,
-DST_DST, 6,
8, 18,
10, 12,
-DST_DCT, -DCT_DST,
14, 16,
6, 8,
-V_DCT, -H_DCT,
10, 16,
12, 14,
-ADST_DCT, -DCT_ADST,
-FLIPADST_DCT, -DCT_FLIPADST,
20, 26,
22, 24,
-DST_ADST, -ADST_DST,
-DST_FLIPADST, -FLIPADST_DST,
28, 30,
18, 20,
-ADST_ADST, -FLIPADST_FLIPADST,
-ADST_FLIPADST, -FLIPADST_ADST,
-ADST_FLIPADST, -FLIPADST_ADST
}, {
-IDTX, 2,
-DCT_DCT, 4,
......@@ -942,33 +902,25 @@ const vpx_tree_index vp10_ext_tx_intra_tree[EXT_TX_SETS_INTRA]
static const vpx_prob
default_inter_ext_tx_prob[EXT_TX_SETS_INTER][EXT_TX_SIZES][TX_TYPES - 1] = {
{ // ToDo(yaowu): remove unused entry 0.
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 0 },
{ 0 },
{ 0 },
#if EXT_TX_SIZES == 4
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 0 },
#endif
}, {
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 12, 15, 15, 112, 16, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128, 128},
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128, 128},
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128, 128},
#if EXT_TX_SIZES == 4
{ 12, 15, 15, 160, 16, 144, 160, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128 },
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128, 128},
#endif
}, {
{ 12, 15, 15, 112, 128, 128, 128, 128, 128, 128, 128 },
{ 12, 15, 15, 112, 128, 128, 128, 128, 128, 128, 128 },
{ 12, 15, 15, 112, 128, 128, 128, 128, 128, 128, 128 },
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
#if EXT_TX_SIZES == 4
{ 12, 15, 15, 160, 128, 128, 128, 128, 128, 128, 128 },
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
#endif
}, {
{ 12, },
......@@ -985,266 +937,110 @@ default_intra_ext_tx_prob[EXT_TX_SETS_INTRA][EXT_TX_SIZES]
[INTRA_MODES][TX_TYPES - 1] = {
{ // ToDo(yaowu): remove unused entry 0.
{
{ 8, 11, 24, 112, 87, 137, 127, 134,
128, 86, 128, 124, 125, 133, 176, 123, },
{ 10, 9, 39, 106, 73, 155, 163, 228,
35, 62, 129, 127, 133, 114, 213, 234, },
{ 10, 9, 14, 88, 91, 127, 151, 51,
210, 89, 126, 58, 52, 116, 217, 24, },
{ 9, 6, 29, 113, 98, 131, 149, 210,
119, 60, 124, 93, 90, 143, 170, 197, },
{ 8, 8, 38, 101, 111, 166, 167, 141,
130, 105, 128, 75, 75, 118, 197, 117, },
{ 7, 8, 39, 91, 101, 153, 166, 200,
99, 77, 123, 90, 83, 144, 224, 192, },
{ 7, 10, 26, 86, 119, 154, 130, 101,
152, 91, 129, 75, 79, 137, 219, 77, },
{ 10, 13, 20, 86, 102, 162, 112, 76,
171, 86, 134, 122, 106, 124, 196, 44, },
{ 8, 9, 33, 108, 100, 144, 148, 215,
77, 60, 125, 125, 128, 126, 198, 220, },
{ 3, 10, 29, 111, 69, 141, 204, 141,
139, 93, 120, 75, 77, 163, 242, 124, },
{ 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
}, {
{ 2, 53, 18, 147, 96, 98, 136, 133,
131, 120, 153, 163, 169, 137, 173, 124, },
{ 4, 18, 34, 133, 54, 130, 179, 228,
28, 72, 153, 164, 168, 118, 227, 239, },
{ 4, 18, 13, 125, 72, 110, 176, 36,
221, 104, 148, 75, 72, 117, 225, 19, },
{ 8, 33, 24, 162, 113, 99, 147, 226,
103, 85, 153, 143, 153, 124, 155, 210, },
{ 2, 15, 35, 107, 127, 158, 192, 128,
126, 116, 151, 95, 88, 182, 241, 119, },
{ 3, 15, 36, 112, 100, 146, 194, 189,
90, 98, 152, 99, 100, 165, 235, 175, },
{ 3, 16, 29, 109, 103, 140, 182, 76,
173, 104, 147, 82, 85, 159, 235, 70, },
{ 9, 24, 14, 120, 86, 156, 161, 34,
177, 121, 142, 128, 128, 126, 185, 37, },
{ 5, 24, 29, 152, 98, 99, 174, 228,
82, 76, 147, 149, 128, 132, 191, 225, },
{ 2, 15, 29, 111, 77, 126, 200, 135,
117, 93, 152, 96, 84, 191, 245, 135, },
{ 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
}, {
{ 2, 69, 13, 173, 111, 69, 137, 159,
159, 146, 151, 193, 203, 131, 180, 123, },
{ 1, 12, 33, 164, 32, 98, 204, 242,
23, 99, 149, 215, 232, 110, 239, 245, },
{ 1, 17, 9, 136, 82, 83, 171, 28,
231, 128, 135, 76, 64, 118, 235, 17, },
{ 4, 41, 17, 195, 131, 58, 161, 237,
141, 97, 153, 189, 191, 117, 182, 202, },
{ 2, 17, 36, 104, 149, 137, 217, 139,
191, 119, 125, 107, 115, 223, 249, 110, },
{ 2, 14, 24, 127, 91, 135, 219, 198,
113, 91, 164, 125, 173, 211, 250, 116, },
{ 3, 19, 24, 120, 102, 130, 209, 81,
187, 95, 143, 102, 50, 190, 244, 56, },
{ 4, 27, 10, 128, 91, 157, 181, 33,
181, 150, 141, 141, 166, 114, 215, 25, },
{ 2, 34, 27, 187, 102, 77, 210, 245,
113, 107, 136, 184, 188, 121, 210, 234, },
{ 1, 15, 22, 141, 59, 94, 208, 133,
154, 95, 152, 112, 105, 191, 242, 111, },
{ 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
#if EXT_TX_SIZES == 4
}, {
{ 2, 69, 13, 173, 111, 69, 137, 159,
159, 146, 151, 193, 203, 131, 180, 123, },
{ 1, 12, 33, 164, 32, 98, 204, 242,
23, 99, 149, 215, 232, 110, 239, 245, },
{ 1, 17, 9, 136, 82, 83, 171, 28,
231, 128, 135, 76, 64, 118, 235, 17, },
{ 4, 41, 17, 195, 131, 58, 161, 237,
141, 97, 153, 189, 191, 117, 182, 202, },
{ 2, 17, 36, 104, 149, 137, 217, 139,
191, 119, 125, 107, 115, 223, 249, 110, },
{ 2, 14, 24, 127, 91, 135, 219, 198,
113, 91, 164, 125, 173, 211, 250, 116, },
{ 3, 19, 24, 120, 102, 130, 209, 81,
187, 95, 143, 102, 50, 190, 244, 56, },
{ 4, 27, 10, 128, 91, 157, 181, 33,
181, 150, 141, 141, 166, 114, 215, 25, },
{ 2, 34, 27, 187, 102, 77, 210, 245,
113, 107, 136, 184, 188, 121, 210, 234, },
{ 1, 15, 22, 141, 59, 94, 208, 133,
154, 95, 152, 112, 105, 191, 242, 111, },
{ 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
#endif
},
}, {
{
{ 8, 11, 24, 112, 87, 137, 127, 134,
128, 86, 128, 124, 125, 133, 176, 123, },
{ 10, 9, 39, 106, 73, 155, 163, 228,
35, 62, 129, 127, 133, 114, 213, 234, },
{ 10, 9, 14, 88, 91, 127, 151, 51,
210, 89, 126, 58, 52, 116, 217, 24, },
{ 9, 6, 29, 113, 98, 131, 149, 210,
119, 60, 124, 93, 90, 143, 170, 197, },
{ 8, 8, 38, 101, 111, 166, 167, 141,
130, 105, 128, 75, 75, 118, 197, 117, },
{ 7, 8, 39, 91, 101, 153, 166, 200,
99, 77, 123, 90, 83, 144, 224, 192, },
{ 7, 10, 26, 86, 119, 154, 130, 101,
152, 91, 129, 75, 79, 137, 219, 77, },
{ 10, 13, 20, 86, 102, 162, 112, 76,
171, 86, 134, 122, 106, 124, 196, 44, },
{ 8, 9, 33, 108, 100, 144, 148, 215,
77, 60, 125, 125, 128, 126, 198, 220, },
{ 3, 10, 29, 111, 69, 141, 204, 141,
139, 93, 120, 75, 77, 163, 242, 124, },
{ 8, 176, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 10, 28, 32, 128, 176, 192, 208, 128, 128, 128, 128, },
{ 10, 28, 32, 128, 176, 192, 48, 128, 128, 128, 128, },
{ 9, 160, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 8, 28, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
{ 7, 28, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 7, 20, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 10, 23, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 8, 29, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 3, 20, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
}, {
{ 2, 53, 18, 147, 96, 98, 136, 133,
131, 120, 153, 163, 169, 137, 173, 124, },
{ 4, 18, 34, 133, 54, 130, 179, 228,
28, 72, 153, 164, 168, 118, 227, 239, },
{ 4, 18, 13, 125, 72, 110, 176, 36,
221, 104, 148, 75, 72, 117, 225, 19, },
{ 8, 33, 24, 162, 113, 99, 147, 226,
103, 85, 153, 143, 153, 124, 155, 210, },
{ 2, 15, 35, 107, 127, 158, 192, 128,
126, 116, 151, 95, 88, 182, 241, 119, },
{ 3, 15, 36, 112, 100, 146, 194, 189,
90, 98, 152, 99, 100, 165, 235, 175, },
{ 3, 16, 29, 109, 103, 140, 182, 76,
173, 104, 147, 82, 85, 159, 235, 70, },
{ 9, 24, 14, 120, 86, 156, 161, 34,
177, 121, 142, 128, 128, 126, 185, 37, },
{ 5, 24, 29, 152, 98, 99, 174, 228,
82, 76, 147, 149, 128, 132, 191, 225, },
{ 2, 15, 29, 111, 77, 126, 200, 135,
117, 93, 152, 96, 84, 191, 245, 135, },
{ 2, 176, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 4, 28, 32, 128, 176, 192, 208, 128, 128, 128, 128, },
{ 4, 28, 32, 128, 176, 192, 48, 128, 128, 128, 128, },
{ 8, 160, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 2, 28, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
{ 3, 28, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 3, 26, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 9, 24, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 5, 24, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 2, 25, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
}, {
{ 2, 69, 13, 173, 111, 69, 137, 159,
159, 146, 151, 193, 203, 131, 180, 123, },
{ 1, 12, 33, 164, 32, 98, 204, 242,
23, 99, 149, 215, 232, 110, 239, 245, },
{ 1, 17, 9, 136, 82, 83, 171, 28,
231, 128, 135, 76, 64, 118, 235, 17, },
{ 4, 41, 17, 195, 131, 58, 161, 237,
141, 97, 153, 189, 191, 117, 182, 202, },
{ 2, 17, 36, 104, 149, 137, 217, 139,
191, 119, 125, 107, 115, 223, 249, 110, },
{ 2, 14, 24, 127, 91, 135, 219, 198,
113, 91, 164, 125, 173, 211, 250, 116, },
{ 3, 19, 24, 120, 102, 130, 209, 81,
187, 95, 143, 102, 50, 190, 244, 56, },
{ 4, 27, 10, 128, 91, 157, 181, 33,
181, 150, 141, 141, 166, 114, 215, 25, },
{ 2, 34, 27, 187, 102, 77, 210, 245,
113, 107, 136, 184, 188, 121, 210, 234, },
{ 1, 15, 22, 141, 59, 94, 208, 133,
154, 95, 152, 112, 105, 191, 242, 111, },
{ 2, 176, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 1, 28, 32, 128, 176, 192, 208, 128, 128, 128, 128, },
{ 1, 28, 32, 128, 176, 192, 48, 128, 128, 128, 128, },
{ 4, 160, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 2, 28, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
{ 2, 28, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 3, 29, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 4, 27, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 2, 34, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 1, 25, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
#if EXT_TX_SIZES == 4
}, {
{ 2, 69, 13, 173, 111, 69, 137, 159,
159, 146, 151, 193, 203, 131, 180, 123, },
{ 1, 12, 33, 164, 32, 98, 204, 242,
23, 99, 149, 215, 232, 110, 239, 245, },
{ 1, 17, 9, 136, 82, 83, 171, 28,
231, 128, 135, 76, 64, 118, 235, 17, },
{ 4, 41, 17, 195, 131, 58, 161, 237,
141, 97, 153, 189, 191, 117, 182, 202, },
{ 2, 17, 36, 104, 149, 137, 217, 139,
191, 119, 125, 107, 115, 223, 249, 110, },
{ 2, 14, 24, 127, 91, 135, 219, 198,
113, 91, 164, 125, 173, 211, 250, 116, },
{ 3, 19, 24, 120, 102, 130, 209, 81,
187, 95, 143, 102, 50, 190, 244, 56, },
{ 4, 27, 10, 128, 91, 157, 181, 33,
181, 150, 141, 141, 166, 114, 215, 25, },
{ 2, 34, 27, 187, 102, 77, 210, 245,
113, 107, 136, 184, 188, 121, 210, 234, },
{ 1, 15, 22, 141, 59, 94, 208, 133,
154, 95, 152, 112, 105, 191, 242, 111, },
{ 2, 176, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 1, 12, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 1, 17, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 4, 41, 32, 128, 128, 128, 128, 128, 128, 128, 128, },
{ 2, 17, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
{ 2, 14, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 3, 19, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 4, 27, 32, 128, 160, 176, 64, 128, 128, 128, 128, },
{ 2, 34, 32, 128, 160, 176, 192, 128, 128, 128, 128, },
{ 1, 15, 32, 128, 96, 128, 128, 128, 160, 192, 128, },
#endif
},
}, {
{
{ 8, 176, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 10, 28, 176, 192, 208, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 10, 28, 176, 192, 48, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 9, 160, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 8, 28, 96, 128, 128, 128, 160, 192,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 7, 28, 160, 176, 192, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 7, 20, 160, 176, 64, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 10, 23, 160, 176, 64, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 8, 29, 160, 176, 192, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 3, 20, 96, 128, 128, 128, 160, 192,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 8, 176, 128, 128, 128, 128, 128, 128, 128, },
{ 10, 28, 176, 192, 208, 128, 128, 128, 128, },
{ 10, 28, 176, 192, 48, 128, 128, 128, 128, },
{ 9, 160, 128, 128, 128, 128, 128, 128, 128, },
{ 8, 28, 96, 128, 128, 128, 160, 192, 128, },
{ 7, 28, 160, 176, 192, 128, 128, 128, 128, },
{ 7, 20, 160, 176, 64, 128, 128, 128, 128, },
{ 10, 23, 160, 176, 64, 128, 128, 128, 128, },
{ 8, 29, 160, 176, 192, 128, 128, 128, 128, },
{ 3, 20, 96, 128, 128, 128, 160, 192, 128, },
}, {
{ 2, 176, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 4, 28, 176, 192, 208, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 4, 28, 176, 192, 48, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 8, 160, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 2, 28, 96, 128, 128, 128, 160, 192,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 3, 28, 160, 176, 192, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 3, 26, 160, 176, 64, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 9, 24, 160, 176, 64, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 5, 24, 160, 176, 192, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 2, 25, 96, 128, 128, 128, 160, 192,
128, 128, 128, 128, 128, 128, 128, 128, },
{ 2, 176, 128, 128, 128, 128, 128, 128, 128, },