commit e68a3e4f48a49d2b2b8fb7f420e085d798f3b77b
author Sarah Parker <sarahparker@google.com> Thu Feb 16 14:03:24 2017 -0800
committer Sarah Parker <sarahparker@google.com> Wed Feb 22 00:18:07 2017 +0000
tree d2846259c7e9eb051bcd92910475c85c11e7015e
parent 9198d1356420efeb7fdc86dd3a9980510fcb58a4

Add default reduced set for ext-tx

Here we create a default set for the ext-tx experiment which
includes:

Intra: {DCT, ADST} X {DCT, ADST} + IDTX (identity in both directions)
Inter: DCT_DCT + IDTX

This set is used if indicated in the uncompressed header.

Change-Id: Ic907ada12b4e0c98cabb7c9650ab99942d0c0859

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 2fe92ea..9dacbfb 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -599,7 +599,9 @@
 static const int num_ext_tx_set_inter[EXT_TX_SETS_INTER] = { 1, 16, 12, 2 };
 static const int num_ext_tx_set_intra[EXT_TX_SETS_INTRA] = { 1, 7, 5 };
 
-static INLINE int get_ext_tx_set(TX_SIZE tx_size, BLOCK_SIZE bs, int is_inter) {
+static INLINE int get_ext_tx_set(TX_SIZE tx_size, BLOCK_SIZE bs, int is_inter,
+                                 int use_default) {
+  if (use_default) return is_inter ? 3 : 2;
   tx_size = txsize_sqr_map[tx_size];
 #if CONFIG_CB4X4
   (void)bs;
@@ -660,9 +662,9 @@
   { 1, 0, 0, 0 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 0, 0, 1 },
 };
 
-static INLINE int get_ext_tx_types(TX_SIZE tx_size, BLOCK_SIZE bs,
-                                   int is_inter) {
-  const int set = get_ext_tx_set(tx_size, bs, is_inter);
+static INLINE int get_ext_tx_types(TX_SIZE tx_size, BLOCK_SIZE bs, int is_inter,
+                                   int use_default) {
+  const int set = get_ext_tx_set(tx_size, bs, is_inter, use_default);
   return is_inter ? num_ext_tx_set_inter[set] : num_ext_tx_set_intra[set];
 }