Commit 01b1d919 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Move the daala_idtx64() function into daala_tx.c.

This commit has no impact on metrics.

Change-Id: I872e29decf3dd7d9dc872d96865062c0d8d7125f
parent 4c77fc05
......@@ -4271,4 +4271,9 @@ void daala_idct64(const tran_low_t *input, tran_low_t *output) {
od_bin_idct64(x, 1, y);
for (i = 0; i < 64; i++) output[i] = (tran_low_t)x[i];
}
void daala_idtx64(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 64; i++) output[i] = input[i];
}
#endif
......@@ -25,6 +25,7 @@ void daala_idtx32(const tran_low_t *input, tran_low_t *output);
#if CONFIG_TX64X64
void daala_fdct64(const tran_low_t *input, tran_low_t *output);
void daala_idct64(const tran_low_t *input, tran_low_t *output);
void daala_idtx64(const tran_low_t *input, tran_low_t *output);
#endif
void od_bin_fdct4(od_coeff y[4], const od_coeff *x, int xstride);
......
......@@ -61,15 +61,11 @@ static void iidtx32_c(const tran_low_t *input, tran_low_t *output) {
}
}
#if CONFIG_TX64X64
#if CONFIG_TX64X64 && !CONFIG_DAALA_DCT64
static void iidtx64_c(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 64; ++i) {
#if CONFIG_DAALA_DCT64
output[i] = input[i];
#else
output[i] = (tran_low_t)dct_const_round_shift(input[i] * 4 * Sqrt2);
#endif
}
}
#endif // CONFIG_TX64X64
......@@ -1478,13 +1474,13 @@ void av1_iht64x64_4096_add_c(const tran_low_t *input, uint8_t *dest, int stride,
{ ihalfright64_c, ihalfright64_c }, // FLIPADST_FLIPADST
{ ihalfright64_c, ihalfright64_c }, // ADST_FLIPADST
{ ihalfright64_c, ihalfright64_c }, // FLIPADST_ADST
{ iidtx64_c, iidtx64_c }, // IDTX
{ daala_idct64, iidtx64_c }, // V_DCT
{ iidtx64_c, daala_idct64 }, // H_DCT
{ ihalfright64_c, iidtx64_c }, // V_ADST
{ iidtx64_c, ihalfright64_c }, // H_ADST
{ ihalfright64_c, iidtx64_c }, // V_FLIPADST
{ iidtx64_c, ihalfright64_c }, // H_FLIPADST
{ 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
#endif
#else
{ idct64_col_c, idct64_row_c }, // DCT_DCT
......
......@@ -2507,11 +2507,6 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
#if CONFIG_TX64X64
#if CONFIG_DAALA_DCT64
#if CONFIG_EXT_TX
static void fidtx64(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 64; ++i) output[i] = input[i];
}
// For use in lieu of ADST
static void fhalfright64(const tran_low_t *input, tran_low_t *output) {
int i;
......@@ -2589,13 +2584,13 @@ void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
{ fhalfright64, fhalfright64 }, // FLIPADST_FLIPADST
{ fhalfright64, fhalfright64 }, // ADST_FLIPADST
{ fhalfright64, fhalfright64 }, // FLIPADST_ADST
{ fidtx64, fidtx64 }, // IDTX
{ daala_fdct64, fidtx64 }, // V_DCT
{ fidtx64, daala_fdct64 }, // H_DCT
{ fhalfright64, fidtx64 }, // V_ADST
{ fidtx64, fhalfright64 }, // H_ADST
{ fhalfright64, fidtx64 }, // V_FLIPADST
{ fidtx64, fhalfright64 }, // H_FLIPADST
{ daala_idtx64, daala_idtx64 }, // IDTX
{ daala_fdct64, daala_idtx64 }, // V_DCT
{ daala_idtx64, daala_fdct64 }, // H_DCT
{ fhalfright64, daala_idtx64 }, // V_ADST
{ daala_idtx64, fhalfright64 }, // H_ADST
{ fhalfright64, daala_idtx64 }, // V_FLIPADST
{ daala_idtx64, fhalfright64 }, // H_FLIPADST
#endif
#else
{ fdct64_col, fdct64_row }, // 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