commit 75bfeb8dd14817260bf55eeb45e3ec3db97db8c1
author Nathan E. Egge <negge@mozilla.com> Sat Sep 16 20:41:24 2017 -0400
committer Nathan Egge <negge@mozilla.com> Mon Sep 18 17:53:12 2017 +0000
tree 29bc551d16c08d6be093672c5abfe80a0a064dc8
parent 1aefb5ede576dffa950d151fbd755f08f91f02ae

Move daala_fdct8() / daala_idct8() into daala_tx.c.

This commit has no impact on metrics.

Change-Id: I58d85dc22627849657c88c082db940baff921f8d

av1/common/daala_tx.c

diff --git a/av1/common/daala_tx.c b/av1/common/daala_tx.c
index 8f93645..79cc68c 100644
--- a/av1/common/daala_tx.c
+++ b/av1/common/daala_tx.c
@@ -4142,3 +4142,21 @@
   od_bin_idst4(x, 1, y);
   for (i = 0; i < 4; i++) output[i] = (tran_low_t)x[i];
 }
+
+void daala_fdct8(const tran_low_t *input, tran_low_t *output) {
+  int i;
+  od_coeff x[8];
+  od_coeff y[8];
+  for (i = 0; i < 8; i++) x[i] = (od_coeff)input[i];
+  od_bin_fdct8(y, x, 1);
+  for (i = 0; i < 8; i++) output[i] = (tran_low_t)y[i];
+}
+
+void daala_idct8(const tran_low_t *input, tran_low_t *output) {
+  int i;
+  od_coeff x[8];
+  od_coeff y[8];
+  for (i = 0; i < 8; i++) y[i] = (od_coeff)input[i];
+  od_bin_idct8(x, 1, y);
+  for (i = 0; i < 8; i++) output[i] = (tran_low_t)x[i];
+}

av1/common/daala_tx.h

diff --git a/av1/common/daala_tx.h b/av1/common/daala_tx.h
index 59f88b2..fefdd42 100644
--- a/av1/common/daala_tx.h
+++ b/av1/common/daala_tx.h
@@ -8,6 +8,8 @@
 void daala_idct4(const tran_low_t *input, tran_low_t *output);
 void daala_fdst4(const tran_low_t *input, tran_low_t *output);
 void daala_idst4(const tran_low_t *input, tran_low_t *output);
+void daala_fdct8(const tran_low_t *input, tran_low_t *output);
+void daala_idct8(const tran_low_t *input, tran_low_t *output);
 
 void od_bin_fdct4(od_coeff y[4], const od_coeff *x, int xstride);
 void od_bin_idct4(od_coeff *x, int xstride, const od_coeff y[4]);

av1/common/idct.c

diff --git a/av1/common/idct.c b/av1/common/idct.c
index b4e3f04..046056a 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -1180,6 +1180,26 @@
   assert(tx_type == DCT_DCT);
 #endif
   static const transform_2d IHT_8[] = {
+#if CONFIG_DAALA_DCT8
+    { daala_idct8, daala_idct8 },    // DCT_DCT  = 0
+    { aom_iadst8_c, daala_idct8 },   // ADST_DCT = 1
+    { daala_idct8, aom_iadst8_c },   // DCT_ADST = 2
+    { aom_iadst8_c, aom_iadst8_c },  // ADST_ADST = 3
+#if CONFIG_EXT_TX
+    { aom_iadst8_c, daala_idct8 },   // FLIPADST_DCT
+    { daala_idct8, aom_iadst8_c },   // DCT_FLIPADST
+    { aom_iadst8_c, aom_iadst8_c },  // FLIPADST_FLIPADST
+    { aom_iadst8_c, aom_iadst8_c },  // ADST_FLIPADST
+    { aom_iadst8_c, aom_iadst8_c },  // FLIPADST_ADST
+    { iidtx8_c, iidtx8_c },          // IDTX
+    { daala_idct8, iidtx8_c },       // V_DCT
+    { iidtx8_c, daala_idct8 },       // H_DCT
+    { aom_iadst8_c, iidtx8_c },      // V_ADST
+    { iidtx8_c, aom_iadst8_c },      // H_ADST
+    { aom_iadst8_c, iidtx8_c },      // V_FLIPADST
+    { iidtx8_c, aom_iadst8_c },      // H_FLIPADST
+#endif
+#else
     { aom_idct8_c, aom_idct8_c },    // DCT_DCT  = 0
     { aom_iadst8_c, aom_idct8_c },   // ADST_DCT = 1
     { aom_idct8_c, aom_iadst8_c },   // DCT_ADST = 2
@@ -1198,6 +1218,7 @@
     { aom_iadst8_c, iidtx8_c },      // V_FLIPADST
     { iidtx8_c, aom_iadst8_c },      // H_FLIPADST
 #endif
+#endif
   };
 
   int i, j;