commit 17da2cab78f960008d0945e447e16842ffb450ba
author Deb Mukherjee <debargha@google.com> Sat Jun 08 00:09:44 2013 -0700
committer Deb Mukherjee <debargha@google.com> Sat Jun 08 12:32:26 2013 -0700
tree f4682738b8f3a6e0fc42d4259484cab67e2e048c
parent 67cb1f093cc531b8523fcf05ee78bfe26bb7b7a7

TX_SIZE contexts simplification.

Reduces TX_SIZE contexts to 2 for each kind. The code is
cleaner and there is hardly any performance difference with
more than two contexts.

Results: almost neutral

Change-Id: I17656bd6db76224ae2856adf882504560e7dbaa4

vp9/common/vp9_entropymode.h

diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 3e8d566..96e498e 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -15,6 +15,7 @@
 #include "vp9/common/vp9_treecoder.h"
 
 #define SUBMVREF_COUNT 5
+#define TX_SIZE_CONTEXTS 2
 
 // #define MODE_STATS
 
@@ -77,11 +78,11 @@
 extern const  vp9_prob vp9_switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1]
                                                  [VP9_SWITCHABLE_FILTERS - 1];
 
-extern const vp9_prob vp9_default_tx_probs_32x32p[TX_SIZE_MAX_SB]
+extern const vp9_prob vp9_default_tx_probs_32x32p[TX_SIZE_CONTEXTS]
                                                  [TX_SIZE_MAX_SB - 1];
-extern const vp9_prob vp9_default_tx_probs_16x16p[TX_SIZE_MAX_SB - 1]
+extern const vp9_prob vp9_default_tx_probs_16x16p[TX_SIZE_CONTEXTS]
                                                  [TX_SIZE_MAX_SB - 2];
-extern const vp9_prob vp9_default_tx_probs_8x8p[TX_SIZE_MAX_SB - 2]
+extern const vp9_prob vp9_default_tx_probs_8x8p[TX_SIZE_CONTEXTS]
                                                [TX_SIZE_MAX_SB - 3];
 
 extern void tx_counts_to_branch_counts_32x32(unsigned int *tx_count_32x32p,