Commit 72a6cb62 authored by Yaowu Xu's avatar Yaowu Xu

Fix msvc compling

Change-Id: I5abd6d2fd198b3789732e81b23a5bac009af5290
parent dcbe4229
......@@ -774,7 +774,23 @@ static const vpx_prob default_switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS]
#if CONFIG_EXT_TX
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,
-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,
}, {
-IDTX, 2,
-DCT_DCT, 4,
......@@ -809,7 +825,23 @@ 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,
}, {
-IDTX, 2,
-DCT_DCT, 4,
......@@ -832,8 +864,17 @@ 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] = {
{
// unused
{ // ToDo(yaowu): remove unused entry 0.
{ 12, 112, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128 },
{ 12, 112, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128 },
{ 12, 112, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128 },
#if EXT_TX_SIZES == 4
{ 12, 112, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128 },
#endif
}, {
{ 12, 112, 16, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128 },
......@@ -865,8 +906,94 @@ default_inter_ext_tx_prob[EXT_TX_SETS_INTER][EXT_TX_SIZES][TX_TYPES - 1] = {
static const vpx_prob
default_intra_ext_tx_prob[EXT_TX_SETS_INTRA][EXT_TX_SIZES]
[INTRA_MODES][TX_TYPES - 1] = {
{
// unused
{ // 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, },
}, {
{ 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, 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, },
#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, },
#endif
},
}, {
{
{ 8, 11, 24, 112, 87, 137, 127, 134,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment