Commit 8a873db7 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Move daala_fdst8() / daala_idst8() into daala_tx.c.

This commit has no impact on metrics.

Change-Id: I9fae08410da95dd851e33515289f9d878c43e736
parent 75bfeb8d
......@@ -288,18 +288,6 @@ void aom_iadst4_c(const tran_low_t *input, tran_low_t *output) {
output[3] = WRAPLOW(dct_const_round_shift(s0 + s1 - s3));
}
#if CONFIG_DAALA_DCT8
void aom_iadst8_c(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_idst8(x, 1, y);
for (i = 0; i < 8; i++) output[i] = (tran_low_t)x[i];
}
#else
void aom_iadst8_c(const tran_low_t *input, tran_low_t *output) {
int s0, s1, s2, s3, s4, s5, s6, s7;
......@@ -377,8 +365,6 @@ void aom_iadst8_c(const tran_low_t *input, tran_low_t *output) {
output[7] = WRAPLOW(-x1);
}
#endif
void aom_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride) {
tran_low_t out[8 * 8] = { 0 };
tran_low_t *outptr = out;
......
......@@ -4160,3 +4160,21 @@ void daala_idct8(const tran_low_t *input, tran_low_t *output) {
od_bin_idct8(x, 1, y);
for (i = 0; i < 8; i++) output[i] = (tran_low_t)x[i];
}
void daala_fdst8(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_fdst8(y, x, 1);
for (i = 0; i < 8; i++) output[i] = (tran_low_t)y[i];
}
void daala_idst8(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_idst8(x, 1, y);
for (i = 0; i < 8; i++) output[i] = (tran_low_t)x[i];
}
......@@ -10,6 +10,8 @@ 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 daala_fdst8(const tran_low_t *input, tran_low_t *output);
void daala_idst8(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]);
......
......@@ -1181,23 +1181,23 @@ void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
#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
{ daala_idct8, daala_idct8 }, // DCT_DCT = 0
{ daala_idst8, daala_idct8 }, // ADST_DCT = 1
{ daala_idct8, daala_idst8 }, // DCT_ADST = 2
{ daala_idst8, daala_idst8 }, // 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
{ daala_idst8, daala_idct8 }, // FLIPADST_DCT
{ daala_idct8, daala_idst8 }, // DCT_FLIPADST
{ daala_idst8, daala_idst8 }, // FLIPADST_FLIPADST
{ daala_idst8, daala_idst8 }, // ADST_FLIPADST
{ daala_idst8, daala_idst8 }, // FLIPADST_ADST
{ iidtx8_c, iidtx8_c }, // IDTX
{ daala_idct8, iidtx8_c }, // V_DCT
{ iidtx8_c, daala_idct8 }, // H_DCT
{ daala_idst8, iidtx8_c }, // V_ADST
{ iidtx8_c, daala_idst8 }, // H_ADST
{ daala_idst8, iidtx8_c }, // V_FLIPADST
{ iidtx8_c, daala_idst8 }, // H_FLIPADST
#endif
#else
{ aom_idct8_c, aom_idct8_c }, // DCT_DCT = 0
......
......@@ -807,18 +807,6 @@ static void fadst4(const tran_low_t *input, tran_low_t *output) {
output[3] = (tran_low_t)fdct_round_shift(s3);
}
#if CONFIG_DAALA_DCT8
static void fadst8(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_fdst8(y, x, 1);
for (i = 0; i < 8; i++) output[i] = (tran_low_t)y[i];
}
#else
static void fadst8(const tran_low_t *input, tran_low_t *output) {
tran_high_t s0, s1, s2, s3, s4, s5, s6, s7;
......@@ -889,7 +877,6 @@ static void fadst8(const tran_low_t *input, tran_low_t *output) {
output[6] = (tran_low_t)x5;
output[7] = (tran_low_t)-x1;
}
#endif
#if CONFIG_DAALA_DCT16
static void fadst16(const tran_low_t *input, tran_low_t *output) {
......@@ -2241,22 +2228,22 @@ void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT8
{ daala_fdct8, daala_fdct8 }, // DCT_DCT
{ fadst8, daala_fdct8 }, // ADST_DCT
{ daala_fdct8, fadst8 }, // DCT_ADST
{ fadst8, fadst8 }, // ADST_ADST
{ daala_fdst8, daala_fdct8 }, // ADST_DCT
{ daala_fdct8, daala_fdst8 }, // DCT_ADST
{ daala_fdst8, daala_fdst8 }, // ADST_ADST
#if CONFIG_EXT_TX
{ fadst8, daala_fdct8 }, // FLIPADST_DCT
{ daala_fdct8, fadst8 }, // DCT_FLIPADST
{ fadst8, fadst8 }, // FLIPADST_FLIPADST
{ fadst8, fadst8 }, // ADST_FLIPADST
{ fadst8, fadst8 }, // FLIPADST_ADST
{ fidtx8, fidtx8 }, // IDTX
{ daala_fdct8, fidtx8 }, // V_DCT
{ fidtx8, daala_fdct8 }, // H_DCT
{ fadst8, fidtx8 }, // V_ADST
{ fidtx8, fadst8 }, // H_ADST
{ fadst8, fidtx8 }, // V_FLIPADST
{ fidtx8, fadst8 }, // H_FLIPADST
{ daala_fdst8, daala_fdct8 }, // FLIPADST_DCT
{ daala_fdct8, daala_fdst8 }, // DCT_FLIPADST
{ daala_fdst8, daala_fdst8 }, // FLIPADST_FLIPADST
{ daala_fdst8, daala_fdst8 }, // ADST_FLIPADST
{ daala_fdst8, daala_fdst8 }, // FLIPADST_ADST
{ fidtx8, fidtx8 }, // IDTX
{ daala_fdct8, fidtx8 }, // V_DCT
{ fidtx8, daala_fdct8 }, // H_DCT
{ daala_fdst8, fidtx8 }, // V_ADST
{ fidtx8, daala_fdst8 }, // H_ADST
{ daala_fdst8, fidtx8 }, // V_FLIPADST
{ fidtx8, daala_fdst8 }, // H_FLIPADST
#endif
#else
{ fdct8, fdct8 }, // 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