commit 2496a858d91ac14f0ed80bc0647ed4fe8d49ebf4
author Nathan E. Egge <negge@mozilla.com> Mon Sep 18 15:59:54 2017 -0400
committer Nathan Egge <negge@mozilla.com> Tue Sep 19 16:41:45 2017 +0000
tree 441f77020a9628b3d56bde36f644ea341ef51881
parent f6d3ba6f4cb92fa8db0975d1c0579fe8a9d6a286

Move daala_fdst64() / daala_idst64() into daala_tx.c.

This commit has no impact on metrics.

Change-Id: Iba8baae9123c88062f10deb6e1e9a709708a4f19

av1/common/idct.c

diff --git a/av1/common/idct.c b/av1/common/idct.c
index a8f928c..151ce4a 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -86,21 +86,7 @@
   // Note overall scaling factor is 4 times orthogonal
 }
 
-#if CONFIG_TX64X64
-#if CONFIG_DAALA_DCT64
-static void ihalfright64_c(const tran_low_t *input, tran_low_t *output) {
-  int i;
-  tran_low_t inputhalf[32];
-  // No scaling within; Daala transforms are all orthonormal
-  for (i = 0; i < 32; ++i) {
-    inputhalf[i] = input[i];
-  }
-  for (i = 0; i < 32; ++i) {
-    output[i] = input[32 + i];
-  }
-  daala_idct32(inputhalf, output + 32);
-}
-#else
+#if CONFIG_TX64X64 && !CONFIG_DAALA_DCT64
 static void idct64_col_c(const tran_low_t *input, tran_low_t *output) {
   int32_t in[64], out[64];
   int i;
@@ -131,7 +117,6 @@
   aom_idct32_c(inputhalf, output + 32);
   // Note overall scaling factor is 4 * sqrt(2)  times orthogonal
 }
-#endif  // CONFIG_DAALA_DCT64
 #endif  // CONFIG_TX64X64
 
 // Inverse identity transform and add.
@@ -1449,23 +1434,23 @@
 #endif
   static const transform_2d IHT_64[] = {
 #if CONFIG_DAALA_DCT64
-    { daala_idct64, daala_idct64 },      // DCT_DCT
-    { ihalfright64_c, daala_idct64 },    // ADST_DCT
-    { daala_idct64, ihalfright64_c },    // DCT_ADST
-    { ihalfright64_c, ihalfright64_c },  // ADST_ADST
+    { daala_idct64, daala_idct64 },  // DCT_DCT
+    { daala_idst64, daala_idct64 },  // ADST_DCT
+    { daala_idct64, daala_idst64 },  // DCT_ADST
+    { daala_idst64, daala_idst64 },  // ADST_ADST
 #if CONFIG_EXT_TX
-    { ihalfright64_c, daala_idct64 },    // FLIPADST_DCT
-    { daala_idct64, ihalfright64_c },    // DCT_FLIPADST
-    { ihalfright64_c, ihalfright64_c },  // FLIPADST_FLIPADST
-    { ihalfright64_c, ihalfright64_c },  // ADST_FLIPADST
-    { ihalfright64_c, ihalfright64_c },  // FLIPADST_ADST
-    { daala_idtx64, daala_idtx64 },      // IDTX
-    { daala_idct64, daala_idtx64 },      // V_DCT
-    { daala_idtx64, daala_idct64 },      // H_DCT
-    { ihalfright64_c, daala_idtx64 },    // V_ADST
-    { daala_idtx64, ihalfright64_c },    // H_ADST
-    { ihalfright64_c, daala_idtx64 },    // V_FLIPADST
-    { daala_idtx64, ihalfright64_c },    // H_FLIPADST
+    { daala_idst64, daala_idct64 },  // FLIPADST_DCT
+    { daala_idct64, daala_idst64 },  // DCT_FLIPADST
+    { daala_idst64, daala_idst64 },  // FLIPADST_FLIPADST
+    { daala_idst64, daala_idst64 },  // ADST_FLIPADST
+    { daala_idst64, daala_idst64 },  // FLIPADST_ADST
+    { daala_idtx64, daala_idtx64 },  // IDTX
+    { daala_idct64, daala_idtx64 },  // V_DCT
+    { daala_idtx64, daala_idct64 },  // H_DCT
+    { daala_idst64, daala_idtx64 },  // V_ADST
+    { daala_idtx64, daala_idst64 },  // H_ADST
+    { daala_idst64, daala_idtx64 },  // V_FLIPADST
+    { daala_idtx64, daala_idst64 },  // H_FLIPADST
 #endif
 #else
     { idct64_col_c, idct64_row_c },      // DCT_DCT