Initialize level map prob models in cb4x4
Change-Id: I5dec82552b41a5523155b2dea9e05ce69fba4917
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index b4049b0..f142204 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -18,6 +18,9 @@
#if CONFIG_LV_MAP
const aom_prob default_txb_skip[TX_SIZES][TXB_SKIP_CONTEXTS] = {
+#if CONFIG_CB4X4
+ { 252, 71, 126, 184, 178, 218, 251, 49, 133, 221, 27, 92, 197 },
+#endif
{ 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 },
@@ -29,6 +32,31 @@
const aom_prob default_coeff_base
[TX_SIZES][PLANE_TYPES][NUM_BASE_LEVELS][COEFF_BASE_CONTEXTS] = {
+#if CONFIG_CB4X4
+ { // TX_2X2
+ {
+ { 73, 128, 131, 204, 165, 226, 169, 236, 18, 128, 51,
+ 153, 97, 179, 123, 201, 145, 226, 20, 128, 59, 153,
+ 107, 181, 129, 201, 142, 226, 3, 128, 19, 99, 46,
+ 135, 92, 166, 129, 190, 157, 217, 128, 128 },
+
+ { 128, 128, 178, 218, 192, 236, 186, 243, 55, 128, 110,
+ 183, 151, 205, 168, 221, 180, 238, 65, 128, 116, 178,
+ 157, 206, 172, 222, 183, 238, 24, 128, 65, 127, 104,
+ 164, 154, 195, 187, 216, 205, 230, 128, 128 },
+ },
+ {
+ { 73, 128, 131, 204, 165, 226, 169, 236, 18, 128, 51,
+ 153, 97, 179, 123, 201, 145, 226, 20, 128, 59, 153,
+ 107, 181, 129, 201, 142, 226, 3, 128, 19, 99, 46,
+ 135, 92, 166, 129, 190, 157, 217, 128, 128 },
+
+ { 128, 128, 178, 218, 192, 236, 186, 243, 55, 128, 110,
+ 183, 151, 205, 168, 221, 180, 238, 65, 128, 116, 178,
+ 157, 206, 172, 222, 183, 238, 24, 128, 65, 127, 104,
+ 164, 154, 195, 187, 216, 205, 230, 128, 128 },
+ } },
+#endif
{ // TX_4X4
{
// PLANE_Y
@@ -54,7 +82,6 @@
141, 198, 181, 213, 102, 223, 18, 128, 50, 132, 90,
144, 141, 169, 180, 191, 128, 217, 128, 128 },
} },
-
{
// TX_8X8
{
@@ -141,6 +168,14 @@
};
const aom_prob default_nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS] = {
+#if CONFIG_CB4X4
+ {
+ { 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
+ 75, 157, 92, 75, 157, 129, 94, 65, 52, 37 },
+ { 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
+ 109, 153, 140, 103, 152, 134, 109, 81, 69, 50 },
+ },
+#endif
{
{ 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
75, 157, 92, 75, 157, 129, 94, 65, 52, 37 },
@@ -166,7 +201,16 @@
81, 252, 177, 100, 252, 221, 192, 143, 195, 146 },
},
};
+
const aom_prob default_eob_flag[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS] = {
+#if CONFIG_CB4X4
+ {
+ { 229, 236, 231, 222, 239, 236, 214, 201, 236, 226, 195, 134, 228,
+ 210, 150, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+ { 182, 186, 172, 176, 207, 213, 152, 122, 187, 171, 131, 65, 170,
+ 134, 101, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+ },
+#endif
{
{ 229, 236, 231, 222, 239, 236, 214, 201, 236, 226, 195, 134, 228,
210, 150, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
@@ -192,7 +236,20 @@
236, 186, 182, 57, 209, 140, 128, 85, 184, 110, 128, 128 },
},
};
+
const aom_prob default_coeff_lps[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS] = {
+#if CONFIG_CB4X4
+ {
+ { 164, 128, 134, 165, 128, 137, 168, 128, 97, 136, 167, 128,
+ 182, 205, 143, 172, 200, 145, 173, 193, 103, 137, 170, 191,
+ 198, 214, 162, 187, 209, 162, 187, 207, 128, 156, 183, 201,
+ 219, 230, 204, 210, 225, 201, 209, 225, 187, 190, 203, 214 },
+ { 106, 128, 98, 126, 128, 87, 122, 128, 54, 89, 131, 128,
+ 142, 180, 123, 154, 189, 115, 149, 175, 79, 115, 157, 182,
+ 175, 197, 147, 174, 199, 145, 174, 201, 89, 135, 173, 194,
+ 212, 222, 206, 203, 223, 188, 201, 220, 128, 144, 202, 206 },
+ },
+#endif
{
{ 164, 128, 134, 165, 128, 137, 168, 128, 97, 136, 167, 128,
182, 205, 143, 172, 200, 145, 173, 193, 103, 137, 170, 191,
