commit 8b77d04e25ca95cf1fcfc6f7dca6f152639d29ef
author Jingning Han <jingning@google.com> Mon Feb 27 08:58:40 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Sun Mar 05 09:38:06 2017 -0800
tree 0ea161a52573afc873ed3cc992758a5b5269f269
parent febb59cd74e6d25101c83c3bd8cbbafcc499ed52

Decouples rect-tx from var-tx

With this patch, --enable-var-tx only enables recursive transform
partitioning without using rectangular transforms.
To enable use of rectangular transforms in addition, use:
--enable-var-tx --enable-rect-tx

The RD selection process is not fully tested under the var-tx flag
only. We might expect certain performance loss there.

Change-Id: Ie6aa17f1bbc3e8563b9990bc9ff79cc860d9a361

av1/common/common_data.h

diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 28af7ce..2a1f9c9 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -455,11 +455,12 @@
 #endif  // CONFIG_TX64X64
 };
 
+#if CONFIG_RECT_TX
 static const TX_SIZE max_txsize_rect_lookup[BLOCK_SIZES] = {
 #if CONFIG_CB4X4
   // 2X2,    2X4,      4X2,
   TX_2X2,    TX_2X2,   TX_2X2,
-#endif
+#endif  // CONFIG_CB4X4
   //                   4X4
                        TX_4X4,
   // 4X8,    8X4,      8X8
@@ -486,6 +487,9 @@
 #endif  // CONFIG_EXT_PARTITION
 #endif  // CONFIG_TX64X64
 };
+#else
+#define max_txsize_rect_lookup max_txsize_lookup
+#endif  // CONFIG_RECT_TX
 
 #if (CONFIG_VAR_TX || CONFIG_RECT_TX)
 // Same as "max_txsize_lookup[bsize] - TX_8X8", except for rectangular