From 1fdc2749004d482f36e8a160cffdcdc37772e295 Mon Sep 17 00:00:00 2001
From: Deb Mukherjee <debargha@google.com>
Date: Fri, 14 Nov 2014 17:11:45 -0800
Subject: [PATCH] Extends ext_tx expt to include all hybrid variants

Extends the ext-tx experiment to include all 9 DST/DCT
variants.

Results with ext_tx experiment:
derflr: +1.338 derflr (improved from 1.12)

Change-Id: I24b5564f96bce6ccaa13d88ca6cb9d0c57000597
---
 vp9/common/vp9_blockd.h      |  6 +++++-
 vp9/common/vp9_entropymode.c | 12 ++++++++----
 vp9/common/vp9_enums.h       |  4 ++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 32c69ff4d..874841fa6 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -266,7 +266,11 @@ static TX_TYPE ext_tx_to_txtype[EXT_TX_TYPES] = {
   ADST_ADST,
   FLIPADST_FLIPADST,
   ADST_FLIPADST,
-  FLIPADST_ADST
+  FLIPADST_ADST,
+  ADST_DCT,
+  DCT_ADST,
+  FLIPADST_DCT,
+  DCT_FLIPADST,
 };
 #endif
 
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index 9385c36ab..84e8c6dd1 100644
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -293,15 +293,19 @@ static const struct tx_probs default_tx_probs = {
 #if CONFIG_EXT_TX
 const vp9_tree_index vp9_ext_tx_tree[TREE_SIZE(EXT_TX_TYPES)] = {
   -NORM, 2,
-  4, 6,
+  4, 10,
+  6, 8,
   -ALT1, -ALT2,
   -ALT3, -ALT4,
+  12, 14,
+  -ALT5, -ALT6,
+  -ALT7, -ALT8,
 };
 
 static const vp9_prob default_ext_tx_prob[3][EXT_TX_TYPES - 1] = {
-  { 224, 128, 128, 128 },
-  { 208, 128, 128, 128 },
-  { 192, 128, 128, 128 },
+  { 240, 128, 128, 128, 128, 128, 128, 128 },
+  { 208, 128, 128, 128, 128, 128, 128, 128 },
+  { 176, 128, 128, 128, 128, 128, 128, 128 },
 };
 #endif  // CONFIG_EXT_TX
 
diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h
index cf6bba688..1549afd9d 100644
--- a/vp9/common/vp9_enums.h
+++ b/vp9/common/vp9_enums.h
@@ -119,6 +119,10 @@ typedef enum {
   ALT2 = 2,
   ALT3 = 3,
   ALT4 = 4,
+  ALT5 = 5,
+  ALT6 = 6,
+  ALT7 = 7,
+  ALT8 = 8,
   EXT_TX_TYPES
 } EXT_TX_TYPE;
 #endif
-- 
2.40.0