Skip to content

GitLab

A
aom-rav1e
Commit cbcff06b authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge
Browse files
Options

Move daala_fdst16() / daala_idst16() into daala_tx.c. 

This commit has no impact on metrics.

Change-Id: I2dabe2ab5f2050af87f82666faac4f8d8d2eb507
parent c5c1e563
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 57 deletions
aom_dsp/inv_txfm.c
View file @ cbcff06b
......@@ -580,18 +580,6 @@ void aom_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest,
}
}
#if CONFIG_DAALA_DCT16
void aom_iadst16_c(const tran_low_t *input, tran_low_t *output) {
int i;
od_coeff x[16];
od_coeff y[16];
for (i = 0; i < 16; i++) y[i] = (od_coeff)input[i];
od_bin_idst16(x, 1, y);
for (i = 0; i < 16; i++) output[i] = (tran_low_t)x[i];
}
#else
void aom_iadst16_c(const tran_low_t *input, tran_low_t *output) {
tran_high_t s0, s1, s2, s3, s4, s5, s6, s7, s8;
tran_high_t s9, s10, s11, s12, s13, s14, s15;
......@@ -762,7 +750,6 @@ void aom_iadst16_c(const tran_low_t *input, tran_low_t *output) {
output[14] = WRAPLOW(x9);
output[15] = WRAPLOW(-x1);
}
#endif
void aom_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest,
int stride) {
......
av1/common/daala_tx.c
View file @ cbcff06b
......@@ -4196,3 +4196,21 @@ void daala_idct16(const tran_low_t *input, tran_low_t *output) {
od_bin_idct16(x, 1, y);
for (i = 0; i < 16; i++) output[i] = (tran_low_t)x[i];
}
void daala_fdst16(const tran_low_t *input, tran_low_t *output) {
int i;
od_coeff x[16];
od_coeff y[16];
for (i = 0; i < 16; i++) x[i] = (od_coeff)input[i];
od_bin_fdst16(y, x, 1);
for (i = 0; i < 16; i++) output[i] = (tran_low_t)y[i];
}
void daala_idst16(const tran_low_t *input, tran_low_t *output) {
int i;
od_coeff x[16];
od_coeff y[16];
for (i = 0; i < 16; i++) y[i] = (od_coeff)input[i];
od_bin_idst16(x, 1, y);
for (i = 0; i < 16; i++) output[i] = (tran_low_t)x[i];
}
av1/common/daala_tx.h
View file @ cbcff06b
......@@ -14,6 +14,8 @@ 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 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_fdst16(const tran_low_t *input, tran_low_t *output);
void daala_idst16(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]);
......
av1/common/idct.c
View file @ cbcff06b
......@@ -1297,23 +1297,23 @@ void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
#endif
static const transform_2d IHT_16[] = {
#if CONFIG_DAALA_DCT16
{ daala_idct16, daala_idct16 }, // DCT_DCT = 0
{ aom_iadst16_c, daala_idct16 }, // ADST_DCT = 1
{ daala_idct16, aom_iadst16_c }, // DCT_ADST = 2
{ aom_iadst16_c, aom_iadst16_c }, // ADST_ADST = 3
{ daala_idct16, daala_idct16 }, // DCT_DCT = 0
{ daala_idst16, daala_idct16 }, // ADST_DCT = 1
{ daala_idct16, daala_idst16 }, // DCT_ADST = 2
{ daala_idst16, daala_idst16 }, // ADST_ADST = 3
#if CONFIG_EXT_TX
{ aom_iadst16_c, daala_idct16 }, // FLIPADST_DCT
{ daala_idct16, aom_iadst16_c }, // DCT_FLIPADST
{ aom_iadst16_c, aom_iadst16_c }, // FLIPADST_FLIPADST
{ aom_iadst16_c, aom_iadst16_c }, // ADST_FLIPADST
{ aom_iadst16_c, aom_iadst16_c }, // FLIPADST_ADST
{ iidtx16_c, iidtx16_c }, // IDTX
{ daala_idct16, iidtx16_c }, // V_DCT
{ iidtx16_c, daala_idct16 }, // H_DCT
{ aom_iadst16_c, iidtx16_c }, // V_ADST
{ iidtx16_c, aom_iadst16_c }, // H_ADST
{ aom_iadst16_c, iidtx16_c }, // V_FLIPADST
{ iidtx16_c, aom_iadst16_c }, // H_FLIPADST
{ daala_idst16, daala_idct16 }, // FLIPADST_DCT
{ daala_idct16, daala_idst16 }, // DCT_FLIPADST
{ daala_idst16, daala_idst16 }, // FLIPADST_FLIPADST
{ daala_idst16, daala_idst16 }, // ADST_FLIPADST
{ daala_idst16, daala_idst16 }, // FLIPADST_ADST
{ iidtx16_c, iidtx16_c }, // IDTX
{ daala_idct16, iidtx16_c }, // V_DCT
{ iidtx16_c, daala_idct16 }, // H_DCT
{ daala_idst16, iidtx16_c }, // V_ADST
{ iidtx16_c, daala_idst16 }, // H_ADST
{ daala_idst16, iidtx16_c }, // V_FLIPADST
{ iidtx16_c, daala_idst16 }, // H_FLIPADST
#endif
#else
{ aom_idct16_c, aom_idct16_c }, // DCT_DCT = 0
......
av1/encoder/dct.c
View file @ cbcff06b
......@@ -865,18 +865,6 @@ static void fadst8(const tran_low_t *input, tran_low_t *output) {
output[7] = (tran_low_t)-x1;
}
#if CONFIG_DAALA_DCT16
static void fadst16(const tran_low_t *input, tran_low_t *output) {
int i;
od_coeff x[16];
od_coeff y[16];
for (i = 0; i < 16; i++) x[i] = (od_coeff)input[i];
od_bin_fdst16(y, x, 1);
for (i = 0; i < 16; i++) output[i] = (tran_low_t)y[i];
}
#else
static void fadst16(const tran_low_t *input, tran_low_t *output) {
tran_high_t s0, s1, s2, s3, s4, s5, s6, s7, s8;
tran_high_t s9, s10, s11, s12, s13, s14, s15;
......@@ -1044,7 +1032,6 @@ static void fadst16(const tran_low_t *input, tran_low_t *output) {
output[14] = (tran_low_t)x9;
output[15] = (tran_low_t)-x1;
}
#endif
// For use in lieu of ADST
#if CONFIG_DAALA_DCT32
......@@ -2374,22 +2361,22 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT16
{ daala_fdct16, daala_fdct16 }, // DCT_DCT
{ fadst16, daala_fdct16 }, // ADST_DCT
{ daala_fdct16, fadst16 }, // DCT_ADST
{ fadst16, fadst16 }, // ADST_ADST
{ daala_fdst16, daala_fdct16 }, // ADST_DCT
{ daala_fdct16, daala_fdst16 }, // DCT_ADST
{ daala_fdst16, daala_fdst16 }, // ADST_ADST
#if CONFIG_EXT_TX
{ fadst16, daala_fdct16 }, // FLIPADST_DCT
{ daala_fdct16, fadst16 }, // DCT_FLIPADST
{ fadst16, fadst16 }, // FLIPADST_FLIPADST
{ fadst16, fadst16 }, // ADST_FLIPADST
{ fadst16, fadst16 }, // FLIPADST_ADST
{ fidtx16, fidtx16 }, // IDTX
{ daala_fdct16, fidtx16 }, // V_DCT
{ fidtx16, daala_fdct16 }, // H_DCT
{ fadst16, fidtx16 }, // V_ADST
{ fidtx16, fadst16 }, // H_ADST
{ fadst16, fidtx16 }, // V_FLIPADST
{ fidtx16, fadst16 }, // H_FLIPADST
{ daala_fdst16, daala_fdct16 }, // FLIPADST_DCT
{ daala_fdct16, daala_fdst16 }, // DCT_FLIPADST
{ daala_fdst16, daala_fdst16 }, // FLIPADST_FLIPADST
{ daala_fdst16, daala_fdst16 }, // ADST_FLIPADST
{ daala_fdst16, daala_fdst16 }, // FLIPADST_ADST
{ fidtx16, fidtx16 }, // IDTX
{ daala_fdct16, fidtx16 }, // V_DCT
{ fidtx16, daala_fdct16 }, // H_DCT
{ daala_fdst16, fidtx16 }, // V_ADST
{ fidtx16, daala_fdst16 }, // H_ADST
{ daala_fdst16, fidtx16 }, // V_FLIPADST
{ fidtx16, daala_fdst16 }, // H_FLIPADST
#endif
#else
{ 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