New default tables

Change-Id: Ice8c73a2a843113877b8f8ed78737a1442c25ced

1 files changed, 63 insertions, 63 deletions

diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index bf57e7ecc..a40962003 100644
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -17,84 +17,84 @@
 
 static const vp9_prob default_kf_uv_probs[VP9_INTRA_MODES]
                                          [VP9_INTRA_MODES - 1] = {
-  { 149,  13,  48, 141, 174, 131,  54,  61, 109 } /* y = dc */,
-  { 120,  17, 119, 132, 103, 103,  54, 100, 130 } /* y = v */,
-  { 114,  16,  19, 177, 220, 145,  31,  33, 122 } /* y = h */,
-  { 119,  12,  43, 102, 133, 133,  77,  90, 102 } /* y = d45 */,
-  { 110,  10,  28, 144,  78, 158,  40,  49, 161 } /* y = d135 */,
-  { 114,  10,  46, 169,  50,  96,  48,  70, 150 } /* y = d117 */,
-  { 116,  10,  24, 125, 134, 168,  26,  27, 193 } /* y = d153 */,
-  { 121,  14,  26, 124, 175, 143,  36,  37,  79 } /* y = d27 */,
-  { 116,  13,  54, 100, 105, 122,  58, 126, 122 } /* y = d63 */,
-  {  98,  22,  60, 147, 159, 124,  45,  68, 128 } /* y = tm */
+  { 144,  11,  54, 157, 195, 130,  46,  58, 108 } /* y = dc */,
+  { 118,  15, 123, 148, 131, 101,  44,  93, 131 } /* y = v */,
+  { 113,  12,  23, 188, 226, 142,  26,  32, 125 } /* y = h */,
+  { 120,  11,  50, 123, 163, 135,  64,  77, 103 } /* y = d45 */,
+  { 113,   9,  36, 155, 111, 157,  32,  44, 161 } /* y = d135 */,
+  { 116,   9,  55, 176,  76,  96,  37,  61, 149 } /* y = d117 */,
+  { 115,   9,  28, 141, 161, 167,  21,  25, 193 } /* y = d153 */,
+  { 120,  12,  32, 145, 195, 142,  32,  38,  86 } /* y = d27 */,
+  { 116,  12,  64, 120, 140, 125,  49, 115, 121 } /* y = d63 */,
+  { 102,  19,  66, 162, 182, 122,  35,  59, 128 } /* y = tm */
 };
 
 static const vp9_prob default_if_y_probs[BLOCK_SIZE_GROUPS]
                                         [VP9_INTRA_MODES - 1] = {
-  {  42,  31,  23, 150, 161, 193,  32,  53, 100 } /* block_size < 8x8 */,
-  { 132,  58,  30, 160, 209, 195,  52,  47,  76 } /* block_size < 16x16 */,
-  { 179,  85,  24, 168, 236, 198,  87,  45,  46 } /* block_size < 32x32 */,
-  { 221, 176,  63, 133, 233, 121, 125, 105,  34 } /* block_size >= 32x32 */
+  {  65,  32,  18, 144, 162, 194,  41,  51,  98 } /* block_size < 8x8 */,
+  { 132,  68,  18, 165, 217, 196,  45,  40,  78 } /* block_size < 16x16 */,
+  { 173,  80,  19, 176, 240, 193,  64,  35,  46 } /* block_size < 32x32 */,
+  { 221, 135,  38, 194, 248, 121,  96,  85,  29 } /* block_size >= 32x32 */
 };
 
 static const vp9_prob default_if_uv_probs[VP9_INTRA_MODES]
                                          [VP9_INTRA_MODES - 1] = {
-  { 115,   7,  78, 180, 210, 127,  34,  57, 104 } /* y = dc */,
-  {  43,   9, 165, 140, 112,  93,  45, 125, 117 } /* y = v */,
-  {  68,   6,  25, 206, 241, 154,  16,  23, 102 } /* y = h */,
-  {  90,   5,  48, 117, 155, 134,  61,  88,  96 } /* y = d45 */,
-  {  77,   5,  43, 148, 100, 147,  37,  60, 146 } /* y = d135 */,
-  {  75,   5,  57, 167,  62,  91,  45,  76, 139 } /* y = d117 */,
-  {  86,   4,  34, 155, 185, 163,  22,  29, 160 } /* y = d153 */,
-  {  82,   5,  34, 155, 207, 144,  26,  38,  79 } /* y = d27 */,
-  {  69,   6,  65, 105, 104, 122,  48, 131, 116 } /* y = d63 */,
-  {  86,  16, 114, 177, 189, 108,  28,  72, 120 } /* y = tm */
+  { 120,   7,  76, 176, 208, 126,  28,  54, 103 } /* y = dc */,
+  {  48,  12, 154, 155, 139,  90,  34, 117, 119 } /* y = v */,
+  {  67,   6,  25, 204, 243, 158,  13,  21,  96 } /* y = h */,
+  {  97,   5,  44, 131, 176, 139,  48,  68,  97 } /* y = d45 */,
+  {  83,   5,  42, 156, 111, 152,  26,  49, 152 } /* y = d135 */,
+  {  80,   5,  58, 178,  74,  83,  33,  62, 145 } /* y = d117 */,
+  {  86,   5,  32, 154, 192, 168,  14,  22, 163 } /* y = d153 */,
+  {  85,   5,  32, 156, 216, 148,  19,  29,  73 } /* y = d27 */,
+  {  77,   7,  64, 116, 132, 122,  37, 126, 120 } /* y = d63 */,
+  { 101,  21, 107, 181, 192, 103,  19,  67, 125 } /* y = tm */
 };
 
 const vp9_prob vp9_partition_probs[NUM_FRAME_TYPES][NUM_PARTITION_CONTEXTS]
                                   [PARTITION_TYPES - 1] = {
   { /* frame_type = keyframe */
     /* 8x8 -> 4x4 */
-    { 164, 121, 109 } /* a/l both not split */,
-    {  69,  11, 129 } /* a split, l not split */,
-    {  52, 181,  37 } /* l split, a not split */,
-    {  66,  71,  93 } /* a/l both split */,
+    { 158,  97,  94 } /* a/l both not split */,
+    {  93,  24,  99 } /* a split, l not split */,
+    {  85, 119,  44 } /* l split, a not split */,
+    {  62,  59,  67 } /* a/l both split */,
     /* 16x16 -> 8x8 */
-    { 154,  48,  43 } /* a/l both not split */,
-    {  81,  11,  63 } /* a split, l not split */,
-    {  67,  65,  17 } /* l split, a not split */,
-    {  57,  18,  24 } /* a/l both split */,
+    { 149,  53,  53 } /* a/l both not split */,
+    {  94,  20,  48 } /* a split, l not split */,
+    {  83,  53,  24 } /* l split, a not split */,
+    {  52,  18,  18 } /* a/l both split */,
     /* 32x32 -> 16x16 */
-    { 156,  42,  35 } /* a/l both not split */,
-    {  74,  10,  40 } /* a split, l not split */,
-    {  59,  53,  10 } /* l split, a not split */,
-    {  28,  10,   9 } /* a/l both split */,
+    { 150,  40,  39 } /* a/l both not split */,
+    {  78,  12,  26 } /* a split, l not split */,
+    {  67,  33,  11 } /* l split, a not split */,
+    {  24,   7,   5 } /* a/l both split */,
     /* 64x64 -> 32x32 */
-    { 168,  32,  43 } /* a/l both not split */,
-    {  59,  13,  41 } /* a split, l not split */,
-    {  60,  25,  10 } /* l split, a not split */,
-    {  13,   5,   4 } /* a/l both split */
+    { 174,  35,  49 } /* a/l both not split */,
+    {  68,  11,  27 } /* a split, l not split */,
+    {  57,  15,   9 } /* l split, a not split */,
+    {  12,   3,   3 } /* a/l both split */
   }, { /* frame_type = interframe */
     /* 8x8 -> 4x4 */
-    { 192, 121, 151 } /* a/l both not split */,
-    { 134,  63, 162 } /* a split, l not split */,
-    { 136, 134, 127 } /* l split, a not split */,
-    { 101,  97, 131 } /* a/l both split */,
+    { 199, 122, 141 } /* a/l both not split */,
+    { 147,  63, 159 } /* a split, l not split */,
+    { 148, 133, 118 } /* l split, a not split */,
+    { 121, 104, 114 } /* a/l both split */,
     /* 16x16 -> 8x8 */
-    { 167,  67,  80 } /* a/l both not split */,
-    {  87,  36,  70 } /* a split, l not split */,
-    {  90,  61,  45 } /* l split, a not split */,
-    {  46,  31,  32 } /* a/l both split */,
+    { 174,  73,  87 } /* a/l both not split */,
+    {  92,  41,  83 } /* a split, l not split */,
+    {  82,  99,  50 } /* l split, a not split */,
+    {  53,  39,  39 } /* a/l both split */,
     /* 32x32 -> 16x16 */
-    { 167,  63,  75 } /* a/l both not split */,
-    {  67,  27,  61 } /* a split, l not split */,
-    {  56,  87,  31 } /* l split, a not split */,
-    {  15,  13,  11 } /* a/l both split */,
+    { 177,  58,  59 } /* a/l both not split */,
+    {  68,  26,  63 } /* a split, l not split */,
+    {  52,  79,  25 } /* l split, a not split */,
+    {  17,  14,  12 } /* a/l both split */,
     /* 64x64 -> 32x32 */
-    { 222,  45,  44 } /* a/l both not split */,
-    {  62,  17,  62 } /* a split, l not split */,
-    {  52,  65,  16 } /* l split, a not split */,
-    {   9,   7,   6 } /* a/l both split */
+    { 222,  34,  30 } /* a/l both not split */,
+    {  72,  16,  44 } /* a split, l not split */,
+    {  58,  32,  12 } /* l split, a not split */,
+    {  10,   7,   6 } /* a/l both split */
   }
 };
 
@@ -130,7 +130,7 @@ struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_INTER_MODES];
 struct vp9_token vp9_partition_encodings[PARTITION_TYPES];
 
 static const vp9_prob default_intra_inter_p[INTRA_INTER_CONTEXTS] = {
-  6, 87, 165, 213
+  9, 102, 187, 225
 };
 
 static const vp9_prob default_comp_inter_p[COMP_INTER_CONTEXTS] = {
@@ -138,15 +138,15 @@ static const vp9_prob default_comp_inter_p[COMP_INTER_CONTEXTS] = {
 };
 
 static const vp9_prob default_comp_ref_p[REF_CONTEXTS] = {
-  36, 93, 136, 205, 236
+  50, 126, 123, 221, 226
 };
 
 static const vp9_prob default_single_ref_p[REF_CONTEXTS][2] = {
-  { 30, 17 },
-  { 80, 66 },
-  { 142, 129 },
-  { 192, 178 },
-  { 235, 248 },
+  {  33,  16 },
+  {  77,  74 },
+  { 142, 142 },
+  { 172, 170 },
+  { 238, 247 }
 };
 
 void tx_counts_to_branch_counts(unsigned int *tx_count_32x32p,