commit 0b73f3e75c0d4d8bcda8ee75947b4405c7ab2279
author Frank Galligan <fgalligan@google.com> Wed May 03 22:43:22 2017 +0000
committer Yaowu Xu <yaowu@google.com> Thu May 04 01:13:39 2017 +0000
tree 67d5d372fd11d3eac9c8599328ea676aecae3f30
parent ddc846eac02d23b2a5119ee3ba06a33ba514ee5d

Revert "Deduplicate inv_txfm_cfg_ls array"

This reverts commit 15ad8e4e3ffc09318e86f3369d301f584f53ecbf.

Reason for revert: Merge Conflict with https://aomedia-review.googlesource.com/c/11181/

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=502

Change-Id: I6e7bb8f1a5a2f2d5ff09246c3932e41414a69047

av1/common/av1_inv_txfm2d.c

diff --git a/av1/common/av1_inv_txfm2d.c b/av1/common/av1_inv_txfm2d.c
index d56c7d1..688cfb4 100644
--- a/av1/common/av1_inv_txfm2d.c
+++ b/av1/common/av1_inv_txfm2d.c
@@ -29,6 +29,7 @@
   }
 }
 
+#if CONFIG_EXT_TX
 const TXFM_2D_CFG *inv_txfm_cfg_ls[TX_TYPES][TX_SIZES] = {
   // DCT_DCT
   {
@@ -58,7 +59,6 @@
 #endif
       &inv_txfm_2d_cfg_adst_adst_4, &inv_txfm_2d_cfg_adst_adst_8,
       &inv_txfm_2d_cfg_adst_adst_16, &inv_txfm_2d_cfg_adst_adst_32 },
-#if CONFIG_EXT_TX
   // FLIPADST_DCT
   {
 #if CONFIG_CB4X4
@@ -136,8 +136,35 @@
 #endif
     &inv_txfm_2d_cfg_adst_adst_4, &inv_txfm_2d_cfg_adst_adst_8,
     &inv_txfm_2d_cfg_adst_adst_16, &inv_txfm_2d_cfg_adst_adst_32 },
-#endif  // CONFIG_EXT_TX
 };
+#else
+const TXFM_2D_CFG *inv_txfm_cfg_ls[TX_TYPES][TX_SIZES] = {
+  {
+#if CONFIG_CB4X4
+      NULL,
+#endif
+      &inv_txfm_2d_cfg_dct_dct_4, &inv_txfm_2d_cfg_dct_dct_8,
+      &inv_txfm_2d_cfg_dct_dct_16, &inv_txfm_2d_cfg_dct_dct_32 },
+  {
+#if CONFIG_CB4X4
+      NULL,
+#endif
+      &inv_txfm_2d_cfg_adst_dct_4, &inv_txfm_2d_cfg_adst_dct_8,
+      &inv_txfm_2d_cfg_adst_dct_16, &inv_txfm_2d_cfg_adst_dct_32 },
+  {
+#if CONFIG_CB4X4
+      NULL,
+#endif
+      &inv_txfm_2d_cfg_dct_adst_4, &inv_txfm_2d_cfg_dct_adst_8,
+      &inv_txfm_2d_cfg_dct_adst_16, &inv_txfm_2d_cfg_dct_adst_32 },
+  {
+#if CONFIG_CB4X4
+      NULL,
+#endif
+      &inv_txfm_2d_cfg_adst_adst_4, &inv_txfm_2d_cfg_adst_adst_8,
+      &inv_txfm_2d_cfg_adst_adst_16, &inv_txfm_2d_cfg_adst_adst_32 },
+};
+#endif
 
 TXFM_2D_FLIP_CFG av1_get_inv_txfm_cfg(int tx_type, int tx_size) {
   TXFM_2D_FLIP_CFG cfg;