Some tweaks to probabilities for ext-tx with dst1

derflr: up to 1.429% from a little less than 1.3% when
--enable-dst1 is also enabled with --enable-ext-tx.

Change-Id: I301229f2239b18acb96accc4fc44b64fa6927ace

diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index fcdf37852dc6a6ad81edbc9c190d88f3b49e4890..d54fefc35e63d19c649a0212593cda6ec12abfc3 100644 (file)
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -438,19 +438,19 @@ const vp9_tree_index vp9_ext_tx_tree[TREE_SIZE(EXT_TX_TYPES)] = {
 
 #if CONFIG_WAVELETS
 static const vp9_prob default_ext_tx_prob[TX_SIZES][EXT_TX_TYPES - 1] = {
-  { 240, 32, 128, 128, 128, 128, 128, 128, 128 },
-  { 208, 32, 128, 128, 128, 128, 128, 128, 128 },
-  { 176, 32, 128, 128, 128, 128, 128, 128, 128 },
-  { 160, 32, 128, 128, 128, 128, 128, 128, 128 },
+  { 224, 28, 128, 128, 128, 128, 128, 128, 128 },
+  { 200, 28, 128, 128, 128, 128, 128, 128, 128 },
+  { 176, 28, 128, 128, 128, 128, 128, 128, 128 },
+  { 160, 28, 128, 128, 128, 128, 128, 128, 128 },
 #if CONFIG_TX64X64
-  { 160, 32, 128, 128, 128, 128, 128, 128, 128 },
+  { 160, 28, 128, 128, 128, 128, 128, 128, 128 },
 #endif  // CONFIG_TX64X64
 };
 #else
 static const vp9_prob default_ext_tx_prob[3][EXT_TX_TYPES - 1] = {
-  { 240, 32, 128, 128, 128, 128, 128, 128, 128 },
-  { 208, 32, 128, 128, 128, 128, 128, 128, 128 },
-  { 176, 32, 128, 128, 128, 128, 128, 128, 128 },
+  { 224, 28, 128, 128, 128, 128, 128, 128, 128 },
+  { 200, 28, 128, 128, 128, 128, 128, 128, 128 },
+  { 176, 28, 128, 128, 128, 128, 128, 128, 128 },
 };
 #endif  // CONFIG_WAVELETS
 
@@ -472,7 +472,7 @@ static const vp9_prob default_ext_tx_prob[TX_SIZES][EXT_TX_TYPES - 1] = {
   { 240, 128, 128, 128, 128, 128, 128, 128 },
   { 208, 128, 128, 128, 128, 128, 128, 128 },
   { 176, 128, 128, 128, 128, 128, 128, 128 },
-  { 160, 128, 128, 128, 128, 128, 128, 128 },
+  { 168, 128, 128, 128, 128, 128, 128, 128 },
 #if CONFIG_TX64X64
   { 160, 128, 128, 128, 128, 128, 128, 128 },
 #endif  // CONFIG_TX64X64