Commit 3bac9928 authored by Sebastien Alaiwan's avatar Sebastien Alaiwan

Remove experimental flag of EXT_TX

This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.

Change-Id: I02ed47186bbc32400ee9bfadda17659d859c0ef7
parent 1dbe92d6
...@@ -28,9 +28,7 @@ typedef struct txfm_param { ...@@ -28,9 +28,7 @@ typedef struct txfm_param {
TX_SIZE tx_size; TX_SIZE tx_size;
int lossless; int lossless;
int bd; int bd;
#if CONFIG_EXT_TX
TxSetType tx_set_type; TxSetType tx_set_type;
#endif // CONFIG_EXT_TX
#if CONFIG_MRC_TX || CONFIG_LGT #if CONFIG_MRC_TX || CONFIG_LGT
int is_inter; int is_inter;
#endif // CONFIG_MRC_TX || CONFIG_LGT #endif // CONFIG_MRC_TX || CONFIG_LGT
......
...@@ -35,7 +35,6 @@ static INLINE __m128i mm_reverse_epi16(const __m128i x) { ...@@ -35,7 +35,6 @@ static INLINE __m128i mm_reverse_epi16(const __m128i x) {
return _mm_shuffle_epi32(b, 0x4e); return _mm_shuffle_epi32(b, 0x4e);
} }
#if CONFIG_EXT_TX
// Identity transform (both forward and inverse). // Identity transform (both forward and inverse).
static INLINE void idtx16_8col(__m128i *in) { static INLINE void idtx16_8col(__m128i *in) {
const __m128i k__zero_epi16 = _mm_set1_epi16((int16_t)0); const __m128i k__zero_epi16 = _mm_set1_epi16((int16_t)0);
...@@ -226,7 +225,6 @@ static INLINE void idtx16_8col(__m128i *in) { ...@@ -226,7 +225,6 @@ static INLINE void idtx16_8col(__m128i *in) {
in[14] = _mm_packs_epi32(u6, y6); in[14] = _mm_packs_epi32(u6, y6);
in[15] = _mm_packs_epi32(u7, y7); in[15] = _mm_packs_epi32(u7, y7);
} }
#endif // CONFIG_EXT_TX
static INLINE void scale_sqrt2_8x4(__m128i *in) { static INLINE void scale_sqrt2_8x4(__m128i *in) {
// Implements ROUND_POWER_OF_TWO(input * Sqrt2, DCT_CONST_BITS), for 32 // Implements ROUND_POWER_OF_TWO(input * Sqrt2, DCT_CONST_BITS), for 32
......
...@@ -160,8 +160,6 @@ AV1_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c ...@@ -160,8 +160,6 @@ AV1_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c
AV1_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/corner_match_sse4.c AV1_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/corner_match_sse4.c
ifeq ($(CONFIG_EXT_TX),yes)
AV1_CX_SRCS-yes += encoder/tx_prune_model_weights.h AV1_CX_SRCS-yes += encoder/tx_prune_model_weights.h
endif
AV1_CX_SRCS-yes := $(filter-out $(AV1_CX_SRCS_REMOVE-yes),$(AV1_CX_SRCS-yes)) AV1_CX_SRCS-yes := $(filter-out $(AV1_CX_SRCS_REMOVE-yes),$(AV1_CX_SRCS-yes))
...@@ -1517,7 +1517,6 @@ void av1_fadst32_new(const int32_t *input, int32_t *output, ...@@ -1517,7 +1517,6 @@ void av1_fadst32_new(const int32_t *input, int32_t *output,
range_check(stage, input, bf1, size, stage_range[stage]); range_check(stage, input, bf1, size, stage_range[stage]);
} }
#if CONFIG_EXT_TX
void av1_fidentity4_c(const int32_t *input, int32_t *output, void av1_fidentity4_c(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range) { const int8_t *cos_bit, const int8_t *stage_range) {
(void)cos_bit; (void)cos_bit;
...@@ -1557,7 +1556,6 @@ void av1_fidentity64_c(const int32_t *input, int32_t *output, ...@@ -1557,7 +1556,6 @@ void av1_fidentity64_c(const int32_t *input, int32_t *output,
range_check(0, input, output, 64, stage_range[0]); range_check(0, input, output, 64, stage_range[0]);
} }
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
#if CONFIG_TX64X64 #if CONFIG_TX64X64
void av1_fdct64_new(const int32_t *input, int32_t *output, void av1_fdct64_new(const int32_t *input, int32_t *output,
......
...@@ -39,7 +39,6 @@ void av1_fadst16_new(const int32_t *input, int32_t *output, ...@@ -39,7 +39,6 @@ void av1_fadst16_new(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
void av1_fadst32_new(const int32_t *input, int32_t *output, void av1_fadst32_new(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
#if CONFIG_EXT_TX
void av1_fidentity4_c(const int32_t *input, int32_t *output, void av1_fidentity4_c(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
void av1_fidentity8_c(const int32_t *input, int32_t *output, void av1_fidentity8_c(const int32_t *input, int32_t *output,
...@@ -52,7 +51,6 @@ void av1_fidentity32_c(const int32_t *input, int32_t *output, ...@@ -52,7 +51,6 @@ void av1_fidentity32_c(const int32_t *input, int32_t *output,
void av1_fidentity64_c(const int32_t *input, int32_t *output, void av1_fidentity64_c(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -314,7 +314,6 @@ static const TXFM_1D_CFG fwd_txfm_1d_col_cfg_adst_32 = { ...@@ -314,7 +314,6 @@ static const TXFM_1D_CFG fwd_txfm_1d_col_cfg_adst_32 = {
TXFM_TYPE_ADST32, // .txfm_type TXFM_TYPE_ADST32, // .txfm_type
}; };
#if CONFIG_EXT_TX
// identity does not need to differentiate between row and col // identity does not need to differentiate between row and col
// ---------------- row/col config fwd_identity_4 ---------- // ---------------- row/col config fwd_identity_4 ----------
static const TXFM_1D_CFG fwd_txfm_1d_cfg_identity_4 = { static const TXFM_1D_CFG fwd_txfm_1d_cfg_identity_4 = {
...@@ -359,5 +358,4 @@ static const TXFM_1D_CFG fwd_txfm_1d_cfg_identity_32 = { ...@@ -359,5 +358,4 @@ static const TXFM_1D_CFG fwd_txfm_1d_cfg_identity_32 = {
NULL, // .cos_bit NULL, // .cos_bit
TXFM_TYPE_IDENTITY32, // .txfm_type TXFM_TYPE_IDENTITY32, // .txfm_type
}; };
#endif // CONFIG_EXT_TX
#endif // AV1_FWD_TXFM2D_CFG_H_ #endif // AV1_FWD_TXFM2D_CFG_H_
...@@ -31,7 +31,6 @@ static INLINE TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -31,7 +31,6 @@ static INLINE TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
case TXFM_TYPE_ADST8: return av1_fadst8_new; case TXFM_TYPE_ADST8: return av1_fadst8_new;
case TXFM_TYPE_ADST16: return av1_fadst16_new; case TXFM_TYPE_ADST16: return av1_fadst16_new;
case TXFM_TYPE_ADST32: return av1_fadst32_new; case TXFM_TYPE_ADST32: return av1_fadst32_new;
#if CONFIG_EXT_TX
case TXFM_TYPE_IDENTITY4: return av1_fidentity4_c; case TXFM_TYPE_IDENTITY4: return av1_fidentity4_c;
case TXFM_TYPE_IDENTITY8: return av1_fidentity8_c; case TXFM_TYPE_IDENTITY8: return av1_fidentity8_c;
case TXFM_TYPE_IDENTITY16: return av1_fidentity16_c; case TXFM_TYPE_IDENTITY16: return av1_fidentity16_c;
...@@ -39,7 +38,6 @@ static INLINE TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -39,7 +38,6 @@ static INLINE TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
#if CONFIG_TX64X64 #if CONFIG_TX64X64
case TXFM_TYPE_IDENTITY64: return av1_fidentity64_c; case TXFM_TYPE_IDENTITY64: return av1_fidentity64_c;
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
default: assert(0); return NULL; default: assert(0); return NULL;
} }
} }
...@@ -305,14 +303,12 @@ static const TXFM_1D_CFG *fwd_txfm_col_cfg_ls[TX_TYPES_1D][TX_SIZES] = { ...@@ -305,14 +303,12 @@ static const TXFM_1D_CFG *fwd_txfm_col_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
// ADST // ADST
{ &fwd_txfm_1d_col_cfg_adst_4, &fwd_txfm_1d_col_cfg_adst_8, { &fwd_txfm_1d_col_cfg_adst_4, &fwd_txfm_1d_col_cfg_adst_8,
&fwd_txfm_1d_col_cfg_adst_16, &fwd_txfm_1d_col_cfg_adst_32 }, &fwd_txfm_1d_col_cfg_adst_16, &fwd_txfm_1d_col_cfg_adst_32 },
#if CONFIG_EXT_TX
// FLIPADST // FLIPADST
{ &fwd_txfm_1d_col_cfg_adst_4, &fwd_txfm_1d_col_cfg_adst_8, { &fwd_txfm_1d_col_cfg_adst_4, &fwd_txfm_1d_col_cfg_adst_8,
&fwd_txfm_1d_col_cfg_adst_16, &fwd_txfm_1d_col_cfg_adst_32 }, &fwd_txfm_1d_col_cfg_adst_16, &fwd_txfm_1d_col_cfg_adst_32 },
// IDENTITY // IDENTITY
{ &fwd_txfm_1d_cfg_identity_4, &fwd_txfm_1d_cfg_identity_8, { &fwd_txfm_1d_cfg_identity_4, &fwd_txfm_1d_cfg_identity_8,
&fwd_txfm_1d_cfg_identity_16, &fwd_txfm_1d_cfg_identity_32 }, &fwd_txfm_1d_cfg_identity_16, &fwd_txfm_1d_cfg_identity_32 },
#endif // CONFIG_EXT_TX
}; };
static const TXFM_1D_CFG *fwd_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = { static const TXFM_1D_CFG *fwd_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
...@@ -322,14 +318,12 @@ static const TXFM_1D_CFG *fwd_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = { ...@@ -322,14 +318,12 @@ static const TXFM_1D_CFG *fwd_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
// ADST // ADST
{ &fwd_txfm_1d_row_cfg_adst_4, &fwd_txfm_1d_row_cfg_adst_8, { &fwd_txfm_1d_row_cfg_adst_4, &fwd_txfm_1d_row_cfg_adst_8,
&fwd_txfm_1d_row_cfg_adst_16, &fwd_txfm_1d_row_cfg_adst_32 }, &fwd_txfm_1d_row_cfg_adst_16, &fwd_txfm_1d_row_cfg_adst_32 },
#if CONFIG_EXT_TX
// FLIPADST // FLIPADST
{ &fwd_txfm_1d_row_cfg_adst_4, &fwd_txfm_1d_row_cfg_adst_8, { &fwd_txfm_1d_row_cfg_adst_4, &fwd_txfm_1d_row_cfg_adst_8,
&fwd_txfm_1d_row_cfg_adst_16, &fwd_txfm_1d_row_cfg_adst_32 }, &fwd_txfm_1d_row_cfg_adst_16, &fwd_txfm_1d_row_cfg_adst_32 },
// IDENTITY // IDENTITY
{ &fwd_txfm_1d_cfg_identity_4, &fwd_txfm_1d_cfg_identity_8, { &fwd_txfm_1d_cfg_identity_4, &fwd_txfm_1d_cfg_identity_8,
&fwd_txfm_1d_cfg_identity_16, &fwd_txfm_1d_cfg_identity_32 }, &fwd_txfm_1d_cfg_identity_16, &fwd_txfm_1d_cfg_identity_32 },
#endif // CONFIG_EXT_TX
}; };
TXFM_2D_FLIP_CFG av1_get_fwd_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size) { TXFM_2D_FLIP_CFG av1_get_fwd_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size) {
......
...@@ -1563,7 +1563,6 @@ void av1_iadst32_new(const int32_t *input, int32_t *output, ...@@ -1563,7 +1563,6 @@ void av1_iadst32_new(const int32_t *input, int32_t *output,
range_check(stage, input, bf1, size, stage_range[stage]); range_check(stage, input, bf1, size, stage_range[stage]);
} }
#if CONFIG_EXT_TX
void av1_iidentity4_c(const int32_t *input, int32_t *output, void av1_iidentity4_c(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range) { const int8_t *cos_bit, const int8_t *stage_range) {
(void)cos_bit; (void)cos_bit;
...@@ -1603,7 +1602,6 @@ void av1_iidentity64_c(const int32_t *input, int32_t *output, ...@@ -1603,7 +1602,6 @@ void av1_iidentity64_c(const int32_t *input, int32_t *output,
range_check(0, input, output, 64, stage_range[0]); range_check(0, input, output, 64, stage_range[0]);
} }
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
#if CONFIG_TX64X64 #if CONFIG_TX64X64
void av1_idct64_new(const int32_t *input, int32_t *output, void av1_idct64_new(const int32_t *input, int32_t *output,
......
...@@ -39,7 +39,6 @@ void av1_iadst16_new(const int32_t *input, int32_t *output, ...@@ -39,7 +39,6 @@ void av1_iadst16_new(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
void av1_iadst32_new(const int32_t *input, int32_t *output, void av1_iadst32_new(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
#if CONFIG_EXT_TX
void av1_iidentity4_c(const int32_t *input, int32_t *output, void av1_iidentity4_c(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
void av1_iidentity8_c(const int32_t *input, int32_t *output, void av1_iidentity8_c(const int32_t *input, int32_t *output,
...@@ -52,7 +51,6 @@ void av1_iidentity32_c(const int32_t *input, int32_t *output, ...@@ -52,7 +51,6 @@ void av1_iidentity32_c(const int32_t *input, int32_t *output,
void av1_iidentity64_c(const int32_t *input, int32_t *output, void av1_iidentity64_c(const int32_t *input, int32_t *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -306,7 +306,6 @@ static const TXFM_1D_CFG inv_txfm_1d_col_cfg_adst_32 = { ...@@ -306,7 +306,6 @@ static const TXFM_1D_CFG inv_txfm_1d_col_cfg_adst_32 = {
TXFM_TYPE_ADST32, // .txfm_type TXFM_TYPE_ADST32, // .txfm_type
}; };
#if CONFIG_EXT_TX
// identity does not need to differentiate between row and col // identity does not need to differentiate between row and col
// ---------------- row/col config inv_identity_4 ---------- // ---------------- row/col config inv_identity_4 ----------
static const TXFM_1D_CFG inv_txfm_1d_cfg_identity_4 = { static const TXFM_1D_CFG inv_txfm_1d_cfg_identity_4 = {
...@@ -359,5 +358,4 @@ static const TXFM_1D_CFG inv_txfm_1d_cfg_identity_64 = { ...@@ -359,5 +358,4 @@ static const TXFM_1D_CFG inv_txfm_1d_cfg_identity_64 = {
TXFM_TYPE_IDENTITY64, // .txfm_type TXFM_TYPE_IDENTITY64, // .txfm_type
}; };
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
#endif // AV1_INV_TXFM2D_CFG_H_ #endif // AV1_INV_TXFM2D_CFG_H_
...@@ -29,7 +29,6 @@ static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -29,7 +29,6 @@ static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
case TXFM_TYPE_ADST8: return av1_iadst8_new; case TXFM_TYPE_ADST8: return av1_iadst8_new;
case TXFM_TYPE_ADST16: return av1_iadst16_new; case TXFM_TYPE_ADST16: return av1_iadst16_new;
case TXFM_TYPE_ADST32: return av1_iadst32_new; case TXFM_TYPE_ADST32: return av1_iadst32_new;
#if CONFIG_EXT_TX
case TXFM_TYPE_IDENTITY4: return av1_iidentity4_c; case TXFM_TYPE_IDENTITY4: return av1_iidentity4_c;
case TXFM_TYPE_IDENTITY8: return av1_iidentity8_c; case TXFM_TYPE_IDENTITY8: return av1_iidentity8_c;
case TXFM_TYPE_IDENTITY16: return av1_iidentity16_c; case TXFM_TYPE_IDENTITY16: return av1_iidentity16_c;
...@@ -37,7 +36,6 @@ static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -37,7 +36,6 @@ static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
#if CONFIG_TX64X64 #if CONFIG_TX64X64
case TXFM_TYPE_IDENTITY64: return av1_iidentity64_c; case TXFM_TYPE_IDENTITY64: return av1_iidentity64_c;
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
#endif // CONFIG_EXT_TX
default: assert(0); return NULL; default: assert(0); return NULL;
} }
} }
...@@ -57,7 +55,6 @@ static const TXFM_1D_CFG *inv_txfm_col_cfg_ls[TX_TYPES_1D][TX_SIZES] = { ...@@ -57,7 +55,6 @@ static const TXFM_1D_CFG *inv_txfm_col_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
NULL NULL
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
}, },
#if CONFIG_EXT_TX
// FLIPADST // FLIPADST
{ &inv_txfm_1d_col_cfg_adst_4, &inv_txfm_1d_col_cfg_adst_8, { &inv_txfm_1d_col_cfg_adst_4, &inv_txfm_1d_col_cfg_adst_8,
&inv_txfm_1d_col_cfg_adst_16, &inv_txfm_1d_col_cfg_adst_32, &inv_txfm_1d_col_cfg_adst_16, &inv_txfm_1d_col_cfg_adst_32,
...@@ -72,7 +69,6 @@ static const TXFM_1D_CFG *inv_txfm_col_cfg_ls[TX_TYPES_1D][TX_SIZES] = { ...@@ -72,7 +69,6 @@ static const TXFM_1D_CFG *inv_txfm_col_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
&inv_txfm_1d_cfg_identity_64 &inv_txfm_1d_cfg_identity_64
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
}, },
#endif // CONFIG_EXT_TX
}; };
static const TXFM_1D_CFG *inv_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = { static const TXFM_1D_CFG *inv_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
...@@ -91,7 +87,6 @@ static const TXFM_1D_CFG *inv_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = { ...@@ -91,7 +87,6 @@ static const TXFM_1D_CFG *inv_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
NULL NULL
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
}, },
#if CONFIG_EXT_TX
// FLIPADST // FLIPADST
{ &inv_txfm_1d_row_cfg_adst_4, &inv_txfm_1d_row_cfg_adst_8, { &inv_txfm_1d_row_cfg_adst_4, &inv_txfm_1d_row_cfg_adst_8,
&inv_txfm_1d_row_cfg_adst_16, &inv_txfm_1d_row_cfg_adst_32, &inv_txfm_1d_row_cfg_adst_16, &inv_txfm_1d_row_cfg_adst_32,
...@@ -106,7 +101,6 @@ static const TXFM_1D_CFG *inv_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = { ...@@ -106,7 +101,6 @@ static const TXFM_1D_CFG *inv_txfm_row_cfg_ls[TX_TYPES_1D][TX_SIZES] = {
&inv_txfm_1d_cfg_identity_64 &inv_txfm_1d_cfg_identity_64
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
}, },
#endif // CONFIG_EXT_TX
}; };
TXFM_2D_FLIP_CFG av1_get_inv_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size) { TXFM_2D_FLIP_CFG av1_get_inv_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size) {
......
...@@ -125,17 +125,6 @@ if (aom_config("CONFIG_HIGHBITDEPTH") eq "yes") { ...@@ -125,17 +125,6 @@ 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"; 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_HIGHBITDEPTH") ne "yes") { if (aom_config("CONFIG_HIGHBITDEPTH") ne "yes") {
if (aom_config("CONFIG_EXT_TX") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_iht4x4_16_add msa/;
}
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_iht8x8_64_add msa/;
}
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_iht16x16_256_add msa/;
}
}
} }
add_proto qw/void av1_iht32x32_1024_add/, "const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param"; add_proto qw/void av1_iht32x32_1024_add/, "const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param";
...@@ -364,19 +353,6 @@ if (aom_config("CONFIG_AV1_ENCODER") eq "yes") { ...@@ -364,19 +353,6 @@ if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
add_proto qw/void av1_fht32x8/, "const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param"; add_proto qw/void av1_fht32x8/, "const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param";
if (aom_config("CONFIG_HIGHBITDEPTH") ne "yes") {
if (aom_config("CONFIG_EXT_TX") ne "yes") {
if (aom_config("CONFIG_DAALA_TX4") ne "yes") {
specialize qw/av1_fht4x4 msa/;
}
if (aom_config("CONFIG_DAALA_TX8") ne "yes") {
specialize qw/av1_fht8x8 msa/;
}
if (aom_config("CONFIG_DAALA_TX16") ne "yes") {
specialize qw/av1_fht16x16 msa/;
}
}
}
add_proto qw/void av1_fwd_idtx/, "const int16_t *src_diff, tran_low_t *coeff, int stride, int bsx, int bsy, TX_TYPE tx_type"; add_proto qw/void av1_fwd_idtx/, "const int16_t *src_diff, tran_low_t *coeff, int stride, int bsx, int bsy, TX_TYPE tx_type";
......
...@@ -153,7 +153,6 @@ static INLINE void set_flip_cfg(TX_TYPE tx_type, TXFM_2D_FLIP_CFG *cfg) { ...@@ -153,7 +153,6 @@ static INLINE void set_flip_cfg(TX_TYPE tx_type, TXFM_2D_FLIP_CFG *cfg) {
cfg->ud_flip = 0; cfg->ud_flip = 0;
cfg->lr_flip = 0; cfg->lr_flip = 0;
break; break;
#if CONFIG_EXT_TX
case IDTX: case IDTX:
case V_DCT: case V_DCT:
case H_DCT: case H_DCT:
...@@ -178,7 +177,6 @@ static INLINE void set_flip_cfg(TX_TYPE tx_type, TXFM_2D_FLIP_CFG *cfg) { ...@@ -178,7 +177,6 @@ static INLINE void set_flip_cfg(TX_TYPE tx_type, TXFM_2D_FLIP_CFG *cfg) {
cfg->ud_flip = 1; cfg->ud_flip = 1;
cfg->lr_flip = 1; cfg->lr_flip = 1;
break; break;
#endif // CONFIG_EXT_TX
default: default:
cfg->ud_flip = 0; cfg->ud_flip = 0;
cfg->lr_flip = 0; cfg->lr_flip = 0;
...@@ -218,7 +216,6 @@ static INLINE TX_TYPE av1_rotate_tx_type(TX_TYPE tx_type) { ...@@ -218,7 +216,6 @@ static INLINE TX_TYPE av1_rotate_tx_type(TX_TYPE tx_type) {
case ADST_DCT: return DCT_ADST; case ADST_DCT: return DCT_ADST;
case DCT_ADST: return ADST_DCT; case DCT_ADST: return ADST_DCT;
case ADST_ADST: return ADST_ADST; case ADST_ADST: return ADST_ADST;
#if CONFIG_EXT_TX
case FLIPADST_DCT: return DCT_FLIPADST; case FLIPADST_DCT: return DCT_FLIPADST;
case DCT_FLIPADST: return FLIPADST_DCT; case DCT_FLIPADST: return FLIPADST_DCT;
case FLIPADST_FLIPADST: return FLIPADST_FLIPADST; case FLIPADST_FLIPADST: return FLIPADST_FLIPADST;
...@@ -231,7 +228,6 @@ static INLINE TX_TYPE av1_rotate_tx_type(TX_TYPE tx_type) { ...@@ -231,7 +228,6 @@ static INLINE TX_TYPE av1_rotate_tx_type(TX_TYPE tx_type) {
case H_ADST: return V_ADST; case H_ADST: return V_ADST;
case V_FLIPADST: return H_FLIPADST; case V_FLIPADST: return H_FLIPADST;
case H_FLIPADST: return V_FLIPADST; case H_FLIPADST: return V_FLIPADST;
#endif // CONFIG_EXT_TX
#if CONFIG_MRC_TX #if CONFIG_MRC_TX
case MRC_DCT: return MRC_DCT; case MRC_DCT: return MRC_DCT;
#endif // CONFIG_MRC_TX #endif // CONFIG_MRC_TX
......
...@@ -803,7 +803,6 @@ static INLINE int block_signals_txsize(BLOCK_SIZE bsize) { ...@@ -803,7 +803,6 @@ static INLINE int block_signals_txsize(BLOCK_SIZE bsize) {
#define SIGNAL_ANY_MRC_MASK (SIGNAL_MRC_MASK_INTRA || SIGNAL_MRC_MASK_INTER) #define SIGNAL_ANY_MRC_MASK (SIGNAL_MRC_MASK_INTRA || SIGNAL_MRC_MASK_INTER)
#endif // CONFIG_MRC_TX #endif // CONFIG_MRC_TX
#if CONFIG_EXT_TX
#define ALLOW_INTRA_EXT_TX 1 #define ALLOW_INTRA_EXT_TX 1
// Number of transform types in each set type // Number of transform types in each set type
...@@ -1031,7 +1030,6 @@ static INLINE int is_rect_tx_allowed(const MACROBLOCKD *xd, ...@@ -1031,7 +1030,6 @@ static INLINE int is_rect_tx_allowed(const MACROBLOCKD *xd,
return is_rect_tx_allowed_bsize(mbmi->sb_type) && return is_rect_tx_allowed_bsize(mbmi->sb_type) &&
!xd->lossless[mbmi->segment_id]; !xd->lossless[mbmi->segment_id];
} }
#endif // CONFIG_EXT_TX
#if CONFIG_RECT_TX_EXT #if CONFIG_RECT_TX_EXT
static INLINE int is_quarter_tx_allowed_bsize(BLOCK_SIZE bsize) { static INLINE int is_quarter_tx_allowed_bsize(BLOCK_SIZE bsize) {
...@@ -1156,12 +1154,11 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type, ...@@ -1156,12 +1154,11 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
const MB_MODE_INFO *const mbmi = &mi->mbmi; const MB_MODE_INFO *const mbmi = &mi->mbmi;
(void)blk_row; (void)blk_row;
(void)blk_col; (void)blk_col;
#if CONFIG_INTRABC && (!CONFIG_EXT_TX || CONFIG_TXK_SEL) #if CONFIG_INTRABC && (CONFIG_TXK_SEL)
// TODO(aconverse@google.com): Handle INTRABC + EXT_TX + TXK_SEL // TODO(aconverse@google.com): Handle INTRABC + EXT_TX + TXK_SEL
if (is_intrabc_block(mbmi)) return DCT_DCT; if (is_intrabc_block(mbmi)) return DCT_DCT;
#endif // CONFIG_INTRABC && (!CONFIG_EXT_TX || CONFIG_TXK_SEL) #endif // CONFIG_INTRABC && (CONFIG_TXK_SEL)
#if CONFIG_EXT_TX
const struct macroblockd_plane *const pd = &xd->plane[plane_type]; const struct macroblockd_plane *const pd = &xd->plane[plane_type];
const BLOCK_SIZE plane_bsize = get_plane_block_size(mbmi->sb_type, pd); const BLOCK_SIZE plane_bsize = get_plane_block_size(mbmi->sb_type, pd);
// TODO(sarahparker) This assumes reduced_tx_set_used == 0. I will do a // TODO(sarahparker) This assumes reduced_tx_set_used == 0. I will do a
...@@ -1171,7 +1168,6 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type, ...@@ -1171,7 +1168,6 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
get_ext_tx_set_type(tx_size, plane_bsize, is_inter_block(mbmi), 0); get_ext_tx_set_type(tx_size, plane_bsize, is_inter_block(mbmi), 0);
if (is_inter_block(mbmi) && !av1_ext_tx_used[tx_set_type][mbmi->tx_type]) if (is_inter_block(mbmi) && !av1_ext_tx_used[tx_set_type][mbmi->tx_type])
return DCT_DCT; return DCT_DCT;
#endif // CONFIG_EXT_TX
#if CONFIG_TXK_SEL #if CONFIG_TXK_SEL
TX_TYPE tx_type; TX_TYPE tx_type;
...@@ -1186,10 +1182,8 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type, ...@@ -1186,10 +1182,8 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
tx_type = intra_mode_to_tx_type_context[mbmi->uv_mode]; tx_type = intra_mode_to_tx_type_context[mbmi->uv_mode];
} }
assert(tx_type >= DCT_DCT && tx_type < TX_TYPES); assert(tx_type >= DCT_DCT && tx_type < TX_TYPES);
#if CONFIG_EXT_TX
if (is_inter_block(mbmi) && !av1_ext_tx_used[tx_set_type][tx_type]) if (is_inter_block(mbmi) && !av1_ext_tx_used[tx_set_type][tx_type])
return DCT_DCT; return DCT_DCT;
#endif // CONFIG_EXT_TX
return tx_type; return tx_type;
#endif // CONFIG_TXK_SEL #endif // CONFIG_TXK_SEL
...@@ -1198,7 +1192,6 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type, ...@@ -1198,7 +1192,6 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
return get_default_tx_type(plane_type, xd, block_raster_idx, tx_size); return get_default_tx_type(plane_type, xd, block_raster_idx, tx_size);
#endif // FIXED_TX_TYPE #endif // FIXED_TX_TYPE
#if CONFIG_EXT_TX
#if CONFIG_MRC_TX #if CONFIG_MRC_TX
if (mbmi->tx_type == MRC_DCT) { if (mbmi->tx_type == MRC_DCT) {
assert(((is_inter_block(mbmi) && USE_MRC_INTER) || assert(((is_inter_block(mbmi) && USE_MRC_INTER) ||
...@@ -1238,22 +1231,6 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type, ...@@ -1238,22 +1231,6 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
intra_mode_to_tx_type_context[get_uv_mode(mbmi->uv_mode)]; intra_mode_to_tx_type_context[get_uv_mode(mbmi->uv_mode)];
if (!av1_ext_tx_used[tx_set_type][intra_type]) return DCT_DCT; if (!av1_ext_tx_used[tx_set_type][intra_type]) return DCT_DCT;
return intra_type; return intra_type;
#else // CONFIG_EXT_TX
(void)block;
#if CONFIG_MRC_TX
if (mbmi->tx_type == MRC_DCT) {
if (plane_type == PLANE_TYPE_Y && !xd->lossless[mbmi->segment_id]) {
assert(tx_size == TX_32X32);
return mbmi->tx_type;
}
return DCT_DCT;
}
#endif // CONFIG_MRC_TX
if (plane_type != PLANE_TYPE_Y || xd->lossless[mbmi->segment_id] ||
txsize_sqr_map[tx_size] >= TX_32X32)
return DCT_DCT;
return mbmi->tx_type;
#endif // CONFIG_EXT_TX
} }
void av1_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y); void av1_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y);
......
...@@ -777,18 +777,14 @@ static const TX_SIZE quarter_txsize_lookup[BLOCK_SIZES_ALL] = { ...@@ -777,18 +777,14 @@ static const TX_SIZE quarter_txsize_lookup[BLOCK_SIZES_ALL] = {
static const TX_TYPE_1D vtx_tab[TX_TYPES] = { static const TX_TYPE_1D vtx_tab[TX_TYPES] = {
DCT_1D, ADST_1D, DCT_1D, ADST_1D, DCT_1D, ADST_1D, DCT_1D, ADST_1D,
#if CONFIG_EXT_TX
FLIPADST_1D, DCT_1D, FLIPADST_1D, ADST_1D, FLIPADST_1D, IDTX_1D, FLIPADST_1D, DCT_1D, FLIPADST_1D, ADST_1D, FLIPADST_1D, IDTX_1D,
DCT_1D, IDTX_1D, ADST_1D, IDTX_1D, FLIPADST_1D, IDTX_1D, DCT_1D, IDTX_1D, ADST_1D, IDTX_1D, FLIPADST_1D, IDTX_1D,
#endif // CONFIG_EXT_TX
}; };
static const TX_TYPE_1D htx_tab[TX_TYPES] = { static const TX_TYPE_1D htx_tab[TX_TYPES] = {
DCT_1D, DCT_1D, ADST_1D, ADST_1D, DCT_1D, DCT_1D, ADST_1D, ADST_1D,