commit d6bdd46bcc79862d4bfed315dd8498c4a46dd3c2
author Yue Chen <yuec@google.com> Wed Jul 19 16:05:43 2017 -0700
committer Yue Chen <yuec@google.com> Wed Jul 26 22:53:44 2017 +0000
tree 0a2b1d8397d096a66dbb7f12e802b26048b6bce4
parent 748d570e1917dfd48046991a7a66d49d4e8e93ba

rect_tx_ext: work with var_tx

Change-Id: Ie2c34490dc50cb242bcd701308e6b55243883b15

av1/common/idct.c

diff --git a/av1/common/idct.c b/av1/common/idct.c
index 09f01d3..7915b70 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -1623,7 +1623,7 @@
 }
 
 // These will be used by the masked-tx experiment in the future.
-#if CONFIG_RECT_TX && CONFIG_EXT_TX && CONFIG_RECT_TX_EXT
+#if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
 static void inv_txfm_add_4x16(const tran_low_t *input, uint8_t *dest,
                               int stride, const TxfmParam *txfm_param) {
 #if CONFIG_LGT
@@ -1659,7 +1659,7 @@
   av1_iht32x8_256_add(input, dest, stride, txfm_param);
 #endif
 }
-#endif  // CONFIG_RECT_TX && CONFIG_EXT_TX && CONFIG_RECT_TX_EXT
+#endif
 
 static void inv_txfm_add_8x16(const tran_low_t *input, uint8_t *dest,
                               int stride, const TxfmParam *txfm_param) {
@@ -2146,7 +2146,7 @@
 #if CONFIG_CHROMA_2X2
     case TX_2X2: inv_txfm_add_2x2(input, dest, stride, txfm_param); break;
 #endif
-#if CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
+#if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
     case TX_32X8: inv_txfm_add_32x8(input, dest, stride, txfm_param); break;
     case TX_8X32: inv_txfm_add_8x32(input, dest, stride, txfm_param); break;
     case TX_16X4: inv_txfm_add_16x4(input, dest, stride, txfm_param); break;