New default tables

Change-Id: Ice8c73a2a843113877b8f8ed78737a1442c25ced

1 files changed, 528 insertions, 528 deletions

diff --git a/vp9/common/vp9_default_coef_probs.h b/vp9/common/vp9_default_coef_probs.h
index 15f9e97dd..1954093f5 100644
--- a/vp9/common/vp9_default_coef_probs.h
+++ b/vp9/common/vp9_default_coef_probs.h
@@ -701,169 +701,169 @@ static const vp9_coeff_probs_model default_coef_probs_4x4[BLOCK_TYPES] = {
   { /* block Type 0 */
     { /* Intra */
       { /* Coeff Band 0 */
-        { 208,  32, 178,},
-        { 102,  43, 132,},
-        {  15,  36,  68,}
+        { 195,  29, 183 },
+        {  84,  49, 136 },
+        {   8,  42,  71 }
       }, { /* Coeff Band 1 */
-        {  71,  91, 178,},
-        {  72,  88, 174,},
-        {  40,  79, 154,},
-        {  21,  68, 126,},
-        {   7,  49,  84,},
-        {   1,  20,  32,}
+        {  31, 107, 169 },
+        {  35,  99, 159 },
+        {  17,  82, 140 },
+        {   8,  66, 114 },
+        {   2,  44,  76 },
+        {   1,  19,  32 }
       }, { /* Coeff Band 2 */
-        { 108, 110, 206,},
-        {  72,  98, 191,},
-        {  26,  77, 152,},
-        {   7,  57, 106,},
-        {   1,  35,  60,},
-        {   1,  14,  22,}
+        {  40, 132, 201 },
+        {  29, 114, 187 },
+        {  13,  91, 157 },
+        {   7,  75, 127 },
+        {   3,  58,  95 },
+        {   1,  28,  47 }
       }, { /* Coeff Band 3 */
-        { 105, 139, 222,},
-        {  76, 118, 205,},
-        {  21,  88, 164,},
-        {   5,  63, 118,},
-        {   1,  42,  74,},
-        {   1,  18,  30,}
+        {  69, 142, 221 },
+        {  42, 122, 201 },
+        {  15,  91, 159 },
+        {   6,  67, 121 },
+        {   1,  42,  77 },
+        {   1,  17,  31 }
       }, { /* Coeff Band 4 */
-        { 143, 117, 233,},
-        {  99, 104, 214,},
-        {  26,  81, 170,},
-        {   6,  60, 116,},
-        {   1,  38,  65,},
-        {   1,  15,  26,}
+        { 102, 148, 228 },
+        {  67, 117, 204 },
+        {  17,  82, 154 },
+        {   6,  59, 114 },
+        {   2,  39,  75 },
+        {   1,  15,  29 }
       }, { /* Coeff Band 5 */
-        { 155,  74, 238,},
-        { 152,  64, 223,},
-        {  67,  55, 182,},
-        {  27,  44, 127,},
-        {   9,  27,  69,},
-        {   2,  11,  28,}
+        { 156,  57, 233 },
+        { 119,  57, 212 },
+        {  58,  48, 163 },
+        {  29,  40, 124 },
+        {  12,  30,  81 },
+        {   3,  12,  31 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        { 207, 112, 234,},
-        { 145, 120, 212,},
-        {  77, 114, 177,}
+        { 191, 107, 226 },
+        { 124, 117, 204 },
+        {  25,  99, 155 }
       }, { /* Coeff Band 1 */
-        {  93, 174, 243,},
-        { 100, 144, 231,},
-        {  28, 101, 186,},
-        {   9,  73, 132,},
-        {   2,  44,  76,},
-        {   1,  19,  33,}
+        {  29, 148, 210 },
+        {  37, 126, 194 },
+        {   8,  93, 157 },
+        {   2,  68, 118 },
+        {   1,  39,  69 },
+        {   1,  17,  33 }
       }, { /* Coeff Band 2 */
-        { 116, 175, 246,},
-        {  78, 142, 231,},
-        {  14,  93, 177,},
-        {   4,  65, 122,},
-        {   1,  38,  69,},
-        {   1,  18,  30,}
+        {  41, 151, 213 },
+        {  27, 123, 193 },
+        {   3,  82, 144 },
+        {   1,  58, 105 },
+        {   1,  32,  60 },
+        {   1,  13,  26 }
       }, { /* Coeff Band 3 */
-        { 138, 183, 249,},
-        {  93, 147, 237,},
-        {  21, 104, 187,},
-        {   6,  73, 131,},
-        {   1,  47,  83,},
-        {   1,  26,  44,}
+        {  59, 159, 220 },
+        {  23, 126, 198 },
+        {   4,  88, 151 },
+        {   1,  66, 114 },
+        {   1,  38,  71 },
+        {   1,  18,  34 }
       }, { /* Coeff Band 4 */
-        { 188, 143, 252,},
-        { 137, 124, 241,},
-        {  32,  89, 188,},
-        {   7,  61, 122,},
-        {   1,  34,  66,},
-        {   1,  18,  34,}
+        { 114, 136, 232 },
+        {  51, 114, 207 },
+        {  11,  83, 155 },
+        {   3,  56, 105 },
+        {   1,  33,  65 },
+        {   1,  17,  34 }
       }, { /* Coeff Band 5 */
-        { 198,  92, 253,},
-        { 189,  79, 244,},
-        {  78,  61, 200,},
-        {  34,  50, 146,},
-        {  11,  38,  93,},
-        {   1,  31,  55,}
+        { 149,  65, 234 },
+        { 121,  57, 215 },
+        {  61,  49, 166 },
+        {  28,  36, 114 },
+        {  12,  25,  76 },
+        {   3,  16,  42 }
       }
     }
   }, { /* block Type 1 */
     { /* Intra */
       { /* Coeff Band 0 */
-        { 207,  35, 219,},
-        { 126,  46, 182,},
-        {  51,  47, 125,}
+        { 214,  49, 220 },
+        { 132,  63, 188 },
+        {  42,  65, 137 }
       }, { /* Coeff Band 1 */
-        { 114, 124, 220,},
-        { 142, 116, 213,},
-        {  81, 101, 190,},
-        {  42,  83, 155,},
-        {  16,  62, 104,},
-        {   6,  40,  60,}
+        {  85, 137, 221 },
+        { 104, 131, 216 },
+        {  49, 111, 192 },
+        {  21,  87, 155 },
+        {   2,  49,  87 },
+        {   1,  16,  28 }
       }, { /* Coeff Band 2 */
-        { 139, 149, 228,},
-        { 115, 127, 221,},
-        {  43, 100, 189,},
-        {  13,  77, 141,},
-        {   3,  49,  88,},
-        {   1,  23,  41,}
+        {  89, 163, 230 },
+        {  90, 137, 220 },
+        {  29, 100, 183 },
+        {  10,  70, 135 },
+        {   2,  42,  81 },
+        {   1,  17,  33 }
       }, { /* Coeff Band 3 */
-        { 119, 185, 236,},
-        {  89, 140, 224,},
-        {  34, 105, 189,},
-        {  14,  78, 142,},
-        {   5,  49,  90,},
-        {   1,  22,  41,}
+        { 108, 167, 237 },
+        {  55, 133, 222 },
+        {  15,  97, 179 },
+        {   4,  72, 135 },
+        {   1,  45,  85 },
+        {   1,  19,  38 }
       }, { /* Coeff Band 4 */
-        { 162, 142, 244,},
-        { 129, 120, 231,},
-        {  44,  90, 189,},
-        {  14,  65, 132,},
-        {   3,  38,  72,},
-        {   1,  17,  39,}
+        { 124, 146, 240 },
+        {  66, 124, 224 },
+        {  17,  88, 175 },
+        {   4,  58, 122 },
+        {   1,  36,  75 },
+        {   1,  18,  37 }
       }, { /* Coeff Band 5 */
-        { 167,  96, 247,},
-        { 163,  84, 234,},
-        {  70,  63, 185,},
-        {  30,  44, 132,},
-        {  13,  30,  80,},
-        {   5,  13,  38,}
+        { 141,  79, 241 },
+        { 126,  70, 227 },
+        {  66,  58, 182 },
+        {  30,  44, 136 },
+        {  12,  34,  96 },
+        {   2,  20,  47 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        { 242,  90, 246,},
-        { 186, 102, 228,},
-        { 102, 108, 203,}
+        { 229,  99, 249 },
+        { 143, 111, 235 },
+        {  46, 109, 192 }
       }, { /* Coeff Band 1 */
-        { 152, 169, 250,},
-        { 164, 149, 242,},
-        {  63, 108, 204,},
-        {  39,  83, 153,},
-        {  31,  66, 108,},
-        {  27,  65,  71,}
+        {  82, 158, 236 },
+        {  94, 146, 224 },
+        {  25, 117, 191 },
+        {   9,  87, 149 },
+        {   3,  56,  99 },
+        {   1,  33,  57 }
       }, { /* Coeff Band 2 */
-        { 161, 174, 250,},
-        { 133, 150, 239,},
-        {  32, 105, 197,},
-        {  10,  78, 147,},
-        {   2,  49,  99,},
-        {   1,  26,  53,}
+        {  83, 167, 237 },
+        {  68, 145, 222 },
+        {  10, 103, 177 },
+        {   2,  72, 131 },
+        {   1,  41,  79 },
+        {   1,  20,  39 }
       }, { /* Coeff Band 3 */
-        { 160, 187, 251,},
-        { 131, 155, 241,},
-        {  42, 108, 198,},
-        {  18,  81, 151,},
-        {   9,  60, 112,},
-        {   5,  35,  49,}
+        {  99, 167, 239 },
+        {  47, 141, 224 },
+        {  10, 104, 178 },
+        {   2,  73, 133 },
+        {   1,  44,  85 },
+        {   1,  22,  47 }
       }, { /* Coeff Band 4 */
-        { 195, 141, 253,},
-        { 169, 128, 245,},
-        {  62,  91, 204,},
-        {  23,  70, 150,},
-        {   2,  44,  78,},
-        {   1,   1, 128,}
+        { 127, 145, 243 },
+        {  71, 129, 228 },
+        {  17,  93, 177 },
+        {   3,  61, 124 },
+        {   1,  41,  84 },
+        {   1,  21,  52 }
       }, { /* Coeff Band 5 */
-        { 195, 104, 253,},
-        { 197,  92, 248,},
-        {  88,  71, 214,},
-        {  39,  56, 160,},
-        {  18,  28,  90,},
-        { 128, 128, 128,}
+        { 157,  78, 244 },
+        { 140,  72, 231 },
+        {  69,  58, 184 },
+        {  31,  44, 137 },
+        {  14,  38, 105 },
+        {   8,  23,  61 }
       }
     }
   }
@@ -872,169 +872,169 @@ static const vp9_coeff_probs_model default_coef_probs_8x8[BLOCK_TYPES] = {
   { /* block Type 0 */
     { /* Intra */
       { /* Coeff Band 0 */
-        { 196,  40, 199,},
-        {  83,  38, 128,},
-        {  10,  29,  55,}
+        { 125,  34, 187 },
+        {  52,  41, 133 },
+        {   6,  31,  56 }
       }, { /* Coeff Band 1 */
-        {  33, 114, 160,},
-        {  69, 107, 155,},
-        {  30,  91, 138,},
-        {  12,  74, 115,},
-        {   4,  52,  80,},
-        {   1,  27,  40,}
+        {  37, 109, 153 },
+        {  51, 102, 147 },
+        {  23,  87, 128 },
+        {   8,  67, 101 },
+        {   1,  41,  63 },
+        {   1,  19,  29 }
       }, { /* Coeff Band 2 */
-        {  38, 159, 190,},
-        {  34, 130, 182,},
-        {  10,  97, 153,},
-        {   3,  71, 115,},
-        {   1,  41,  68,},
-        {   1,  16,  27,}
+        {  31, 154, 185 },
+        {  17, 127, 175 },
+        {   6,  96, 145 },
+        {   2,  73, 114 },
+        {   1,  51,  82 },
+        {   1,  28,  45 }
       }, { /* Coeff Band 3 */
-        {  41, 184, 214,},
-        {  24, 142, 199,},
-        {   6,  97, 159,},
-        {   1,  63, 110,},
-        {   1,  32,  58,},
-        {   1,  12,  21,}
+        {  23, 163, 200 },
+        {  10, 131, 185 },
+        {   2,  93, 148 },
+        {   1,  67, 111 },
+        {   1,  41,  69 },
+        {   1,  14,  24 }
       }, { /* Coeff Band 4 */
-        {  54, 207, 231,},
-        {  32, 156, 213,},
-        {   7,  98, 164,},
-        {   2,  62, 108,},
-        {   1,  32,  57,},
-        {   1,  13,  22,}
+        {  29, 176, 217 },
+        {  12, 145, 201 },
+        {   3, 101, 156 },
+        {   1,  69, 111 },
+        {   1,  39,  63 },
+        {   1,  14,  23 }
       }, { /* Coeff Band 5 */
-        {  89, 208, 239,},
-        {  53, 155, 223,},
-        {  12, 102, 170,},
-        {   3,  67, 111,},
-        {   1,  38,  60,},
-        {   1,  18,  26,}
+        {  57, 192, 233 },
+        {  25, 154, 215 },
+        {   6, 109, 167 },
+        {   3,  78, 118 },
+        {   1,  48,  69 },
+        {   1,  21,  29 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        { 205, 121, 244,},
-        { 140, 120, 211,},
-        {  51, 100, 152,}
+        { 202, 105, 245 },
+        { 108, 106, 216 },
+        {  18,  90, 144 }
       }, { /* Coeff Band 1 */
-        {  66, 196, 236,},
-        {  99, 164, 223,},
-        {  29, 122, 187,},
-        {  14,  95, 145,},
-        {   6,  68,  97,},
-        {   3,  43,  50,}
+        {  33, 172, 219 },
+        {  64, 149, 206 },
+        {  14, 117, 177 },
+        {   5,  90, 141 },
+        {   2,  61,  95 },
+        {   1,  37,  57 }
       }, { /* Coeff Band 2 */
-        {  66, 202, 238,},
-        {  45, 155, 218,},
-        {   6,  96, 163,},
-        {   2,  64, 110,},
-        {   1,  34,  61,},
-        {   1,  13,  24,}
+        {  33, 179, 220 },
+        {  11, 140, 198 },
+        {   1,  89, 148 },
+        {   1,  60, 104 },
+        {   1,  33,  57 },
+        {   1,  12,  21 }
       }, { /* Coeff Band 3 */
-        {  66, 204, 242,},
-        {  38, 158, 222,},
-        {   6,  95, 166,},
-        {   2,  61, 111,},
-        {   1,  31,  59,},
-        {   1,  12,  22,}
+        {  30, 181, 221 },
+        {   8, 141, 198 },
+        {   1,  87, 145 },
+        {   1,  58, 100 },
+        {   1,  31,  55 },
+        {   1,  12,  20 }
       }, { /* Coeff Band 4 */
-        {  63, 214, 245,},
-        {  38, 164, 228,},
-        {   5, 101, 174,},
-        {   1,  64, 116,},
-        {   1,  34,  63,},
-        {   1,  14,  26,}
+        {  32, 186, 224 },
+        {   7, 142, 198 },
+        {   1,  86, 143 },
+        {   1,  58, 100 },
+        {   1,  31,  55 },
+        {   1,  12,  22 }
       }, { /* Coeff Band 5 */
-        {  91, 214, 246,},
-        {  55, 162, 233,},
-        {  10, 104, 179,},
-        {   2,  67, 119,},
-        {   1,  37,  66,},
-        {   1,  16,  30,}
+        {  57, 192, 227 },
+        {  20, 143, 204 },
+        {   3,  96, 154 },
+        {   1,  68, 112 },
+        {   1,  42,  69 },
+        {   1,  19,  32 }
       }
     }
   }, { /* block Type 1 */
     { /* Intra */
       { /* Coeff Band 0 */
-        { 211,  32, 212,},
-        { 121,  47, 171,},
-        {  40,  51, 118,}
+        { 212,  35, 215 },
+        { 113,  47, 169 },
+        {  29,  48, 105 }
       }, { /* Coeff Band 1 */
-        {  71, 129, 209,},
-        { 118, 122, 206,},
-        {  53, 104, 184,},
-        {  20,  81, 148,},
-        {   3,  47,  82,},
-        {   1,  18,  28,}
+        {  74, 129, 203 },
+        { 106, 120, 203 },
+        {  49, 107, 178 },
+        {  19,  84, 144 },
+        {   4,  50,  84 },
+        {   1,  15,  25 }
       }, { /* Coeff Band 2 */
-        {  86, 162, 220,},
-        {  84, 134, 216,},
-        {  26, 102, 186,},
-        {   7,  75, 135,},
-        {   1,  46,  79,},
-        {   1,  20,  35,}
+        {  71, 172, 217 },
+        {  44, 141, 209 },
+        {  15, 102, 173 },
+        {   6,  76, 133 },
+        {   2,  51,  89 },
+        {   1,  24,  42 }
       }, { /* Coeff Band 3 */
-        {  89, 191, 232,},
-        {  67, 148, 223,},
-        {  19, 105, 183,},
-        {   5,  72, 127,},
-        {   1,  44,  76,},
-        {   1,  21,  36,}
+        {  64, 185, 231 },
+        {  31, 148, 216 },
+        {   8, 103, 175 },
+        {   3,  74, 131 },
+        {   1,  46,  81 },
+        {   1,  18,  30 }
       }, { /* Coeff Band 4 */
-        {  94, 210, 236,},
-        {  68, 153, 224,},
-        {  14, 103, 178,},
-        {   2,  70, 122,},
-        {   1,  42,  72,},
-        {   1,  19,  34,}
+        {  65, 196, 235 },
+        {  25, 157, 221 },
+        {   5, 105, 174 },
+        {   1,  67, 120 },
+        {   1,  38,  69 },
+        {   1,  15,  30 }
       }, { /* Coeff Band 5 */
-        {  87, 200, 238,},
-        {  55, 151, 225,},
-        {  11, 106, 179,},
-        {   2,  72, 124,},
-        {   1,  42,  70,},
-        {   1,  17,  28,}
+        {  65, 204, 238 },
+        {  30, 156, 224 },
+        {   7, 107, 177 },
+        {   2,  70, 124 },
+        {   1,  42,  73 },
+        {   1,  18,  34 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        { 238,  66, 250,},
-        { 178,  84, 226,},
-        {  76,  83, 168,}
+        { 225,  86, 251 },
+        { 144, 104, 235 },
+        {  42,  99, 181 }
       }, { /* Coeff Band 1 */
-        { 137, 176, 246,},
-        { 176, 160, 237,},
-        {  68, 128, 205,},
-        {  40, 105, 167,},
-        {  22,  84, 131,},
-        {  11,  60,  91,}
+        {  85, 175, 239 },
+        { 112, 165, 229 },
+        {  29, 136, 200 },
+        {  12, 103, 162 },
+        {   6,  77, 123 },
+        {   2,  53,  84 }
       }, { /* Coeff Band 2 */
-        { 124, 192, 247,},
-        { 103, 161, 234,},
-        {  19, 108, 190,},
-        {   6,  74, 131,},
-        {   1,  41,  72,},
-        {   1,  14,  24,}
+        {  75, 183, 239 },
+        {  30, 155, 221 },
+        {   3, 106, 171 },
+        {   1,  74, 128 },
+        {   1,  44,  76 },
+        {   1,  17,  28 }
       }, { /* Coeff Band 3 */
-        { 118, 200, 248,},
-        {  91, 166, 235,},
-        {  16, 110, 186,},
-        {   3,  72, 124,},
-        {   1,  39,  66,},
-        {   1,  14,  19,}
+        {  73, 185, 240 },
+        {  27, 159, 222 },
+        {   2, 107, 172 },
+        {   1,  75, 127 },
+        {   1,  42,  73 },
+        {   1,  17,  29 }
       }, { /* Coeff Band 4 */
-        { 112, 213, 248,},
-        {  80, 172, 234,},
-        {  11, 112, 182,},
-        {   2,  73, 126,},
-        {   1,  40,  69,},
-        {   1,  16,  24,}
+        {  62, 190, 238 },
+        {  21, 159, 222 },
+        {   2, 107, 172 },
+        {   1,  72, 122 },
+        {   1,  40,  71 },
+        {   1,  18,  32 }
       }, { /* Coeff Band 5 */
-        { 100, 209, 245,},
-        {  65, 164, 232,},
-        {  11, 117, 186,},
-        {   2,  83, 136,},
-        {   1,  55,  88,},
-        {   1,  10,  38,}
+        {  61, 199, 240 },
+        {  27, 161, 226 },
+        {   4, 113, 180 },
+        {   1,  76, 129 },
+        {   1,  46,  80 },
+        {   1,  23,  41 }
       }
     }
   }
@@ -1043,169 +1043,169 @@ static const vp9_coeff_probs_model default_coef_probs_16x16[BLOCK_TYPES] = {
   { /* block Type 0 */
     { /* Intra */
       { /* Coeff Band 0 */
-        {   8,  26, 101,},
-        {   2,  25,  67,},
-        {   1,  15,  28,}
+        {   7,  27, 153 },
+        {   5,  30,  95 },
+        {   1,  16,  30 }
       }, { /* Coeff Band 1 */
-        {  22,  73, 118,},
-        {  43,  73, 116,},
-        {  24,  66, 105,},
-        {   9,  54,  85,},
-        {   2,  34,  54,},
-        {   1,  14,  22,}
+        {  50,  75, 127 },
+        {  57,  75, 124 },
+        {  27,  67, 108 },
+        {  10,  54,  86 },
+        {   1,  33,  52 },
+        {   1,  12,  18 }
       }, { /* Coeff Band 2 */
-        {  34, 123, 149,},
-        {  34, 106, 147,},
-        {  10,  81, 123,},
-        {   2,  56,  87,},
-        {   1,  35,  56,},
-        {   1,  17,  27,}
+        {  43, 125, 151 },
+        {  26, 108, 148 },
+        {   7,  83, 122 },
+        {   2,  59,  89 },
+        {   1,  38,  60 },
+        {   1,  17,  27 }
       }, { /* Coeff Band 3 */
-        {  27, 159, 171,},
-        {  17, 119, 162,},
-        {   3,  81, 128,},
-        {   1,  53,  87,},
-        {   1,  31,  52,},
-        {   1,  14,  24,}
+        {  23, 144, 163 },
+        {  13, 112, 154 },
+        {   2,  75, 117 },
+        {   1,  50,  81 },
+        {   1,  31,  51 },
+        {   1,  14,  23 }
       }, { /* Coeff Band 4 */
-        {  24, 189, 200,},
-        {  14, 136, 184,},
-        {   2,  87, 140,},
-        {   1,  54,  90,},
-        {   1,  28,  49,},
-        {   1,  12,  21,}
+        {  18, 162, 185 },
+        {   6, 123, 171 },
+        {   1,  78, 125 },
+        {   1,  51,  86 },
+        {   1,  31,  54 },
+        {   1,  14,  23 }
       }, { /* Coeff Band 5 */
-        {  32, 220, 227,},
-        {  12, 155, 200,},
-        {   1,  90, 144,},
-        {   1,  53,  90,},
-        {   1,  28,  50,},
-        {   1,  13,  22,}
+        {  15, 199, 227 },
+        {   3, 150, 204 },
+        {   1,  91, 146 },
+        {   1,  55,  95 },
+        {   1,  30,  53 },
+        {   1,  11,  20 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        {   5,  61, 234,},
-        {   3,  65, 184,},
-        {   1,  56, 104,}
+        {  19,  55, 240 },
+        {  19,  59, 196 },
+        {   3,  52, 105 }
       }, { /* Coeff Band 1 */
-        {  46, 183, 210,},
-        { 122, 166, 202,},
-        {  49, 125, 177,},
-        {  22,  99, 142,},
-        {   8,  69,  95,},
-        {   2,  38,  51,}
+        {  41, 166, 207 },
+        { 104, 153, 199 },
+        {  31, 123, 181 },
+        {  14, 101, 152 },
+        {   5,  72, 106 },
+        {   1,  36,  52 }
       }, { /* Coeff Band 2 */
-        {  56, 196, 218,},
-        {  38, 141, 195,},
-        {   7,  93, 147,},
-        {   2,  63, 101,},
-        {   1,  39,  61,},
-        {   1,  20,  33,}
+        {  35, 176, 211 },
+        {  12, 131, 190 },
+        {   2,  88, 144 },
+        {   1,  60, 101 },
+        {   1,  36,  60 },
+        {   1,  16,  28 }
       }, { /* Coeff Band 3 */
-        {  44, 206, 223,},
-        {  27, 147, 200,},
-        {   4,  93, 147,},
-        {   1,  58,  95,},
-        {   1,  32,  52,},
-        {   1,  14,  23,}
+        {  28, 183, 213 },
+        {   8, 134, 191 },
+        {   1,  86, 142 },
+        {   1,  56,  96 },
+        {   1,  30,  53 },
+        {   1,  12,  20 }
       }, { /* Coeff Band 4 */
-        {  39, 216, 227,},
-        {  22, 152, 204,},
-        {   2,  92, 148,},
-        {   1,  55,  91,},
-        {   1,  28,  47,},
-        {   1,  13,  21,}
+        {  20, 190, 215 },
+        {   4, 135, 192 },
+        {   1,  84, 139 },
+        {   1,  53,  91 },
+        {   1,  28,  49 },
+        {   1,  11,  20 }
       }, { /* Coeff Band 5 */
-        {  34, 228, 234,},
-        {  13, 161, 208,},
-        {   1,  95, 148,},
-        {   1,  55,  90,},
-        {   1,  30,  51,},
-        {   1,  16,  25,}
+        {  13, 196, 216 },
+        {   2, 137, 192 },
+        {   1,  86, 143 },
+        {   1,  57,  99 },
+        {   1,  32,  56 },
+        {   1,  13,  24 }
       }
     }
   }, { /* block Type 1 */
     { /* Intra */
       { /* Coeff Band 0 */
-        { 204,  33, 217,},
-        {  93,  48, 151,},
-        {  18,  43,  86,}
+        { 211,  29, 217 },
+        {  96,  47, 156 },
+        {  22,  43,  87 }
       }, { /* Coeff Band 1 */
-        {  43, 121, 184,},
-        {  93, 117, 177,},
-        {  33, 101, 158,},
-        {  11,  81, 129,},
-        {   2,  51,  82,},
-        {   1,  18,  29,}
+        {  78, 120, 193 },
+        { 111, 116, 186 },
+        {  46, 102, 164 },
+        {  15,  80, 128 },
+        {   2,  49,  76 },
+        {   1,  18,  28 }
       }, { /* Coeff Band 2 */
-        {  63, 154, 199,},
-        {  53, 128, 191,},
-        {  14,  99, 160,},
-        {   4,  75, 122,},
-        {   1,  47,  77,},
-        {   1,  18,  30,}
+        {  71, 161, 203 },
+        {  42, 132, 192 },
+        {  10,  98, 150 },
+        {   3,  69, 109 },
+        {   1,  44,  70 },
+        {   1,  18,  29 }
       }, { /* Coeff Band 3 */
-        {  48, 193, 210,},
-        {  26, 145, 201,},
-        {   6, 104, 165,},
-        {   1,  73, 120,},
-        {   1,  42,  69,},
-        {   1,  16,  27,}
+        {  57, 186, 211 },
+        {  30, 140, 196 },
+        {   4,  93, 146 },
+        {   1,  62, 102 },
+        {   1,  38,  65 },
+        {   1,  16,  27 }
       }, { /* Coeff Band 4 */
-        {  47, 213, 225,},
-        {  32, 153, 212,},
-        {   6, 102, 168,},
-        {   1,  66, 111,},
-        {   1,  36,  60,},
-        {   1,  16,  27,}
+        {  47, 199, 217 },
+        {  14, 145, 196 },
+        {   1,  88, 142 },
+        {   1,  57,  98 },
+        {   1,  36,  62 },
+        {   1,  15,  26 }
       }, { /* Coeff Band 5 */
-        {  46, 225, 232,},
-        {  24, 162, 214,},
-        {   3, 106, 165,},
-        {   1,  66, 108,},
-        {   1,  35,  59,},
-        {   1,  16,  27,}
+        {  26, 219, 229 },
+        {   5, 155, 207 },
+        {   1,  94, 151 },
+        {   1,  60, 104 },
+        {   1,  36,  62 },
+        {   1,  16,  28 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        { 229,  28, 245,},
-        { 151,  44, 210,},
-        {  55,  48, 131,}
+        { 233,  29, 248 },
+        { 146,  47, 220 },
+        {  43,  52, 140 }
       }, { /* Coeff Band 1 */
-        { 126, 165, 239,},
-        { 199, 158, 231,},
-        { 102, 136, 209,},
-        {  64, 116, 181,},
-        {  44,  98, 151,},
-        {  44,  81, 119,}
+        { 100, 163, 232 },
+        { 179, 161, 222 },
+        {  63, 142, 204 },
+        {  37, 113, 174 },
+        {  26,  89, 137 },
+        {  18,  68,  97 }
       }, { /* Coeff Band 2 */
-        { 108, 185, 239,},
-        {  91, 155, 224,},
-        {  20, 116, 185,},
-        {   8,  86, 141,},
-        {   3,  50,  92,},
-        {   1,  21,  40,}
+        {  85, 181, 230 },
+        {  32, 146, 209 },
+        {   7, 100, 164 },
+        {   3,  71, 121 },
+        {   1,  45,  77 },
+        {   1,  18,  30 }
       }, { /* Coeff Band 3 */
-        {  94, 198, 243,},
-        {  67, 164, 228,},
-        {  14, 120, 185,},
-        {   4,  83, 134,},
-        {   1,  48,  82,},
-        {   1,  26,  38,}
+        {  65, 187, 230 },
+        {  20, 148, 207 },
+        {   2,  97, 159 },
+        {   1,  68, 116 },
+        {   1,  40,  70 },
+        {   1,  14,  29 }
       }, { /* Coeff Band 4 */
-        {  82, 210, 245,},
-        {  55, 170, 231,},
-        {   8, 118, 184,},
-        {   2,  78, 126,},
-        {   1,  43,  68,},
-        {   1,  34,  40,}
+        {  40, 194, 227 },
+        {   8, 147, 204 },
+        {   1,  94, 155 },
+        {   1,  65, 112 },
+        {   1,  39,  66 },
+        {   1,  14,  26 }
       }, { /* Coeff Band 5 */
-        {  65, 228, 241,},
-        {  33, 173, 226,},
-        {   5, 120, 180,},
-        {   1,  81, 130,},
-        {   1,  51,  78,},
-        {   1,  18,  49,}
+        {  16, 208, 228 },
+        {   3, 151, 207 },
+        {   1,  98, 160 },
+        {   1,  67, 117 },
+        {   1,  41,  74 },
+        {   1,  17,  31 }
       }
     }
   }
@@ -1214,169 +1214,169 @@ static const vp9_coeff_probs_model default_coef_probs_32x32[BLOCK_TYPES] = {
   { /* block Type 0 */
     { /* Intra */
       { /* Coeff Band 0 */
-        {  37,  34, 137,},
-        {   3,  26,  60,},
-        {   1,  13,  23,}
+        {  17,  38, 140 },
+        {   7,  34,  80 },
+        {   1,  17,  29 }
       }, { /* Coeff Band 1 */
-        {  26,  77, 122,},
-        {  43,  76, 123,},
-        {  25,  67, 112,},
-        {   9,  54,  90,},
-        {   2,  32,  52,},
-        {   1,  10,  15,}
+        {  37,  75, 128 },
+        {  41,  76, 128 },
+        {  26,  66, 116 },
+        {  12,  52,  94 },
+        {   2,  32,  55 },
+        {   1,  10,  16 }
       }, { /* Coeff Band 2 */
-        {  32, 122, 143,},
-        {  46, 105, 143,},
-        {  17,  79, 116,},
-        {   4,  53,  78,},
-        {   1,  29,  44,},
-        {   1,  12,  18,}
+        {  50, 127, 154 },
+        {  37, 109, 152 },
+        {  16,  82, 121 },
+        {   5,  59,  85 },
+        {   1,  35,  54 },
+        {   1,  13,  20 }
       }, { /* Coeff Band 3 */
-        {  33, 157, 160,},
-        {  20, 116, 152,},
-        {   4,  74, 114,},
-        {   1,  44,  69,},
-        {   1,  25,  40,},
-        {   1,  12,  18,}
+        {  40, 142, 167 },
+        {  17, 110, 157 },
+        {   2,  71, 112 },
+        {   1,  44,  72 },
+        {   1,  27,  45 },
+        {   1,  11,  17 }
       }, { /* Coeff Band 4 */
-        {  25, 183, 174,},
-        {  13, 124, 159,},
-        {   2,  75, 117,},
-        {   1,  45,  73,},
-        {   1,  26,  43,},
-        {   1,  12,  19,}
+        {  30, 175, 188 },
+        {   9, 124, 169 },
+        {   1,  74, 116 },
+        {   1,  48,  78 },
+        {   1,  30,  49 },
+        {   1,  11,  18 }
       }, { /* Coeff Band 5 */
-        {  13, 232, 223,},
-        {   4, 155, 187,},
-        {   1,  86, 131,},
-        {   1,  49,  79,},
-        {   1,  26,  43,},
-        {   1,  12,  20,}
+        {  10, 222, 223 },
+        {   2, 150, 194 },
+        {   1,  83, 128 },
+        {   1,  48,  79 },
+        {   1,  27,  45 },
+        {   1,  11,  17 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        {  51,  37, 227,},
-        {   9,  36, 172,},
-        {  21,  26, 112,}
+        {  36,  41, 235 },
+        {  29,  36, 193 },
+        {  10,  27, 111 }
       }, { /* Coeff Band 1 */
-        {  79, 169, 219,},
-        { 177, 166, 216,},
-        { 119, 141, 196,},
-        {  63, 117, 165,},
-        {  30,  87, 117,},
-        {  14,  56,  60,}
+        {  85, 165, 222 },
+        { 177, 162, 215 },
+        { 110, 135, 195 },
+        {  57, 113, 168 },
+        {  23,  83, 120 },
+        {  10,  49,  61 }
       }, { /* Coeff Band 2 */
-        {  88, 195, 225,},
-        {  66, 145, 202,},
-        {  12,  97, 152,},
-        {   3,  66, 103,},
-        {   1,  38,  61,},
-        {   1,  19,  30,}
+        {  85, 190, 223 },
+        {  36, 139, 200 },
+        {   5,  90, 146 },
+        {   1,  60, 103 },
+        {   1,  38,  65 },
+        {   1,  18,  30 }
       }, { /* Coeff Band 3 */
-        {  79, 211, 228,},
-        {  50, 151, 205,},
-        {   7,  95, 149,},
-        {   1,  62,  98,},
-        {   1,  35,  57,},
-        {   1,  17,  26,}
+        {  72, 202, 223 },
+        {  23, 141, 199 },
+        {   2,  86, 140 },
+        {   1,  56,  97 },
+        {   1,  36,  61 },
+        {   1,  16,  27 }
       }, { /* Coeff Band 4 */
-        {  68, 225, 230,},
-        {  39, 156, 206,},
-        {   4,  94, 147,},
-        {   1,  58,  94,},
-        {   1,  32,  52,},
-        {   1,  15,  24,}
+        {  55, 218, 225 },
+        {  13, 145, 200 },
+        {   1,  86, 141 },
+        {   1,  57,  99 },
+        {   1,  35,  61 },
+        {   1,  13,  22 }
       }, { /* Coeff Band 5 */
-        {  45, 248, 234,},
-        {  19, 169, 204,},
-        {   2,  98, 145,},
-        {   1,  59,  92,},
-        {   1,  33,  52,},
-        {   1,  15,  24,}
+        {  15, 235, 212 },
+        {   1, 132, 184 },
+        {   1,  84, 139 },
+        {   1,  57,  97 },
+        {   1,  34,  56 },
+        {   1,  14,  23 }
       }
     }
   }, { /* block Type 1 */
     { /* Intra */
       { /* Coeff Band 0 */
-        { 179,  23, 200,},
-        {  60,  33, 113,},
-        {   8,  31,  59,}
+        { 181,  21, 201 },
+        {  61,  37, 123 },
+        {  10,  38,  71 }
       }, { /* Coeff Band 1 */
-        {  27, 103, 158,},
-        {  90, 101, 159,},
-        {  39,  91, 146,},
-        {  16,  75, 120,},
-        {   3,  48,  76,},
-        {   1,  18,  26,}
+        {  47, 106, 172 },
+        {  95, 104, 173 },
+        {  42,  93, 159 },
+        {  18,  77, 131 },
+        {   4,  50,  81 },
+        {   1,  17,  23 }
       }, { /* Coeff Band 2 */
-        {  45, 137, 177,},
-        {  47, 117, 167,},
-        {  16,  90, 136,},
-        {   6,  65, 100,},
-        {   1,  37,  58,},
-        {   1,  13,  19,}
+        {  62, 147, 199 },
+        {  44, 130, 189 },
+        {  28, 102, 154 },
+        {  18,  75, 115 },
+        {   2,  44,  65 },
+        {   1,  12,  19 }
       }, { /* Coeff Band 3 */
-        {  36, 171, 194,},
-        {  19, 129, 178,},
-        {   5,  90, 139,},
-        {   1,  59,  93,},
-        {   1,  31,  49,},
-        {   1,  10,  18,}
+        {  55, 153, 210 },
+        {  24, 130, 194 },
+        {   3,  93, 146 },
+        {   1,  61,  97 },
+        {   1,  31,  50 },
+        {   1,  10,  16 }
       }, { /* Coeff Band 4 */
-        {  37, 197, 210,},
-        {  20, 142, 191,},
-        {   3,  93, 144,},
-        {   1,  56,  88,},
-        {   1,  29,  47,},
-        {   1,  14,  22,}
+        {  49, 186, 223 },
+        {  17, 148, 204 },
+        {   1,  96, 142 },
+        {   1,  53,  83 },
+        {   1,  26,  44 },
+        {   1,  11,  17 }
       }, { /* Coeff Band 5 */
-        {  19, 227, 223,},
-        {   6, 152, 192,},
-        {   1,  89, 138,},
-        {   1,  52,  84,},
-        {   1,  29,  47,},
-        {   1,  14,  23,}
+        {  13, 217, 212 },
+        {   2, 136, 180 },
+        {   1,  78, 124 },
+        {   1,  50,  83 },
+        {   1,  29,  49 },
+        {   1,  14,  23 }
       }
     }, { /* Inter */
       { /* Coeff Band 0 */
-        { 205,  14, 245,},
-        {  97,  19, 213,},
-        {  31,  20, 144,}
+        { 197,  13, 247 },
+        {  82,  17, 222 },
+        {  25,  17, 162 }
       }, { /* Coeff Band 1 */
-        { 137, 182, 245,},
-        { 231, 185, 242,},
-        { 170, 175, 229,},
-        { 107, 157, 213,},
-        {  77, 126, 183,},
-        {  69,  96, 149,}
+        { 126, 186, 247 },
+        { 234, 191, 243 },
+        { 176, 177, 234 },
+        { 104, 158, 220 },
+        {  66, 128, 186 },
+        {  55,  90, 137 }
       }, { /* Coeff Band 2 */
-        { 107, 196, 241,},
-        {  92, 162, 221,},
-        {  20, 108, 181,},
-        {   7,  80, 132,},
-        {   2,  43,  75,},
-        {   1,  15,  48,}
+        { 111, 197, 242 },
+        {  46, 158, 219 },
+        {   9, 104, 171 },
+        {   2,  65, 125 },
+        {   1,  44,  80 },
+        {   1,  17,  91 }
       }, { /* Coeff Band 3 */
-        { 107, 202, 244,},
-        {  77, 167, 224,},
-        {  14, 117, 179,},
-        {   3,  84, 134,},
-        {   1,  57,  84,},
-        {   1,   1,   1,}
+        { 104, 208, 245 },
+        {  39, 168, 224 },
+        {   3, 109, 162 },
+        {   1,  79, 124 },
+        {   1,  50, 102 },
+        {   1,  43, 102 }
       }, { /* Coeff Band 4 */
-        {  88, 219, 248,},
-        {  61, 178, 234,},
-        {   6, 127, 188,},
-        {   1,  83, 130,},
-        {   1,  61,  66,},
-        { 128, 128, 128,}
+        {  84, 220, 246 },
+        {  31, 177, 231 },
+        {   2, 115, 180 },
+        {   1,  79, 134 },
+        {   1,  55,  77 },
+        {   1,  60,  79 }
       }, { /* Coeff Band 5 */
-        {  73, 243, 250,},
-        {  42, 197, 242,},
-        {  10, 137, 197,},
-        {   2,  85, 134,},
-        {   1,  70,  69,},
-        {   1,   1,   1,}
+        {  43, 243, 240 },
+        {   8, 180, 217 },
+        {   1, 115, 166 },
+        {   1,  84, 121 },
+        {   1,  51,  67 },
+        {   1,  16,   6 }
       }
     }
   }