Commit 683f70e7 authored by Monty Montgomery's avatar Monty Montgomery Committed by Christopher Montgomery
Browse files

Fix build for CONFIG_DAALA_TX and CONFIG_TX64X64

The recent 64x32 and 32x64 patches break the build when
CONFIG_DAALA_TX and CONFIG_TX64X64 are enabled simultaneously.  This
is a minor correction that fixes the build problem.

Change-Id: I53cd8df9160fc35b67f2ac16bddcfab08425cf8e
parent d75ea5b5
...@@ -60,7 +60,7 @@ static void iidtx32_c(const tran_low_t *input, tran_low_t *output) { ...@@ -60,7 +60,7 @@ static void iidtx32_c(const tran_low_t *input, tran_low_t *output) {
} }
} }
#if CONFIG_TX64X64 && !CONFIG_DAALA_TX64 #if CONFIG_TX64X64
static void iidtx64_c(const tran_low_t *input, tran_low_t *output) { static void iidtx64_c(const tran_low_t *input, tran_low_t *output) {
int i; int i;
for (i = 0; i < 64; ++i) { for (i = 0; i < 64; ++i) {
...@@ -84,7 +84,7 @@ static void ihalfright32_c(const tran_low_t *input, tran_low_t *output) { ...@@ -84,7 +84,7 @@ static void ihalfright32_c(const tran_low_t *input, tran_low_t *output) {
// Note overall scaling factor is 4 times orthogonal // Note overall scaling factor is 4 times orthogonal
} }
#if CONFIG_TX64X64 && !CONFIG_DAALA_TX64 #if CONFIG_TX64X64
static void idct64_col_c(const tran_low_t *input, tran_low_t *output) { static void idct64_col_c(const tran_low_t *input, tran_low_t *output) {
int32_t in[64], out[64]; int32_t in[64], out[64];
int i; int i;
......
...@@ -2574,7 +2574,6 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, ...@@ -2574,7 +2574,6 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
} }
#if CONFIG_TX64X64 #if CONFIG_TX64X64
#if !CONFIG_DAALA_TX64
static void fidtx64(const tran_low_t *input, tran_low_t *output) { static void fidtx64(const tran_low_t *input, tran_low_t *output) {
int i; int i;
for (i = 0; i < 64; ++i) for (i = 0; i < 64; ++i)
...@@ -2596,6 +2595,7 @@ static void fhalfright64(const tran_low_t *input, tran_low_t *output) { ...@@ -2596,6 +2595,7 @@ static void fhalfright64(const tran_low_t *input, tran_low_t *output) {
// Note overall scaling factor is 2 times unitary // Note overall scaling factor is 2 times unitary
} }
#if !CONFIG_DAALA_TX64
static void fdct64_col(const tran_low_t *input, tran_low_t *output) { static void fdct64_col(const tran_low_t *input, tran_low_t *output) {
int32_t in[64], out[64]; int32_t in[64], out[64];
int i; int i;
...@@ -2603,6 +2603,7 @@ static void fdct64_col(const tran_low_t *input, tran_low_t *output) { ...@@ -2603,6 +2603,7 @@ static void fdct64_col(const tran_low_t *input, tran_low_t *output) {
av1_fdct64_new(in, out, fwd_cos_bit_col_dct_64, fwd_stage_range_col_dct_64); av1_fdct64_new(in, out, fwd_cos_bit_col_dct_64, fwd_stage_range_col_dct_64);
for (i = 0; i < 64; ++i) output[i] = (tran_low_t)out[i]; for (i = 0; i < 64; ++i) output[i] = (tran_low_t)out[i];
} }
#endif
static void fdct64_row(const tran_low_t *input, tran_low_t *output) { static void fdct64_row(const tran_low_t *input, tran_low_t *output) {
int32_t in[64], out[64]; int32_t in[64], out[64];
...@@ -2611,7 +2612,6 @@ static void fdct64_row(const tran_low_t *input, tran_low_t *output) { ...@@ -2611,7 +2612,6 @@ static void fdct64_row(const tran_low_t *input, tran_low_t *output) {
av1_fdct64_new(in, out, fwd_cos_bit_row_dct_64, fwd_stage_range_row_dct_64); av1_fdct64_new(in, out, fwd_cos_bit_row_dct_64, fwd_stage_range_row_dct_64);
for (i = 0; i < 64; ++i) output[i] = (tran_low_t)out[i]; for (i = 0; i < 64; ++i) output[i] = (tran_low_t)out[i];
} }
#endif
void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride, void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
TxfmParam *txfm_param) { TxfmParam *txfm_param) {
......
Supports Markdown
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