6 files changed, 16 insertions, 32 deletions
diff --git a/vp9/common/vp9_coefupdateprobs.h b/vp9/common/vp9_coefupdateprobs.h
index ce3563483..e86200802 100644
--- a/vp9/common/vp9_coefupdateprobs.h
+++ b/vp9/common/vp9_coefupdateprobs.h
@@ -14,8 +14,6 @@
 /* Update probabilities for the nodes in the token entropy tree.
    Generated file included by vp9_entropy.c */
 
-#define VP9_DEF_UPDATE_PROB 252
-
 static const vp9_prob vp9_coef_update_prob[UNCONSTRAINED_NODES] = {
   252, 252, 252,
 };
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index 18d2ac111..33028146a 100644
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -149,36 +149,21 @@ static const vp9_prob default_single_ref_p[REF_CONTEXTS][2] = {
   { 238, 247 }
 };
 
-#if TX_SIZE_CONTEXTS == 2
 const vp9_prob vp9_default_tx_probs_32x32p[TX_SIZE_CONTEXTS]
                                           [TX_SIZE_MAX_SB - 1] = {
-  { 16, 32, 64, },
-  { 16, 32, 64, },
+  { 3, 136, 37, },
+  { 5, 52, 13, },
 };
 const vp9_prob vp9_default_tx_probs_16x16p[TX_SIZE_CONTEXTS]
                                           [TX_SIZE_MAX_SB - 2] = {
-  { 32, 64, },
-  { 32, 64, },
+  { 20, 152, },
+  { 15, 101, },
 };
 const vp9_prob vp9_default_tx_probs_8x8p[TX_SIZE_CONTEXTS]
                                         [TX_SIZE_MAX_SB - 3] = {
-  { 64, },
-  { 64, },
+  { 100, },
+  { 66, },
 };
-#else
-const vp9_prob vp9_default_tx_probs_32x32p[TX_SIZE_CONTEXTS]
-                                          [TX_SIZE_MAX_SB - 1] = {
-  { 16, 32, 64, },
-};
-const vp9_prob vp9_default_tx_probs_16x16p[TX_SIZE_CONTEXTS]
-                                          [TX_SIZE_MAX_SB - 2] = {
-  { 32, 64, },
-};
-const vp9_prob vp9_default_tx_probs_8x8p[TX_SIZE_CONTEXTS]
-                                        [TX_SIZE_MAX_SB - 3] = {
-  { 64, },
-};
-#endif
 
 void tx_counts_to_branch_counts_32x32(unsigned int *tx_count_32x32p,
                                       unsigned int (*ct_32x32p)[2]) {
@@ -254,7 +239,10 @@ const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = {
 const int vp9_switchable_interp_map[SWITCHABLE+1] = {1, 0, 2, -1, -1};
 const vp9_prob vp9_switchable_interp_prob [VP9_SWITCHABLE_FILTERS+1]
                                           [VP9_SWITCHABLE_FILTERS-1] = {
-  {248, 192}, { 32, 248}, { 32,  32}, {192, 160}
+  { 235, 162, },
+  { 36, 255, },
+  { 34, 3, },
+  { 149, 144, },
 };
 
 // Indicates if the filter is interpolating or non-interpolating
@@ -324,7 +312,7 @@ void vp9_adapt_mode_context(VP9_COMMON *pc) {
 }
 
 #define MODE_COUNT_SAT 20
-#define MODE_MAX_UPDATE_FACTOR 144
+#define MODE_MAX_UPDATE_FACTOR 128
 static int update_mode_ct(vp9_prob pre_prob, vp9_prob prob,
                           unsigned int branch_ct[2]) {
   int factor, count = branch_ct[0] + branch_ct[1];
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 96e498e1c..aa8aec7d2 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -17,6 +17,8 @@
 #define SUBMVREF_COUNT 5
 #define TX_SIZE_CONTEXTS 2
 
+#define VP9_MODE_UPDATE_PROB  252
+
 // #define MODE_STATS
 
 extern int vp9_mv_cont(const int_mv *l, const int_mv *a);
diff --git a/vp9/common/vp9_entropymv.c b/vp9/common/vp9_entropymv.c
index 320c29c6a..e07e43c8b 100644
--- a/vp9/common/vp9_entropymv.c
+++ b/vp9/common/vp9_entropymv.c
@@ -14,8 +14,8 @@
 
 //#define MV_COUNT_TESTING
 
-#define MV_COUNT_SAT 16
-#define MV_MAX_UPDATE_FACTOR 160
+#define MV_COUNT_SAT 20
+#define MV_MAX_UPDATE_FACTOR 128
 
 /* Integer pel reference mv threshold for use of high-precision 1/8 mv */
 #define COMPANDED_MVREF_THRESH    8
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h
index 118574b62..15994a6ae 100644
--- a/vp9/common/vp9_entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@ -24,7 +24,7 @@ void vp9_init_mv_probs(struct VP9Common *cm);
 void vp9_adapt_nmv_probs(struct VP9Common *cm, int usehp);
 int vp9_use_nmv_hp(const MV *ref);
 
-#define VP9_NMV_UPDATE_PROB  255
+#define VP9_NMV_UPDATE_PROB  252
 
 //#define MV_GROUP_UPDATE
 
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c
index c9305655d..17da4f215 100644
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -349,7 +349,6 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm,
     }
 
     case PRED_TX_SIZE: {
-#if TX_SIZE_CONTEXTS == 2
       int above_context, left_context;
       int max_tx_size;
       if (mi->mbmi.sb_type < BLOCK_SIZE_SB8X8)
@@ -376,9 +375,6 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm,
         above_context = left_context;
       }
       pred_context = (above_context + left_context > max_tx_size);
-#else
-      pred_context = 0;
-#endif
       break;
     }