Commit 74e7fd03 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Move the daala_idtx16() function into daala_tx.c.

This commit has no impact on metrics.

Change-Id: I9544083f923a94a69490f5efac6e4075db24aeb5
parent 3f45fb3d
...@@ -4225,6 +4225,11 @@ void daala_idst16(const tran_low_t *input, tran_low_t *output) { ...@@ -4225,6 +4225,11 @@ void daala_idst16(const tran_low_t *input, tran_low_t *output) {
for (i = 0; i < 16; i++) output[i] = (tran_low_t)x[i]; for (i = 0; i < 16; i++) output[i] = (tran_low_t)x[i];
} }
void daala_idtx16(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 16; i++) output[i] = input[i];
}
void daala_fdct32(const tran_low_t *input, tran_low_t *output) { void daala_fdct32(const tran_low_t *input, tran_low_t *output) {
int i; int i;
od_coeff x[32]; od_coeff x[32];
......
...@@ -18,6 +18,7 @@ void daala_fdct16(const tran_low_t *input, tran_low_t *output); ...@@ -18,6 +18,7 @@ void daala_fdct16(const tran_low_t *input, tran_low_t *output);
void daala_idct16(const tran_low_t *input, tran_low_t *output); void daala_idct16(const tran_low_t *input, tran_low_t *output);
void daala_fdst16(const tran_low_t *input, tran_low_t *output); void daala_fdst16(const tran_low_t *input, tran_low_t *output);
void daala_idst16(const tran_low_t *input, tran_low_t *output); void daala_idst16(const tran_low_t *input, tran_low_t *output);
void daala_idtx16(const tran_low_t *input, tran_low_t *output);
void daala_fdct32(const tran_low_t *input, tran_low_t *output); void daala_fdct32(const tran_low_t *input, tran_low_t *output);
void daala_idct32(const tran_low_t *input, tran_low_t *output); void daala_idct32(const tran_low_t *input, tran_low_t *output);
#if CONFIG_TX64X64 #if CONFIG_TX64X64
......
...@@ -50,11 +50,7 @@ static void iidtx8_c(const tran_low_t *input, tran_low_t *output) { ...@@ -50,11 +50,7 @@ static void iidtx8_c(const tran_low_t *input, tran_low_t *output) {
static void iidtx16_c(const tran_low_t *input, tran_low_t *output) { static void iidtx16_c(const tran_low_t *input, tran_low_t *output) {
int i; int i;
for (i = 0; i < 16; ++i) { for (i = 0; i < 16; ++i) {
#if CONFIG_DAALA_DCT16
output[i] = input[i];
#else
output[i] = (tran_low_t)dct_const_round_shift(input[i] * 2 * Sqrt2); output[i] = (tran_low_t)dct_const_round_shift(input[i] * 2 * Sqrt2);
#endif
} }
} }
...@@ -1290,13 +1286,13 @@ void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride, ...@@ -1290,13 +1286,13 @@ void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
{ daala_idst16, daala_idst16 }, // FLIPADST_FLIPADST { daala_idst16, daala_idst16 }, // FLIPADST_FLIPADST
{ daala_idst16, daala_idst16 }, // ADST_FLIPADST { daala_idst16, daala_idst16 }, // ADST_FLIPADST
{ daala_idst16, daala_idst16 }, // FLIPADST_ADST { daala_idst16, daala_idst16 }, // FLIPADST_ADST
{ iidtx16_c, iidtx16_c }, // IDTX { daala_idtx16, daala_idtx16 }, // IDTX
{ daala_idct16, iidtx16_c }, // V_DCT { daala_idct16, daala_idtx16 }, // V_DCT
{ iidtx16_c, daala_idct16 }, // H_DCT { daala_idtx16, daala_idct16 }, // H_DCT
{ daala_idst16, iidtx16_c }, // V_ADST { daala_idst16, daala_idtx16 }, // V_ADST
{ iidtx16_c, daala_idst16 }, // H_ADST { daala_idtx16, daala_idst16 }, // H_ADST
{ daala_idst16, iidtx16_c }, // V_FLIPADST { daala_idst16, daala_idtx16 }, // V_FLIPADST
{ iidtx16_c, daala_idst16 }, // H_FLIPADST { daala_idtx16, daala_idst16 }, // H_FLIPADST
#endif #endif
#else #else
{ aom_idct16_c, aom_idct16_c }, // DCT_DCT = 0 { aom_idct16_c, aom_idct16_c }, // DCT_DCT = 0
......
...@@ -1133,11 +1133,7 @@ static void fidtx8(const tran_low_t *input, tran_low_t *output) { ...@@ -1133,11 +1133,7 @@ static void fidtx8(const tran_low_t *input, tran_low_t *output) {
static void fidtx16(const tran_low_t *input, tran_low_t *output) { static void fidtx16(const tran_low_t *input, tran_low_t *output) {
int i; int i;
for (i = 0; i < 16; ++i) { for (i = 0; i < 16; ++i) {
#if CONFIG_DAALA_DCT16
output[i] = input[i];
#else
output[i] = (tran_low_t)fdct_round_shift(input[i] * 2 * Sqrt2); output[i] = (tran_low_t)fdct_round_shift(input[i] * 2 * Sqrt2);
#endif
} }
} }
...@@ -2338,13 +2334,13 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, ...@@ -2338,13 +2334,13 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
{ daala_fdst16, daala_fdst16 }, // FLIPADST_FLIPADST { daala_fdst16, daala_fdst16 }, // FLIPADST_FLIPADST
{ daala_fdst16, daala_fdst16 }, // ADST_FLIPADST { daala_fdst16, daala_fdst16 }, // ADST_FLIPADST
{ daala_fdst16, daala_fdst16 }, // FLIPADST_ADST { daala_fdst16, daala_fdst16 }, // FLIPADST_ADST
{ fidtx16, fidtx16 }, // IDTX { daala_idtx16, daala_idtx16 }, // IDTX
{ daala_fdct16, fidtx16 }, // V_DCT { daala_fdct16, daala_idtx16 }, // V_DCT
{ fidtx16, daala_fdct16 }, // H_DCT { daala_idtx16, daala_fdct16 }, // H_DCT
{ daala_fdst16, fidtx16 }, // V_ADST { daala_fdst16, daala_idtx16 }, // V_ADST
{ fidtx16, daala_fdst16 }, // H_ADST { daala_idtx16, daala_fdst16 }, // H_ADST
{ daala_fdst16, fidtx16 }, // V_FLIPADST { daala_fdst16, daala_idtx16 }, // V_FLIPADST
{ fidtx16, daala_fdst16 }, // H_FLIPADST { daala_idtx16, daala_fdst16 }, // H_FLIPADST
#endif #endif
#else #else
{ fdct16, fdct16 }, // DCT_DCT { fdct16, fdct16 }, // DCT_DCT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment