Commit e554f36c authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Rename DAALA_DCTx experiments to DAALA_TXx.

Change-Id: I8fa0a67d7a198b8b24837ffc352acf77f390cffe
parent cce013cd
......@@ -14,8 +14,8 @@
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/inv_txfm.h"
#if CONFIG_DAALA_DCT4 || CONFIG_DAALA_DCT8 || CONFIG_DAALA_DCT16 || \
CONFIG_DAALA_DCT32 || CONFIG_DAALA_DCT64
#if CONFIG_DAALA_TX4 || CONFIG_DAALA_TX8 || CONFIG_DAALA_TX16 || \
CONFIG_DAALA_TX32 || CONFIG_DAALA_TX64
#include "av1/common/daala_tx.h"
#endif
......
......@@ -58,7 +58,7 @@ void aom_idct4_c(const tran_low_t *input, tran_low_t *output);
void aom_idct8_c(const tran_low_t *input, tran_low_t *output);
void aom_idct16_c(const tran_low_t *input, tran_low_t *output);
void aom_idct32_c(const tran_low_t *input, tran_low_t *output);
#if CONFIG_TX64X64 && CONFIG_DAALA_DCT64
#if CONFIG_TX64X64 && CONFIG_DAALA_TX64
void aom_idct64_c(const tran_low_t *input, tran_low_t *output);
#endif
void aom_iadst4_c(const tran_low_t *input, tran_low_t *output);
......
......@@ -101,7 +101,7 @@ if (aom_config("CONFIG_HIGHBITDEPTH") eq "yes") {
add_proto qw/void av1_iht32x32_1024_add/, "const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param";
} else {
add_proto qw/void av1_iht4x4_16_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT4") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_iht4x4_16_add sse2 neon/;
}
......@@ -132,25 +132,25 @@ if (aom_config("CONFIG_HIGHBITDEPTH") eq "yes") {
add_proto qw/void av1_iht32x8_256_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param";
add_proto qw/void av1_iht8x8_64_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT8") ne "yes") {
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_iht8x8_64_add sse2 neon/;
}
add_proto qw/void av1_iht16x16_256_add/, "const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT16") ne "yes") {
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_iht16x16_256_add sse2 avx2/;
}
add_proto qw/void av1_iht32x32_1024_add/, "const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param";
if (aom_config("CONFIG_EXT_TX") ne "yes") {
if (aom_config("CONFIG_DAALA_DCT4") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_iht4x4_16_add msa/;
}
if (aom_config("CONFIG_DAALA_DCT8") ne "yes") {
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_iht8x8_64_add msa/;
}
if (aom_config("CONFIG_DAALA_DCT16") ne "yes") {
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_iht16x16_256_add msa/;
}
}
......@@ -272,19 +272,19 @@ add_proto qw/void av1_inv_txfm2d_add_16x8/, "const int32_t *input, uint16_t *out
add_proto qw/void av1_inv_txfm2d_add_16x32/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
add_proto qw/void av1_inv_txfm2d_add_32x16/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
add_proto qw/void av1_inv_txfm2d_add_4x4/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT4") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_inv_txfm2d_add_4x4 sse4_1/;
}
add_proto qw/void av1_inv_txfm2d_add_8x8/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT8") ne "yes") {
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_inv_txfm2d_add_8x8 sse4_1/;
}
add_proto qw/void av1_inv_txfm2d_add_16x16/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT16") ne "yes") {
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_inv_txfm2d_add_16x16 sse4_1/;
}
add_proto qw/void av1_inv_txfm2d_add_32x32/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT32") ne "yes") {
if (aom_config("CONFIG_DAALA_TX32") ne "yes") {
specialize qw/av1_inv_txfm2d_add_32x32 avx2/;
}
if (aom_config("CONFIG_TX64X64") eq "yes") {
......@@ -337,24 +337,24 @@ if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
# fdct functions
add_proto qw/void av1_fht4x4/, "const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT4") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_fht4x4 sse2/;
}
add_proto qw/void av1_fwht4x4/, "const int16_t *input, tran_low_t *output, int stride";
add_proto qw/void av1_fht8x8/, "const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT8") ne "yes") {
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_fht8x8 sse2/;
}
add_proto qw/void av1_fht16x16/, "const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT16") ne "yes") {
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_fht16x16 sse2 avx2/;
}
add_proto qw/void av1_fht32x32/, "const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param";
if (aom_config("CONFIG_DAALA_DCT32") ne "yes") {
if (aom_config("CONFIG_DAALA_TX32") ne "yes") {
specialize qw/av1_fht32x32 sse2 avx2/;
}
......@@ -392,13 +392,13 @@ if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
if (aom_config("CONFIG_HIGHBITDEPTH") ne "yes") {
if (aom_config("CONFIG_EXT_TX") ne "yes") {
if (aom_config("CONFIG_DAALA_DCT4") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_fht4x4 msa/;
}
if (aom_config("CONFIG_DAALA_DCT8") ne "yes") {
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_fht8x8 msa/;
}
if (aom_config("CONFIG_DAALA_DCT16") ne "yes") {
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_fht16x16 msa/;
}
}
......@@ -414,19 +414,19 @@ if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
add_proto qw/void av1_fwd_txfm2d_16x32/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
add_proto qw/void av1_fwd_txfm2d_32x16/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
add_proto qw/void av1_fwd_txfm2d_4x4/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT4") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_fwd_txfm2d_4x4 sse4_1/;
}
add_proto qw/void av1_fwd_txfm2d_8x8/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT8") ne "yes") {
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_fwd_txfm2d_8x8 sse4_1/;
}
add_proto qw/void av1_fwd_txfm2d_16x16/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT16") ne "yes") {
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_fwd_txfm2d_16x16 sse4_1/;
}
add_proto qw/void av1_fwd_txfm2d_32x32/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
if (aom_config("CONFIG_DAALA_DCT32") ne "yes") {
if (aom_config("CONFIG_DAALA_TX32") ne "yes") {
specialize qw/av1_fwd_txfm2d_32x32 sse4_1/;
}
......
This diff is collapsed.
......@@ -21,8 +21,8 @@
#include "av1/common/av1_fwd_txfm1d.h"
#include "av1/common/av1_fwd_txfm1d_cfg.h"
#include "av1/common/idct.h"
#if CONFIG_DAALA_DCT4 || CONFIG_DAALA_DCT8 || CONFIG_DAALA_DCT16 || \
CONFIG_DAALA_DCT32 || CONFIG_DAALA_DCT64
#if CONFIG_DAALA_TX4 || CONFIG_DAALA_TX8 || CONFIG_DAALA_TX16 || \
CONFIG_DAALA_TX32 || CONFIG_DAALA_TX64
#include "av1/common/daala_tx.h"
#endif
......@@ -1389,7 +1389,7 @@ void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
#if !CONFIG_DAALA_DCT4
#if !CONFIG_DAALA_TX4
if (tx_type == DCT_DCT) {
aom_fdct4x4_c(input, output, stride);
return;
......@@ -1397,7 +1397,7 @@ void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
#endif
{
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT4
#if CONFIG_DAALA_TX4
{ daala_fdct4, daala_fdct4 }, // DCT_DCT
{ daala_fdst4, daala_fdct4 }, // ADST_DCT
{ daala_fdct4, daala_fdst4 }, // DCT_ADST
......@@ -1460,7 +1460,7 @@ void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
for (i = 0; i < 4; ++i) {
/* A C99-safe upshift by 4 for both Daala and VPx TX. */
for (j = 0; j < 4; ++j) temp_in[j] = input[j * stride + i] * 16;
#if !CONFIG_DAALA_DCT4
#if !CONFIG_DAALA_TX4
if (i == 0 && temp_in[0]) temp_in[0] += 1;
#endif
#if CONFIG_LGT
......@@ -1481,7 +1481,7 @@ void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride,
else
#endif
ht.rows(temp_in, temp_out);
#if CONFIG_DAALA_DCT4
#if CONFIG_DAALA_TX4
/* Daala TX has orthonormal scaling; shift down by only 1 to achieve
the usual VPx coefficient left-shift of 3. */
for (j = 0; j < 4; ++j) output[j + i * 4] = temp_out[j] >> 1;
......@@ -2177,7 +2177,7 @@ void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
#if CONFIG_DCT_ONLY
assert(tx_type == DCT_DCT);
#endif
#if !CONFIG_DAALA_DCT8
#if !CONFIG_DAALA_TX8
if (tx_type == DCT_DCT) {
aom_fdct8x8_c(input, output, stride);
return;
......@@ -2185,7 +2185,7 @@ void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
#endif
{
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT8
#if CONFIG_DAALA_TX8
{ daala_fdct8, daala_fdct8 }, // DCT_DCT
{ daala_fdst8, daala_fdct8 }, // ADST_DCT
{ daala_fdct8, daala_fdst8 }, // DCT_ADST
......@@ -2244,7 +2244,7 @@ void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
// Columns
for (i = 0; i < 8; ++i) {
#if CONFIG_DAALA_DCT8
#if CONFIG_DAALA_TX8
for (j = 0; j < 8; ++j) temp_in[j] = input[j * stride + i] * 16;
#else
for (j = 0; j < 8; ++j) temp_in[j] = input[j * stride + i] * 4;
......@@ -2267,7 +2267,7 @@ void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride,
else
#endif
ht.rows(temp_in, temp_out);
#if CONFIG_DAALA_DCT8
#if CONFIG_DAALA_TX8
for (j = 0; j < 8; ++j)
output[j + i * 8] = (temp_out[j] + (temp_out[j] < 0)) >> 1;
#else
......@@ -2344,7 +2344,7 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
assert(tx_type == DCT_DCT);
#endif
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT16
#if CONFIG_DAALA_TX16
{ daala_fdct16, daala_fdct16 }, // DCT_DCT
{ daala_fdst16, daala_fdct16 }, // ADST_DCT
{ daala_fdct16, daala_fdst16 }, // DCT_ADST
......@@ -2397,7 +2397,7 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
// Columns
for (i = 0; i < 16; ++i) {
for (j = 0; j < 16; ++j) {
#if CONFIG_DAALA_DCT16
#if CONFIG_DAALA_TX16
temp_in[j] = input[j * stride + i] * 16;
#else
temp_in[j] = input[j * stride + i] * 4;
......@@ -2405,7 +2405,7 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
}
ht.cols(temp_in, temp_out);
for (j = 0; j < 16; ++j) {
#if CONFIG_DAALA_DCT16
#if CONFIG_DAALA_TX16
out[j * 16 + i] = temp_out[j];
#else
out[j * 16 + i] = (temp_out[j] + 1 + (temp_out[j] < 0)) >> 2;
......@@ -2418,7 +2418,7 @@ void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride,
for (j = 0; j < 16; ++j) temp_in[j] = out[j + i * 16];
ht.rows(temp_in, temp_out);
for (j = 0; j < 16; ++j) {
#if CONFIG_DAALA_DCT16
#if CONFIG_DAALA_TX16
output[j + i * 16] = (temp_out[j] + (temp_out[j] < 0)) >> 1;
#else
output[j + i * 16] = temp_out[j];
......@@ -2439,7 +2439,7 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
assert(tx_type == DCT_DCT);
#endif
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT32
#if CONFIG_DAALA_TX32
{ daala_fdct32, daala_fdct32 }, // DCT_DCT
#if CONFIG_EXT_TX
{ daala_fdst32, daala_fdct32 }, // ADST_DCT
......@@ -2503,7 +2503,7 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
// Columns
for (i = 0; i < 32; ++i) {
for (j = 0; j < 32; ++j) {
#if CONFIG_DAALA_DCT32
#if CONFIG_DAALA_TX32
temp_in[j] = input[j * stride + i] * 16;
#else
temp_in[j] = input[j * stride + i] * 4;
......@@ -2511,7 +2511,7 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
}
ht.cols(temp_in, temp_out);
for (j = 0; j < 32; ++j) {
#if CONFIG_DAALA_DCT32
#if CONFIG_DAALA_TX32
out[j * 32 + i] = ROUND_POWER_OF_TWO_SIGNED(temp_out[j], 2);
#else
out[j * 32 + i] = ROUND_POWER_OF_TWO_SIGNED(temp_out[j], 4);
......@@ -2530,7 +2530,7 @@ void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride,
}
#if CONFIG_TX64X64
#if !CONFIG_DAALA_DCT64
#if !CONFIG_DAALA_TX64
#if CONFIG_EXT_TX
static void fidtx64(const tran_low_t *input, tran_low_t *output) {
int i;
......@@ -2581,7 +2581,7 @@ void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
assert(tx_type == DCT_DCT);
#endif
static const transform_2d FHT[] = {
#if CONFIG_DAALA_DCT64
#if CONFIG_DAALA_TX64
{ daala_fdct64, daala_fdct64 }, // DCT_DCT
#if CONFIG_EXT_TX
{ daala_fdst64, daala_fdct64 }, // ADST_DCT
......@@ -2619,7 +2619,7 @@ void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
{ fhalfright64, fidtx64 }, // V_FLIPADST
{ fidtx64, fhalfright64 }, // H_FLIPADST
#endif // CONFIG_EXT_TX
#endif // CONFIG_DAALA_DCT64
#endif // CONFIG_DAALA_TX64
};
const transform_2d ht = FHT[tx_type];
tran_low_t out[4096];
......@@ -2632,7 +2632,7 @@ void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
// Columns
for (i = 0; i < 64; ++i) {
#if CONFIG_DAALA_DCT64
#if CONFIG_DAALA_TX64
for (j = 0; j < 64; ++j) temp_in[j] = input[j * stride + i] * 16;
ht.cols(temp_in, temp_out);
for (j = 0; j < 64; ++j)
......@@ -2651,7 +2651,7 @@ void av1_fht64x64_c(const int16_t *input, tran_low_t *output, int stride,
for (j = 0; j < 64; ++j) temp_in[j] = out[j + i * 64];
ht.rows(temp_in, temp_out);
for (j = 0; j < 64; ++j)
#if CONFIG_DAALA_DCT64
#if CONFIG_DAALA_TX64
output[j + i * 64] = temp_out[j];
#else
output[j + i * 64] =
......
......@@ -24,7 +24,7 @@ static void fwd_txfm_4x4(const int16_t *src_diff, tran_low_t *coeff,
return;
}
#if CONFIG_LGT || CONFIG_DAALA_DCT4
#if CONFIG_LGT || CONFIG_DAALA_TX4
// only C version has LGTs
av1_fht4x4_c(src_diff, coeff, diff_stride, txfm_param);
#else
......@@ -80,7 +80,7 @@ static void fwd_txfm_32x16(const int16_t *src_diff, tran_low_t *coeff,
static void fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_LGT || CONFIG_DAALA_DCT8
#if CONFIG_LGT || CONFIG_DAALA_TX8
av1_fht8x8_c(src_diff, coeff, diff_stride, txfm_param);
#else
av1_fht8x8(src_diff, coeff, diff_stride, txfm_param);
......@@ -89,11 +89,11 @@ static void fwd_txfm_8x8(const int16_t *src_diff, tran_low_t *coeff,
static void fwd_txfm_16x16(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
#if CONFIG_DAALA_DCT16
#if CONFIG_DAALA_TX16
av1_fht16x16_c(src_diff, coeff, diff_stride, txfm_param);
#else
av1_fht16x16(src_diff, coeff, diff_stride, txfm_param);
#endif // CONFIG_DAALA_DCT16
#endif // CONFIG_DAALA_TX16
}
static void fwd_txfm_32x32(const int16_t *src_diff, tran_low_t *coeff,
......
......@@ -122,12 +122,12 @@ set(CONFIG_COMPOUND_SEGMENT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_COMPOUND_SINGLEREF 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_CONVOLVE_ROUND 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_CTX1D 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_DCT16 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_DCT32 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_DCT4 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_DCT64 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_DCT8 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX16 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX32 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX4 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX64 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX8 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DCT_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DEBLOCK_13TAP 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DEPENDENT_HORZTILES 0 CACHE NUMBER "AV1 experiment flag.")
......
......@@ -39,27 +39,27 @@ macro (fix_experiment_configs)
endif ()
if (CONFIG_DAALA_TX)
set(CONFIG_DAALA_DCT4 1)
set(CONFIG_DAALA_DCT8 1)
set(CONFIG_DAALA_DCT16 1)
set(CONFIG_DAALA_DCT32 1)
set(CONFIG_DAALA_DCT64 1)
set(CONFIG_DAALA_TX4 1)
set(CONFIG_DAALA_TX8 1)
set(CONFIG_DAALA_TX16 1)
set(CONFIG_DAALA_TX32 1)
set(CONFIG_DAALA_TX64 1)
endif ()
if (CONFIG_DAALA_DCT64)
if (CONFIG_DAALA_TX64)
if (NOT CONFIG_TX64X64)
set(CONFIG_DAALA_DCT64 0)
message("--- DAALA_DCT64 requires TX64X64: disabled DAALA_DCT64")
set(CONFIG_DAALA_TX64 0)
message("--- DAALA_TX64 requires TX64X64: disabled DAALA_TX64")
endif ()
endif ()
if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR
CONFIG_DAALA_DCT32 OR CONFIG_DAALA_DCT64)
if (CONFIG_DAALA_TX4 OR CONFIG_DAALA_TX8 OR CONFIG_DAALA_TX16 OR
CONFIG_DAALA_TX32 OR CONFIG_DAALA_TX64)
if (CONFIG_LGT)
change_config_and_warn(CONFIG_LGT 0 CONFIG_DAALA_DCTx)
change_config_and_warn(CONFIG_LGT 0 CONFIG_DAALA_TXx)
endif ()
if (NOT CONFIG_LOWBITDEPTH)
change_config_and_warn(CONFIG_LOWBITDEPTH 1 CONFIG_DAALA_DCTx)
change_config_and_warn(CONFIG_LOWBITDEPTH 1 CONFIG_DAALA_TXx)
endif ()
if (CONFIG_TXMG)
change_config_and_warn(CONFIG_TXMG 0 CONFIG_DAALA_DCTx)
......
......@@ -288,11 +288,11 @@ EXPERIMENT_LIST="
xiphrc
dct_only
daala_tx
daala_dct4
daala_dct8
daala_dct16
daala_dct32
daala_dct64
daala_tx4
daala_tx8
daala_tx16
daala_tx32
daala_tx64
cb4x4
chroma_sub8x8
frame_size
......@@ -590,18 +590,18 @@ post_process_cmdline() {
disable_feature rawbits
fi
if enabled daala_tx; then
enable_feature daala_dct4
enable_feature daala_dct8
enable_feature daala_dct16
enable_feature daala_dct32
enable_feature daala_dct64
enable_feature daala_tx4
enable_feature daala_tx8
enable_feature daala_tx16
enable_feature daala_tx32
enable_feature daala_tx64
fi
if enabled daala_dct64 && ! enabled tx64x64; then
log_echo "daala_dct64 requires tx64x64, so disabling daala_dct64"
disable_feature daala_dct64
if enabled daala_tx64 && ! enabled tx64x64; then
log_echo "daala_tx64 requires tx64x64, so disabling daala_tx64"
disable_feature daala_tx64
fi
if enabled daala_dct4 || enabled daala_dct8 || enabled daala_dct16 ||
enabled daala_dct32 || enabled daala_dct64; then
if enabled daala_tx4 || enabled daala_tx8 || enabled daala_tx16 ||
enabled daala_tx32 || enabled daala_tx64; then
disable_feature txmg
disable_feature lgt
enable_feature lowbitdepth
......
......@@ -23,8 +23,8 @@
#define CONFIG_COEFFICIENT_RANGE_CHECKING 1
#define AV1_DCT_GTEST
#include "av1/encoder/dct.c"
#if CONFIG_DAALA_DCT4 || CONFIG_DAALA_DCT8 || CONFIG_DAALA_DCT16 || \
CONFIG_DAALA_DCT32
#if CONFIG_DAALA_TX4 || CONFIG_DAALA_TX8 || CONFIG_DAALA_TX16 || \
CONFIG_DAALA_Tx32
#include "av1/common/daala_tx.c"
#endif
......
......@@ -164,7 +164,7 @@ TEST_P(AV1HighbdTrans16x16HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2 && !CONFIG_DAALA_DCT16
#if HAVE_SSE2 && !CONFIG_DAALA_TX16
const Ht16x16Param kArrayHt16x16Param_sse2[] = {
make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_sse2, DCT_DCT,
AOM_BITS_8, 256),
......@@ -205,7 +205,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans16x16HT,
::testing::ValuesIn(kArrayHt16x16Param_sse2));
#endif // HAVE_SSE2
#if HAVE_AVX2 && !CONFIG_DAALA_DCT16
#if HAVE_AVX2 && !CONFIG_DAALA_TX16
const Ht16x16Param kArrayHt16x16Param_avx2[] = {
make_tuple(&av1_fht16x16_avx2, &av1_iht16x16_256_add_avx2, DCT_DCT,
AOM_BITS_8, 256),
......@@ -246,7 +246,7 @@ INSTANTIATE_TEST_CASE_P(AVX2, AV1Trans16x16HT,
::testing::ValuesIn(kArrayHt16x16Param_avx2));
#endif // HAVE_AVX2
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT16
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX16
const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
make_tuple(&av1_fwd_txfm2d_16x16_sse4_1, DCT_DCT, 10),
make_tuple(&av1_fwd_txfm2d_16x16_sse4_1, DCT_DCT, 12),
......@@ -271,6 +271,6 @@ const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans16x16HT,
::testing::ValuesIn(kArrayHBDHt16x16Param_sse4_1));
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT16
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX16
} // namespace
......@@ -50,7 +50,7 @@ void highbd_fht32x32_ref(const int16_t *in, int32_t *out, int stride,
}
#endif // CONFIG_HIGHBITDEPTH
#if (HAVE_SSE2 || HAVE_AVX2) && !CONFIG_DAALA_DCT32
#if (HAVE_SSE2 || HAVE_AVX2) && !CONFIG_DAALA_TX32
void dummy_inv_txfm(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param) {
(void)in;
......@@ -165,7 +165,7 @@ TEST_P(AV1HighbdTrans32x32HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2 && !CONFIG_DAALA_DCT32
#if HAVE_SSE2 && !CONFIG_DAALA_TX32
const Ht32x32Param kArrayHt32x32Param_sse2[] = {
make_tuple(&av1_fht32x32_sse2, &dummy_inv_txfm, DCT_DCT, AOM_BITS_8, 1024),
make_tuple(&av1_fht32x32_sse2, &dummy_inv_txfm, ADST_DCT, AOM_BITS_8, 1024),
......@@ -193,9 +193,9 @@ const Ht32x32Param kArrayHt32x32Param_sse2[] = {
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans32x32HT,
::testing::ValuesIn(kArrayHt32x32Param_sse2));
#endif // HAVE_SSE2 && !CONFIG_DAALA_DCT32
#endif // HAVE_SSE2 && !CONFIG_DAALA_TX32
#if HAVE_AVX2 && !CONFIG_DAALA_DCT32
#if HAVE_AVX2 && !CONFIG_DAALA_TX32
const Ht32x32Param kArrayHt32x32Param_avx2[] = {
make_tuple(&av1_fht32x32_avx2, &dummy_inv_txfm, DCT_DCT, AOM_BITS_8, 1024),
make_tuple(&av1_fht32x32_avx2, &dummy_inv_txfm, ADST_DCT, AOM_BITS_8, 1024),
......@@ -223,5 +223,5 @@ const Ht32x32Param kArrayHt32x32Param_avx2[] = {
};
INSTANTIATE_TEST_CASE_P(AVX2, AV1Trans32x32HT,
::testing::ValuesIn(kArrayHt32x32Param_avx2));
#endif // HAVE_AVX2 && !CONFIG_DAALA_DCT32
#endif // HAVE_AVX2 && !CONFIG_DAALA_TX32
} // namespace
......@@ -167,7 +167,7 @@ TEST_P(AV1HighbdTrans4x4HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2 && !CONFIG_DAALA_DCT4
#if HAVE_SSE2 && !CONFIG_DAALA_TX4
const Ht4x4Param kArrayHt4x4Param_sse2[] = {
make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_sse2, DCT_DCT, AOM_BITS_8,
16),
......@@ -203,7 +203,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans4x4HT,
::testing::ValuesIn(kArrayHt4x4Param_sse2));
#endif // HAVE_SSE2
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT4
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX4
const HighbdHt4x4Param kArrayHighbdHt4x4Param[] = {
make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, DCT_DCT, 10),
make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, DCT_DCT, 12),
......@@ -230,6 +230,6 @@ const HighbdHt4x4Param kArrayHighbdHt4x4Param[] = {
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans4x4HT,
::testing::ValuesIn(kArrayHighbdHt4x4Param));
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT4
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX4
} // namespace
......@@ -167,7 +167,7 @@ TEST_P(AV1HighbdTrans8x8HT, HighbdCoeffCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE2 && !CONFIG_DAALA_DCT8
#if HAVE_SSE2 && !CONFIG_DAALA_TX8
const Ht8x8Param kArrayHt8x8Param_sse2[] = {
make_tuple(&av1_fht8x8_sse2, &av1_iht8x8_64_add_sse2, DCT_DCT, AOM_BITS_8,
64),
......@@ -203,7 +203,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans8x8HT,
::testing::ValuesIn(kArrayHt8x8Param_sse2));
#endif // HAVE_SSE2
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT8
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX8
const HighbdHt8x8Param kArrayHBDHt8x8Param_sse4_1[] = {
make_tuple(&av1_fwd_txfm2d_8x8_sse4_1, DCT_DCT, 10),
make_tuple(&av1_fwd_txfm2d_8x8_sse4_1, DCT_DCT, 12),
......@@ -228,6 +228,6 @@ const HighbdHt8x8Param kArrayHBDHt8x8Param_sse4_1[] = {
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans8x8HT,
::testing::ValuesIn(kArrayHBDHt8x8Param_sse4_1));
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT8
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX8
} // namespace
......@@ -136,25 +136,25 @@ TEST_P(AV1HighbdInvHTNxN, InvTransResultCheck) { RunBitexactCheck(); }
using std::tr1::make_tuple;
#if HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH && \
!(CONFIG_DAALA_DCT4 && CONFIG_DAALA_DCT8 && CONFIG_DAALA_DCT16)
#if !CONFIG_DAALA_DCT4
!(CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16)
#if !CONFIG_DAALA_TX4
#define PARAM_LIST_4X4 \
&av1_fwd_txfm2d_4x4_c, &av1_inv_txfm2d_add_4x4_sse4_1, \
&av1_inv_txfm2d_add_4x4_c, 16
#endif
#if !CONFIG_DAALA_DCT8
#if !CONFIG_DAALA_TX8
#define PARAM_LIST_8X8 \
&av1_fwd_txfm2d_8x8_c, &av1_inv_txfm2d_add_8x8_sse4_1, \
&av1_inv_txfm2d_add_8x8_c, 64
#endif
#if !CONFIG_DAALA_DCT16
#if !CONFIG_DAALA_TX16
#define PARAM_LIST_16X16 \
&av1_fwd_txfm2d_16x16_c, &av1_inv_txfm2d_add_16x16_sse4_1, \
&av1_inv_txfm2d_add_16x16_c, 256
#endif
const IHbdHtParam kArrayIhtParam[] = {
// 16x16
#if !CONFIG_DAALA_DCT16
#if !CONFIG_DAALA_TX16
make_tuple(PARAM_LIST_16X16, DCT_DCT, 10),
make_tuple(PARAM_LIST_16X16, DCT_DCT, 12),
make_tuple(PARAM_LIST_16X16, ADST_DCT, 10),
......@@ -177,7 +177,7 @@ const IHbdHtParam kArrayIhtParam[] = {
#endif
#endif
// 8x8
#if !CONFIG_DAALA_DCT8
#if !CONFIG_DAALA_TX8
make_tuple(PARAM_LIST_8X8, DCT_DCT, 10),
make_tuple(PARAM_LIST_8X8, DCT_DCT, 12),
make_tuple(PARAM_LIST_8X8, ADST_DCT, 10),
......@@ -200,7 +200,7 @@ const IHbdHtParam kArrayIhtParam[] = {
#endif
#endif
// 4x4
#if !CONFIG_DAALA_DCT4
#if !CONFIG_DAALA_TX4
make_tuple(PARAM_LIST_4X4, DCT_DCT, 10),
make_tuple(PARAM_LIST_4X4, DCT_DCT, 12),
make_tuple(PARAM_LIST_4X4, ADST_DCT, 10),
......@@ -227,9 +227,9 @@ const IHbdHtParam kArrayIhtParam[] = {
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdInvHTNxN,
::testing::ValuesIn(kArrayIhtParam));
#endif // HAVE_SSE4_1 && CONFIG_HIGHBITDEPTH &&
// !(CONFIG_DAALA_DCT4 && CONFIG_DAALA_DCT8 && CONFIG_DAALA_DCT16)
// !(CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16)
#if HAVE_AVX2 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_DCT32
#if HAVE_AVX2 && CONFIG_HIGHBITDEPTH && !CONFIG_DAALA_TX32
#define PARAM_LIST_32X32 \
&av1_fwd_txfm2d_32x32_c, &av1_inv_txfm2d_add_32x32_avx2, \
&av1_inv_txfm2d_add_32x32_c, 1024
......
......@@ -833,7 +833,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, Trans16x16DCT,
::testing::Values(make_tuple(
&aom_fdct16x16_sse2, &aom_idct16x16_256_add_sse2,
DCT_DCT, AOM_BITS_8)));
#if !CONFIG_DAALA_DCT16
#if !CONFIG_DAALA_TX16
INSTANTIATE_TEST_CASE_P(
SSE2, Trans16x16HT,
::testing::Values(make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_sse2,
......@@ -844,7 +844,7 @@ INSTANTIATE_TEST_CASE_P(
DCT_ADST, AOM_BITS_8),
make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_sse2,
ADST_ADST, AOM_BITS_8)));
#endif // CONFIG_DAALA_DCT16
#endif // CONFIG_DAALA_TX16
#endif // HAVE_SSE2 && !CONFIG_HIGHBITDEPTH
#if HAVE_SSE2 && CONFIG_HIGHBITDEPTH
......@@ -852,7 +852,7 @@ INSTANTIATE_TEST_CASE_P(SSE2, Trans16x16DCT,
::testing::Values(make_tuple(&aom_fdct16x16_sse2,
&