Commit 4c77fc05 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Move the daala_idtx32() function into daala_tx.c.

This commit has no impact on metrics.

Change-Id: I5d3dd031703b48e2efd3aaaebef070569c0c4a2d
parent 74e7fd03
...@@ -4248,6 +4248,11 @@ void daala_idct32(const tran_low_t *input, tran_low_t *output) { ...@@ -4248,6 +4248,11 @@ void daala_idct32(const tran_low_t *input, tran_low_t *output) {
for (i = 0; i < 32; i++) output[i] = (tran_low_t)x[i]; for (i = 0; i < 32; i++) output[i] = (tran_low_t)x[i];
} }
void daala_idtx32(const tran_low_t *input, tran_low_t *output) {
int i;
for (i = 0; i < 32; i++) output[i] = input[i];
}
#if CONFIG_TX64X64 #if CONFIG_TX64X64
void daala_fdct64(const tran_low_t *input, tran_low_t *output) { void daala_fdct64(const tran_low_t *input, tran_low_t *output) {
int i; int i;
......
...@@ -21,6 +21,7 @@ void daala_idst16(const tran_low_t *input, tran_low_t *output); ...@@ -21,6 +21,7 @@ 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_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);
void daala_idtx32(const tran_low_t *input, tran_low_t *output);
#if CONFIG_TX64X64 #if CONFIG_TX64X64
void daala_fdct64(const tran_low_t *input, tran_low_t *output); 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_idct64(const tran_low_t *input, tran_low_t *output);
......
...@@ -57,11 +57,7 @@ static void iidtx16_c(const tran_low_t *input, tran_low_t *output) { ...@@ -57,11 +57,7 @@ static void iidtx16_c(const tran_low_t *input, tran_low_t *output) {
static void iidtx32_c(const tran_low_t *input, tran_low_t *output) { static void iidtx32_c(const tran_low_t *input, tran_low_t *output) {
int i; int i;
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {
#if CONFIG_DAALA_DCT32
output[i] = input[i];
#else
output[i] = input[i] * 4; output[i] = input[i] * 4;
#endif
} }
} }
...@@ -1381,13 +1377,13 @@ void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride, ...@@ -1381,13 +1377,13 @@ void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride,
{ ihalfright32_c, ihalfright32_c }, // FLIPADST_FLIPADST { ihalfright32_c, ihalfright32_c }, // FLIPADST_FLIPADST
{ ihalfright32_c, ihalfright32_c }, // ADST_FLIPADST { ihalfright32_c, ihalfright32_c }, // ADST_FLIPADST
{ ihalfright32_c, ihalfright32_c }, // FLIPADST_ADST { ihalfright32_c, ihalfright32_c }, // FLIPADST_ADST
{ iidtx32_c, iidtx32_c }, // IDTX { daala_idtx32, daala_idtx32 }, // IDTX
{ daala_idct32, iidtx32_c }, // V_DCT { daala_idct32, daala_idtx32 }, // V_DCT
{ iidtx32_c, daala_idct32 }, // H_DCT { daala_idtx32, daala_idct32 }, // H_DCT
{ ihalfright32_c, iidtx32_c }, // V_ADST { ihalfright32_c, daala_idtx32 }, // V_ADST
{ iidtx32_c, ihalfright32_c }, // H_ADST { daala_idtx32, ihalfright32_c }, // H_ADST
{ ihalfright32_c, iidtx32_c }, // V_FLIPADST { ihalfright32_c, daala_idtx32 }, // V_FLIPADST
{ iidtx32_c, ihalfright32_c }, // H_FLIPADST { daala_idtx32, ihalfright32_c }, // H_FLIPADST
#endif #endif
#else #else
{ aom_idct32_c, aom_idct32_c }, // DCT_DCT { aom_idct32_c, aom_idct32_c }, // DCT_DCT
......
...@@ -1140,11 +1140,7 @@ static void fidtx16(const tran_low_t *input, tran_low_t *output) { ...@@ -1140,11 +1140,7 @@ static void fidtx16(const tran_low_t *input, tran_low_t *output) {
static void fidtx32(const tran_low_t *input, tran_low_t *output) { static void fidtx32(const tran_low_t *input, tran_low_t *output) {
int i; int i;
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {
#if CONFIG_DAALA_DCT32
output[i] = input[i];
#else
output[i] = input[i] * 4; output[i] = input[i] * 4;
#endif
} }
} }
...@@ -2429,13 +2425,13 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, ...@@ -2429,13 +2425,13 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
{ fhalfright32, fhalfright32 }, // FLIPADST_FLIPADST { fhalfright32, fhalfright32 }, // FLIPADST_FLIPADST
{ fhalfright32, fhalfright32 }, // ADST_FLIPADST { fhalfright32, fhalfright32 }, // ADST_FLIPADST
{ fhalfright32, fhalfright32 }, // FLIPADST_ADST { fhalfright32, fhalfright32 }, // FLIPADST_ADST
{ fidtx32, fidtx32 }, // IDTX { daala_idtx32, daala_idtx32 }, // IDTX
{ daala_fdct32, fidtx32 }, // V_DCT { daala_fdct32, daala_idtx32 }, // V_DCT
{ fidtx32, daala_fdct32 }, // H_DCT { daala_idtx32, daala_fdct32 }, // H_DCT
{ fhalfright32, fidtx32 }, // V_ADST { fhalfright32, daala_idtx32 }, // V_ADST
{ fidtx32, fhalfright32 }, // H_ADST { daala_idtx32, fhalfright32 }, // H_ADST
{ fhalfright32, fidtx32 }, // V_FLIPADST { fhalfright32, daala_idtx32 }, // V_FLIPADST
{ fidtx32, fhalfright32 }, // H_FLIPADST { daala_idtx32, fhalfright32 }, // H_FLIPADST
#endif #endif
#else #else
{ fdct32, fdct32 }, // DCT_DCT { fdct32, fdct32 }, // 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