Assign default lv_map prob to tx64x64 txfm
Change-Id: I1fe7a6455119505340bb84ec1adc676af9d27b0f
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index b13baf6..cd3918e 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -26,6 +26,9 @@
{ 252, 71, 126, 184, 178, 218, 251, 49, 133, 221, 27, 92, 197 },
{ 252, 71, 126, 184, 178, 218, 251, 49, 133, 221, 27, 92, 197 },
{ 252, 71, 126, 184, 178, 218, 251, 49, 133, 221, 27, 92, 197 },
+#if CONFIG_TX64X64
+ { 252, 71, 126, 184, 178, 218, 251, 49, 133, 221, 27, 92, 197 },
+#endif
};
const aom_prob default_dc_sign[PLANE_TYPES][DC_SIGN_CONTEXTS] = {
{ 125, 102, 147 }, { 119, 101, 135 },
@@ -97,7 +100,25 @@
{ 66, 175, 129, 103, 89, 57, 204, 189, 164, 133, 106, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 238, 228, 202,
166, 124, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 154, 207, 128, 226 } } }
+ 128, 128, 128, 128, 128, 128, 154, 207, 128, 226 } } },
+#if CONFIG_TX64X64
+ { { { 72, 212, 172, 113, 74, 33, 238, 200, 139, 91, 44, 240,
+ 208, 147, 98, 51, 244, 214, 157, 107, 51, 253, 233, 184,
+ 132, 74, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 201, 250, 254, 255 },
+ { 68, 187, 154, 116, 80, 34, 217, 186, 142, 101, 47, 205,
+ 187, 148, 106, 56, 218, 201, 163, 118, 55, 236, 215, 181,
+ 141, 79, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 192, 219, 246, 244 } },
+ { { 80, 217, 179, 140, 106, 60, 237, 208, 165, 129, 94, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 253, 240, 205,
+ 158, 111, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 205, 250, 255, 254 },
+ { 66, 175, 129, 103, 89, 57, 204, 189, 164, 133, 106, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 238, 228, 202,
+ 166, 124, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 154, 207, 128, 226 } } },
+#endif
};
const aom_prob default_nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS] = {
@@ -132,7 +153,17 @@
{ 44, 206, 151, 90, 60, 30, 214, 148, 92, 62, 40, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 248, 197, 125,
80, 52, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 1, 1, 1, 1 } }
+ 128, 128, 128, 128, 128, 128, 1, 1, 1, 1 } },
+#if CONFIG_TX64X64
+ { { 39, 175, 107, 58, 38, 16, 214, 135, 73, 44, 21, 235,
+ 145, 80, 48, 26, 227, 149, 84, 52, 25, 247, 195, 108,
+ 65, 35, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 1, 1, 1, 1 },
+ { 44, 206, 151, 90, 60, 30, 214, 148, 92, 62, 40, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 248, 197, 125,
+ 80, 52, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 1, 1, 1, 1 } },
+#endif
};
#else // CONFIG_LV_MAP_MULTI
#if USE_CAUSAL_BASE_CTX
@@ -201,7 +232,25 @@
{ 91, 185, 133, 105, 95, 60, 213, 190, 164, 131, 107,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 242,
227, 203, 160, 127, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128 } } }
+ 128, 128, 128, 128, 128, 128, 128, 128, 128 } } },
+#if CONFIG_TX64X64
+ { { { 102, 225, 171, 113, 74, 33, 243, 201, 139, 92, 44,
+ 244, 208, 146, 99, 53, 247, 214, 158, 107, 52, 253,
+ 233, 183, 131, 73, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+ { 80, 190, 152, 116, 79, 34, 222, 187, 142, 101, 47,
+ 211, 187, 148, 106, 56, 221, 200, 163, 118, 56, 236,
+ 215, 181, 140, 78, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+ { { 166, 237, 184, 144, 106, 62, 245, 211, 167, 129, 93,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 254,
+ 240, 205, 158, 112, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+ { 91, 185, 133, 105, 95, 60, 213, 190, 164, 131, 107,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 242,
+ 227, 203, 160, 127, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128 } } },
+#endif
};
const aom_prob default_nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS] = {
@@ -228,10 +277,18 @@
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 49, 210, 153, 95, 58, 31, 217, 151, 93, 64, 41, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 248, 197, 123, 79, 53, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } }
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+#if CONFIG_TX64X64
+ { { 40, 176, 107, 57, 37, 16, 216, 136, 73, 44, 22, 235, 145, 79,
+ 49, 26, 227, 149, 84, 52, 26, 247, 195, 107, 64, 35, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+ { 49, 210, 153, 95, 58, 31, 217, 151, 93, 64, 41, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 248, 197, 123, 79, 53, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+#endif
};
-#else // USE_CAUSAL_BASE_CTX
+#else // USE_CAUSAL_BASE_CTX
const aom_prob default_coeff_base
[TX_SIZES][PLANE_TYPES][NUM_BASE_LEVELS][COEFF_BASE_CONTEXTS] = {
@@ -300,11 +357,30 @@
{
240, 199, 230, 79, 181, 128, 192, 198, 128, 64, 121, 171, 192,
148, 37, 26, 83, 85, 183, 149, 8, 33, 101, 168, 128,
- } } }
+ } } },
+#if CONFIG_TX64X64
+ { { {
+ 232, 208, 213, 120, 151, 192, 200, 152, 57, 13, 44, 94, 200,
+ 148, 87, 13, 42, 94, 181, 124, 45, 1, 9, 46, 99,
+ },
+ {
+ 241, 226, 222, 129, 197, 179, 213, 184, 133, 57, 119, 168, 214,
+ 178, 116, 64, 119, 162, 199, 157, 64, 24, 70, 130, 176,
+ } },
+ { {
+ 233, 223, 202, 65, 131, 128, 178, 138, 128, 2, 24, 59, 99,
+ 111, 73, 3, 17, 52, 149, 99, 19, 2, 18, 72, 140,
+ },
+ {
+ 240, 199, 230, 79, 181, 128, 192, 198, 128, 64, 121, 171, 192,
+ 148, 37, 26, 83, 85, 183, 149, 8, 33, 101, 168, 128,
+ } } },
+#endif
};
static const aom_prob default_nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS] =
- { { { 40, 157, 108, 70, 34, 19, 168, 98, 60, 32, 20, 128,
+ {
+ { { 40, 157, 108, 70, 34, 19, 168, 98, 60, 32, 20, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 125, 80, 41,
128, 128, 173, 120, 81, 36, 128, 188, 127, 84, 35, 128,
183, 128, 60, 128, 128, 128, 170, 122, 82, 35, 128, 186,
@@ -341,7 +417,20 @@
128, 128, 128, 128, 128, 128, 128, 128, 128, 252, 204, 160,
114, 36, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } } };
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+#if CONFIG_TX64X64
+ { { 41, 177, 92, 53, 29, 14, 218, 137, 87, 47, 20, 201,
+ 124, 80, 50, 29, 208, 151, 104, 59, 27, 244, 173, 113,
+ 66, 36, 233, 105, 76, 53, 23, 249, 163, 97, 98, 128,
+ 254, 192, 136, 97, 47, 128, 237, 137, 86, 54, 31, 244,
+ 157, 100, 60, 33, 241, 177, 115, 68, 33, 128 },
+ { 73, 231, 149, 83, 63, 64, 242, 192, 132, 113, 114, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 252, 204, 160,
+ 114, 36, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+#endif
+ };
#endif // USE_CAUSAL_BASE_CTX
#endif // CONFIG_LV_MAP_MULTI
@@ -362,7 +451,13 @@
{ { 194, 231, 213, 215, 207, 200, 183, 169, 135, 168, 128,
240, 246, 243, 238, 210, 201, 172, 133, 107, 128, 128 },
{ 122, 232, 230, 244, 250, 247, 252, 253, 254, 52, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } }
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+#if CONFIG_TX64X64
+ { { 194, 231, 213, 215, 207, 200, 183, 169, 135, 168, 128,
+ 240, 246, 243, 238, 210, 201, 172, 133, 107, 128, 128 },
+ { 122, 232, 230, 244, 250, 247, 252, 253, 254, 52, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } },
+#endif
};
static const aom_prob
@@ -398,7 +493,17 @@
{
145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
- } }
+ } },
+#if CONFIG_TX64X64
+ { {
+ 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
+ 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
+ },
+ {
+ 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
+ 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
+ } },
+#endif
};
const aom_prob default_coeff_lps[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS] = {
@@ -436,10 +541,26 @@
#if CONFIG_LV_MAP_MULTI
// TODO(olah): The 1 causes an assert in av1_cost_tokens_from_cdf.
// Changing to 10 is a temporary fix until the root cause is found.
- 192, 192, 10, 196, 192, 255, 171, 178, 255, 128, 171, 179 } }
+ 192, 192, 10, 196, 192, 255, 171, 178, 255, 128, 171, 179 } },
#else
- 192, 192, 1, 196, 192, 255, 171, 178, 255, 128, 171, 179 } }
+ 192, 192, 1, 196, 192, 255, 171, 178, 255, 128, 171, 179 } },
#endif
+#if CONFIG_TX64X64
+ { { 133, 128, 110, 153, 128, 101, 157, 128, 49, 91, 134, 128,
+ 151, 168, 129, 158, 162, 112, 154, 168, 63, 99, 130, 158,
+ 171, 178, 128, 160, 173, 111, 155, 171, 86, 108, 143, 159,
+ 194, 196, 162, 177, 185, 123, 172, 181, 101, 132, 156, 178 },
+ { 133, 128, 129, 144, 128, 116, 135, 128, 43, 101, 100, 128, 140, 163, 158,
+ 173, 205, 128, 165, 171, 128, 128, 210, 163, 172, 184, 192, 176, 201, 183,
+ 177, 190, 128, 192, 199, 144,
+#if CONFIG_LV_MAP_MULTI
+ // TODO(olah): The 1 causes an assert in av1_cost_tokens_from_cdf.
+ // Changing to 10 is a temporary fix until the root cause is found.
+ 192, 192, 10, 196, 192, 255, 171, 178, 255, 128, 171, 179 } },
+#else
+ 192, 192, 1, 196, 192, 255, 171, 178, 255, 128, 171, 179 } },
+#endif
+#endif // CONFIG_TX64X64
};
#if !CONFIG_LV_MAP_MULTI
@@ -540,7 +661,33 @@
{ 49, 128, 36, 62, 128, 37, 56, 128, 128, 1, 1, 128,
45, 37, 68, 102, 128, 90, 56, 1, 128, 128, 37, 1,
26, 27, 128, 126, 128, 255, 63, 142, 128, 128, 1, 1,
- 125, 159, 128, 173, 212, 128, 85, 189, 128, 128, 255, 171 } } }
+ 125, 159, 128, 173, 212, 128, 85, 189, 128, 128, 255, 171 } } },
+#if CONFIG_TX64X64
+ { { { 113, 128, 79, 165, 128, 69, 149, 128, 14, 55, 116, 128,
+ 163, 202, 104, 169, 205, 82, 159, 180, 22, 64, 121, 165,
+ 207, 216, 113, 177, 215, 95, 166, 195, 35, 77, 132, 179,
+ 241, 244, 173, 207, 233, 128, 202, 227, 92, 121, 169, 209 },
+ { 114, 128, 67, 136, 128, 54, 132, 128, 6, 26, 62, 128,
+ 85, 129, 85, 146, 173, 64, 129, 140, 7, 19, 65, 92,
+ 139, 169, 42, 147, 186, 40, 129, 170, 18, 18, 65, 117,
+ 213, 230, 74, 172, 213, 69, 165, 196, 1, 40, 103, 170 },
+ { 101, 128, 61, 134, 128, 52, 97, 128, 1, 14, 26, 128,
+ 79, 72, 71, 135, 152, 56, 114, 117, 1, 10, 24, 58,
+ 64, 66, 60, 133, 148, 16, 126, 123, 1, 32, 26, 56,
+ 143, 197, 51, 141, 176, 59, 132, 162, 128, 17, 47, 106 } },
+ { { 115, 128, 112, 135, 128, 89, 130, 128, 15, 49, 89, 128,
+ 143, 238, 154, 203, 255, 138, 172, 255, 1, 98, 196, 255,
+ 185, 203, 255, 211, 255, 192, 217, 235, 128, 128, 171, 255,
+ 233, 233, 255, 247, 255, 1, 239, 245, 1, 128, 255, 255 },
+ { 75, 128, 76, 118, 128, 35, 74, 128, 1, 13, 23, 128,
+ 63, 138, 114, 164, 140, 91, 128, 128, 128, 1, 138, 64,
+ 96, 128, 255, 175, 236, 85, 166, 209, 128, 1, 128, 146,
+ 196, 217, 1, 204, 206, 128, 212, 221, 128, 128, 128, 219 },
+ { 49, 128, 36, 62, 128, 37, 56, 128, 128, 1, 1, 128,
+ 45, 37, 68, 102, 128, 90, 56, 1, 128, 128, 37, 1,
+ 26, 27, 128, 126, 128, 255, 63, 142, 128, 128, 1, 1,
+ 125, 159, 128, 173, 212, 128, 85, 189, 128, 128, 255, 171 } } },
+#endif
};
#endif
#endif // CONFIG_LV_MAP
