Commit 31f24eec authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Move the daala_idtx4() function into daala_tx.c.

This commit has no impact on metrics.

Change-Id: I7732d8cadc74e9cfec3939120abb55262a5be9aa
parent fe02452e
......@@ -4143,6 +4143,11 @@ void daala_idst4(const tran_low_t *input, tran_low_t *output) {
for (i = 0; i < 4; i++) output[i] = (tran_low_t)x[i];
}
void daala_idtx4(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 4; i++) output[i] = input[i];
}
void daala_fdct8(const tran_low_t *input, tran_low_t *output) {
int i;
od_coeff x[8];
......
......@@ -8,6 +8,7 @@ void daala_fdct4(const tran_low_t *input, tran_low_t *output);
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_idtx4(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 daala_fdst8(const tran_low_t *input, tran_low_t *output);
......
......@@ -36,11 +36,7 @@ int av1_get_tx_scale(const TX_SIZE tx_size) {
static void iidtx4_c(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 4; ++i) {
#if CONFIG_DAALA_DCT4
output[i] = input[i];
#else
output[i] = (tran_low_t)dct_const_round_shift(input[i] * Sqrt2);
#endif
}
}
......@@ -332,13 +328,13 @@ void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride,
{ daala_idst4, daala_idst4 }, // FLIPADST_FLIPADST
{ daala_idst4, daala_idst4 }, // ADST_FLIPADST
{ daala_idst4, daala_idst4 }, // FLIPADST_ADST
{ iidtx4_c, iidtx4_c }, // IDTX
{ daala_idct4, iidtx4_c }, // V_DCT
{ iidtx4_c, daala_idct4 }, // H_DCT
{ daala_idst4, iidtx4_c }, // V_ADST
{ iidtx4_c, daala_idst4 }, // H_ADST
{ daala_idst4, iidtx4_c }, // V_FLIPADST
{ iidtx4_c, daala_idst4 }, // H_FLIPADST
{ daala_idtx4, daala_idtx4 }, // IDTX
{ daala_idct4, daala_idtx4 }, // V_DCT
{ daala_idtx4, daala_idct4 }, // H_DCT
{ daala_idst4, daala_idtx4 }, // V_ADST
{ daala_idtx4, daala_idst4 }, // H_ADST
{ daala_idst4, daala_idtx4 }, // V_FLIPADST
{ daala_idtx4, daala_idst4 }, // H_FLIPADST
#endif
#else
{ aom_idct4_c, aom_idct4_c }, // DCT_DCT = 0
......
......@@ -1119,11 +1119,7 @@ static void flgt8(const tran_low_t *input, tran_low_t *output,
static void fidtx4(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 4; ++i) {
#if CONFIG_DAALA_DCT4
output[i] = input[i];
#else
output[i] = (tran_low_t)fdct_round_shift(input[i] * Sqrt2);
#endif
}
}
......@@ -1286,13 +1282,13 @@ void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
{ daala_fdst4, daala_fdst4 }, // FLIPADST_FLIPADST
{ daala_fdst4, daala_fdst4 }, // ADST_FLIPADST
{ daala_fdst4, daala_fdst4 }, // FLIPADST_ADST
{ fidtx4, fidtx4 }, // IDTX
{ daala_fdct4, fidtx4 }, // V_DCT
{ fidtx4, daala_fdct4 }, // H_DCT
{ daala_fdst4, fidtx4 }, // V_ADST
{ fidtx4, daala_fdst4 }, // H_ADST
{ daala_fdst4, fidtx4 }, // V_FLIPADST
{ fidtx4, daala_fdst4 }, // H_FLIPADST
{ daala_idtx4, daala_idtx4 }, // IDTX
{ daala_fdct4, daala_idtx4 }, // V_DCT
{ daala_idtx4, daala_fdct4 }, // H_DCT
{ daala_fdst4, daala_idtx4 }, // V_ADST
{ daala_idtx4, daala_fdst4 }, // H_ADST
{ daala_fdst4, daala_idtx4 }, // V_FLIPADST
{ daala_idtx4, daala_fdst4 }, // H_FLIPADST
#endif
#else
{ fdct4, fdct4 }, // 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