Remove experimental flag for rect-tx Change-Id: I0cc53a03f07a11a6f7ea0570ff4ee8cf7c18c5aa
diff --git a/av1/common/blockd.h b/av1/common/blockd.h index 156f44c..277ec46 100644 --- a/av1/common/blockd.h +++ b/av1/common/blockd.h
@@ -819,16 +819,10 @@ #define USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4 1 -#if CONFIG_RECT_TX static INLINE int is_rect_tx(TX_SIZE tx_size) { return tx_size >= TX_SIZES; } -#endif // CONFIG_RECT_TX static INLINE int block_signals_txsize(BLOCK_SIZE bsize) { -#if CONFIG_RECT_TX return bsize > BLOCK_4X4; -#else - return bsize >= BLOCK_8X8; -#endif } #if CONFIG_MRC_TX @@ -1024,7 +1018,6 @@ } #endif // CONFIG_LGT_FROM_PRED -#if CONFIG_RECT_TX static INLINE int is_rect_tx_allowed_bsize(BLOCK_SIZE bsize) { static const char LUT[BLOCK_SIZES_ALL] = { 0, // BLOCK_2X2 @@ -1068,7 +1061,6 @@ return is_rect_tx_allowed_bsize(mbmi->sb_type) && !xd->lossless[mbmi->segment_id]; } -#endif // CONFIG_RECT_TX #endif // CONFIG_EXT_TX #if CONFIG_RECT_TX_EXT @@ -1121,28 +1113,14 @@ static INLINE TX_SIZE tx_size_from_tx_mode(BLOCK_SIZE bsize, TX_MODE tx_mode, int is_inter) { const TX_SIZE largest_tx_size = tx_mode_to_biggest_tx_size[tx_mode]; -#if CONFIG_RECT_TX const TX_SIZE max_rect_tx_size = max_txsize_rect_lookup[bsize]; -#else - const TX_SIZE max_tx_size = max_txsize_lookup[bsize]; -#endif // CONFIG_RECT_TX (void)is_inter; -#if CONFIG_RECT_TX if (bsize == BLOCK_4X4) return AOMMIN(max_txsize_lookup[bsize], largest_tx_size); if (txsize_sqr_map[max_rect_tx_size] <= largest_tx_size) return max_rect_tx_size; else return largest_tx_size; -#elif CONFIG_EXT_TX && CONFIG_RECT_TX - if (txsize_sqr_up_map[max_rect_tx_size] <= largest_tx_size) { - return max_rect_tx_size; - } else { - return largest_tx_size; - } -#else - return AOMMIN(max_tx_size, largest_tx_size); -#endif // CONFIG_RECT_TX } #if CONFIG_EXT_INTRA
diff --git a/av1/common/common_data.h b/av1/common/common_data.h index f862d63..64a8e64 100644 --- a/av1/common/common_data.h +++ b/av1/common/common_data.h
@@ -697,7 +697,6 @@ #endif // CONFIG_EXT_PARTITION }; -#if CONFIG_RECT_TX static const TX_SIZE max_txsize_rect_lookup[BLOCK_SIZES_ALL] = { // 2X2, 2X4, 4X2, TX_4X4, TX_4X4, TX_4X4, @@ -738,7 +737,7 @@ TX_4X8, TX_8X4, TX_8X16, // 32x8 TX_16X8, -#endif +#endif // CONFIG_RECT_TX_EXT // 16x64, 64x16 TX_16X32, TX_32X16, #if CONFIG_EXT_PARTITION @@ -774,10 +773,7 @@ TX_INVALID, TX_INVALID #endif // CONFIG_EXT_PARTITION }; -#endif -#else -#define max_txsize_rect_lookup max_txsize_lookup -#endif // CONFIG_RECT_TX +#endif // CONFIG_RECT_TX_EXT static const TX_TYPE_1D vtx_tab[TX_TYPES] = { DCT_1D, ADST_1D, DCT_1D, ADST_1D, @@ -795,7 +791,6 @@ #endif // CONFIG_EXT_TX }; -#if CONFIG_RECT_TX // Same as "max_txsize_lookup[bsize] - TX_8X8", except for rectangular // block which may use a rectangular transform, in which case it is // "(max_txsize_lookup[bsize] + 1) - TX_8X8", invalid for bsize < 8X8 @@ -840,48 +835,6 @@ TX_32X32 - TX_8X8, TX_32X32 - TX_8X8 #endif // CONFIG_EXT_PARTITION }; -#else -// Same as "max_txsize_lookup[bsize] - TX_8X8", invalid for bsize < 8X8 -static const int32_t intra_tx_size_cat_lookup[BLOCK_SIZES_ALL] = { - // 2X2, 2X4, 4X2, - INT32_MIN, INT32_MIN, INT32_MIN, - // 4X4 - INT32_MIN, - // 4X8, 8X4, 8X8 - INT32_MIN, INT32_MIN, TX_8X8 - TX_8X8, - // 8X16, 16X8, 16X16 - TX_8X8 - TX_8X8, TX_8X8 - TX_8X8, TX_16X16 - TX_8X8, - // 16X32, 32X16, 32X32 - TX_16X16 - TX_8X8, TX_16X16 - TX_8X8, TX_32X32 - TX_8X8, -#if CONFIG_TX64X64 - // 32X64, 64X32, - TX_64X64 - TX_8X8, TX_64X64 - TX_8X8, - // 64X64 - TX_64X64 - TX_8X8, -#if CONFIG_EXT_PARTITION - // 64x128, 128x64, 128x128 - TX_64X64 - TX_8X8, TX_64X64 - TX_8X8, TX_64X64 - TX_8X8, -#endif // CONFIG_EXT_PARTITION -#else - // 32X64, 64X32, - TX_32X32 - TX_8X8, TX_32X32 - TX_8X8, - // 64X64 - TX_32X32 - TX_8X8, -#if CONFIG_EXT_PARTITION - // 64x128, 128x64, 128x128 - TX_32X32 - TX_8X8, TX_32X32 - TX_8X8, TX_32X32 - TX_8X8, -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_TX64X64 - // 4x16, 16x4, 8x32 - TX_8X8 - TX_8X8, TX_8X8 - TX_8X8, TX_8X8 - TX_8X8, - // 32x8 16x64, 64x16 - TX_8X8 - TX_8X8, TX_16X16 - TX_8X8, TX_16X16 - TX_8X8, -#if CONFIG_EXT_PARTITION - // 32x128, 128x32 - TX_32X32 - TX_8X8, TX_32X32 - TX_8X8 -#endif // CONFIG_EXT_PARTITION -}; -#endif // CONFIG_RECT_TX #define inter_tx_size_cat_lookup intra_tx_size_cat_lookup
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index 399e22b..db24722 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -505,9 +505,9 @@ #endif // CONFIG_LOOPFILTER_LEVEL unsigned int delta_lf[DELTA_LF_PROBS][2]; #endif -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX unsigned int tx_size_implied[TX_SIZES][TX_SIZES]; -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX #if CONFIG_ENTROPY_STATS #if CONFIG_EXT_TX unsigned int inter_ext_tx[EXT_TX_SETS_INTER][EXT_TX_SIZES][TX_TYPES];
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c index 33893f9..a5c2fb7 100644 --- a/av1/common/reconintra.c +++ b/av1/common/reconintra.c
@@ -45,7 +45,7 @@ #endif // CONFIG_INTRA_EDGE #define INTRA_USES_EXT_TRANSFORMS 1 -#define INTRA_USES_RECT_TRANSFORMS (CONFIG_RECT_TX) +#define INTRA_USES_RECT_TRANSFORMS 1 static const uint8_t extend_modes[INTRA_MODES] = { NEED_ABOVE | NEED_LEFT, // DC
diff --git a/av1/common/scan.c b/av1/common/scan.c index 7d7c889..241d2fb 100644 --- a/av1/common/scan.c +++ b/av1/common/scan.c
@@ -7869,14 +7869,12 @@ case TX_8X8: return fc->non_zero_prob_8X8[tx_type]; case TX_16X16: return fc->non_zero_prob_16X16[tx_type]; case TX_32X32: return fc->non_zero_prob_32X32[tx_type]; -#if CONFIG_RECT_TX case TX_4X8: return fc->non_zero_prob_4X8[tx_type]; case TX_8X4: return fc->non_zero_prob_8X4[tx_type]; case TX_8X16: return fc->non_zero_prob_8X16[tx_type]; case TX_16X8: return fc->non_zero_prob_16X8[tx_type]; case TX_16X32: return fc->non_zero_prob_16X32[tx_type]; case TX_32X16: return fc->non_zero_prob_32X16[tx_type]; -#endif // CONFIG_RECT_TX default: assert(0); return NULL; } } @@ -7888,14 +7886,12 @@ case TX_8X8: return fc->scan_8X8[tx_type]; case TX_16X16: return fc->scan_16X16[tx_type]; case TX_32X32: return fc->scan_32X32[tx_type]; -#if CONFIG_RECT_TX case TX_4X8: return fc->scan_4X8[tx_type]; case TX_8X4: return fc->scan_8X4[tx_type]; case TX_8X16: return fc->scan_8X16[tx_type]; case TX_16X8: return fc->scan_16X8[tx_type]; case TX_16X32: return fc->scan_16X32[tx_type]; case TX_32X16: return fc->scan_32X16[tx_type]; -#endif // CONFIG_RECT_TX default: assert(0); return NULL; } } @@ -7907,14 +7903,12 @@ case TX_8X8: return fc->iscan_8X8[tx_type]; case TX_16X16: return fc->iscan_16X16[tx_type]; case TX_32X32: return fc->iscan_32X32[tx_type]; -#if CONFIG_RECT_TX case TX_4X8: return fc->iscan_4X8[tx_type]; case TX_8X4: return fc->iscan_8X4[tx_type]; case TX_8X16: return fc->iscan_8X16[tx_type]; case TX_16X8: return fc->iscan_16X8[tx_type]; case TX_16X32: return fc->iscan_16X32[tx_type]; case TX_32X16: return fc->iscan_32X16[tx_type]; -#endif // CONFIG_RECT_TX default: assert(0); return NULL; } } @@ -7926,14 +7920,12 @@ case TX_8X8: return fc->nb_8X8[tx_type]; case TX_16X16: return fc->nb_16X16[tx_type]; case TX_32X32: return fc->nb_32X32[tx_type]; -#if CONFIG_RECT_TX case TX_4X8: return fc->nb_4X8[tx_type]; case TX_8X4: return fc->nb_8X4[tx_type]; case TX_8X16: return fc->nb_8X16[tx_type]; case TX_16X8: return fc->nb_16X8[tx_type]; case TX_16X32: return fc->nb_16X32[tx_type]; case TX_32X16: return fc->nb_32X16[tx_type]; -#endif // CONFIG_RECT_TX default: assert(0); return NULL; } } @@ -7945,14 +7937,12 @@ case TX_8X8: return counts->non_zero_count_8X8[tx_type]; case TX_16X16: return counts->non_zero_count_16X16[tx_type]; case TX_32X32: return counts->non_zero_count_32X32[tx_type]; -#if CONFIG_RECT_TX case TX_4X8: return counts->non_zero_count_4x8[tx_type]; case TX_8X4: return counts->non_zero_count_8x4[tx_type]; case TX_8X16: return counts->non_zero_count_8x16[tx_type]; case TX_16X8: return counts->non_zero_count_16x8[tx_type]; case TX_16X32: return counts->non_zero_count_16x32[tx_type]; case TX_32X16: return counts->non_zero_count_32x16[tx_type]; -#endif // CONFIG_RECT_TX default: assert(0); return NULL; } } @@ -8449,11 +8439,7 @@ TX_SIZE tx_size; TX_TYPE tx_type; for (tx_size = 0; tx_size < TX_SIZES_ALL; ++tx_size) { -#if CONFIG_RECT_TX if (tx_size > TX_32X16) continue; -#else - if (tx_size >= TX_SIZES) continue; -#endif // CONFIG_RECT_TX for (tx_type = DCT_DCT; tx_type < TX_TYPES; ++tx_type) { if (do_adapt_scan(tx_size, tx_type)) { uint32_t *non_zero_prob = get_non_zero_prob(cm->fc, tx_size, tx_type); @@ -8484,11 +8470,7 @@ #endif // CACHE_SCAN_PROB for (tx_size = 0; tx_size < TX_SIZES_ALL; ++tx_size) { -#if CONFIG_RECT_TX if (tx_size > TX_32X16) continue; -#else - if (tx_size >= TX_SIZES) continue; -#endif // CONFIG_RECT_TX TX_TYPE tx_type; for (tx_type = DCT_DCT; tx_type < TX_TYPES; ++tx_type) { if (do_adapt_scan(tx_size, tx_type)) {
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index 7825846..3f298bc 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -481,9 +481,7 @@ const int depth = aom_read_symbol(r, ec_ctx->tx_size_cdf[tx_size_cat][ctx], tx_size_cat + 2, ACCT_STR); const TX_SIZE tx_size = depth_to_tx_size(depth); -#if CONFIG_RECT_TX assert(!is_rect_tx(tx_size)); -#endif // CONFIG_RECT_TX return tx_size; } @@ -499,7 +497,6 @@ : intra_tx_size_cat_lookup[bsize]; const TX_SIZE coded_tx_size = read_selected_tx_size(cm, xd, tx_size_cat, r); -#if CONFIG_RECT_TX if (coded_tx_size > max_txsize_lookup[bsize]) { assert(coded_tx_size == max_txsize_lookup[bsize] + 1); #if CONFIG_RECT_TX_EXT @@ -525,20 +522,17 @@ return max_txsize_rect_lookup[bsize]; } -#else - assert(coded_tx_size <= max_txsize_lookup[bsize]); -#endif // CONFIG_RECT_TX return coded_tx_size; } else { return tx_size_from_tx_mode(bsize, tx_mode, is_inter); } } else { -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX assert(IMPLIES(tx_mode == ONLY_4X4, bsize == BLOCK_4X4)); return max_txsize_rect_lookup[bsize]; #else return TX_4X4; -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX } }
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 93b7e51..884d27b 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -335,9 +335,9 @@ : intra_tx_size_cat_lookup[bsize]; const TX_SIZE coded_tx_size = txsize_sqr_up_map[tx_size]; const int depth = tx_size_to_depth(coded_tx_size); -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX assert(IMPLIES(is_rect_tx(tx_size), is_rect_tx_allowed(xd, mbmi))); -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX aom_write_symbol(w, depth, ec_ctx->tx_size_cdf[tx_size_cat][tx_size_ctx], tx_size_cat + 2);
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index b866250..ce466ba 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c
@@ -4758,12 +4758,7 @@ TX_SIZE tx_size = is_inter && !mbmi->skip ? mbmi->min_tx_size : mbmi->tx_size; if (cm->tx_mode == TX_MODE_SELECT && !xd->lossless[mbmi->segment_id] && -#if CONFIG_RECT_TX - mbmi->sb_type > BLOCK_4X4 && -#else - mbmi->sb_type >= BLOCK_8X8 && -#endif // CONFIG_RECT_TX - !(is_inter && (mbmi->skip || seg_skip))) { + mbmi->sb_type > BLOCK_4X4 && !(is_inter && (mbmi->skip || seg_skip))) { if (is_inter) { tx_partition_count_update(cm, x, bsize, mi_row, mi_col, td->counts); } else { @@ -4782,9 +4777,9 @@ #endif } #endif -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX assert(IMPLIES(is_rect_tx(tx_size), is_rect_tx_allowed(xd, mbmi))); -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX } else { int i, j; TX_SIZE intra_tx_size; @@ -4796,16 +4791,16 @@ intra_tx_size = tx_size_from_tx_mode(bsize, cm->tx_mode, 1); } } else { -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX intra_tx_size = tx_size; #else intra_tx_size = (bsize >= BLOCK_8X8) ? tx_size : TX_4X4; -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX } -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX ++td->counts->tx_size_implied[max_txsize_lookup[bsize]] [txsize_sqr_up_map[tx_size]]; -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX for (j = 0; j < mi_height; j++) for (i = 0; i < mi_width; i++)
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index 90cb82d..f45f108 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -2404,9 +2404,9 @@ const int r_tx_size = tx_size_cost(cm, x, bs, tx_size); -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX assert(IMPLIES(is_rect_tx(tx_size), is_rect_tx_allowed_bsize(bs))); -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX s0 = x->skip_cost[skip_ctx][0]; s1 = x->skip_cost[skip_ctx][1]; @@ -2729,7 +2729,7 @@ av1_invalid_rd_stats(rd_stats); -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX int evaluate_rect_tx = 0; if (tx_select) { evaluate_rect_tx = is_rect_tx_allowed(xd, mbmi); @@ -2856,7 +2856,7 @@ #endif // CONFIG_LGT_FROM_PRED } #endif // CONFIG_RECT_TX_EXT -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX if (tx_select) { start_tx = max_tx_size; @@ -2880,9 +2880,9 @@ last_rd = INT64_MAX; for (n = start_tx; n >= end_tx; --n) { -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX if (is_rect_tx(n)) break; -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX TX_TYPE tx_start = DCT_DCT; TX_TYPE tx_end = TX_TYPES; #if CONFIG_TXK_SEL @@ -4709,11 +4709,7 @@ DECLARE_ALIGNED(32, tran_low_t, DCT_coefs[32 * 32]); TxfmParam param; param.tx_type = DCT_DCT; -#if CONFIG_RECT_TX param.tx_size = max_txsize_rect_lookup[bsize]; -#else - param.tx_size = max_txsize_lookup[bsize]; -#endif param.bd = 8; param.lossless = 0; @@ -4741,11 +4737,7 @@ MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; const int n4 = bsize_to_num_blk(bsize); -#if CONFIG_RECT_TX const TX_SIZE tx_size = max_txsize_rect_lookup[bsize]; -#else - const TX_SIZE tx_size = max_txsize_lookup[bsize]; -#endif mbmi->tx_type = DCT_DCT; for (int idy = 0; idy < xd->n8_h; ++idy) for (int idx = 0; idx < xd->n8_w; ++idx) @@ -5053,11 +5045,11 @@ bsize = scale_chroma_bsize(mbmi->sb_type, xd->plane[1].subsampling_x, xd->plane[1].subsampling_y); -#if CONFIG_EXT_TX && CONFIG_RECT_TX +#if CONFIG_EXT_TX if (is_rect_tx(mbmi->tx_size)) { return super_block_uvrd(cpi, x, rd_stats, bsize, ref_best_rd); } -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX +#endif // CONFIG_EXT_TX if (is_inter_block(mbmi) && is_cost_valid) { for (plane = 1; plane < MAX_MB_PLANE; ++plane)
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 24513b3..5a46b28 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -187,7 +187,6 @@ set(CONFIG_Q_ADAPT_PROBS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_RAWBITS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_RECT_TX 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_RECT_TX_EXT 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure index fd13fe0..8e2fb45 100755 --- a/configure +++ b/configure
@@ -249,7 +249,6 @@ fp_mb_stats cdef cdef_singlepass - rect_tx rect_tx_ext tpl_mv short_filter @@ -504,7 +503,6 @@ # Enable adopted experiments by default soft_enable adopted_experiments if enabled adopted_experiments; then - soft_enable rect_tx soft_enable global_motion soft_enable ext_tx soft_enable cdef @@ -560,7 +558,6 @@ enabled ncobmc_adapt_weight && enable_feature motion_var enabled bgsprite && enable_feature global_motion enabled ext_comp_refs && enable_feature one_sided_compound - enabled rect_tx_ext && enable_feature rect_tx enabled lgt_from_pred && enable_feature ext_tx enabled lgt_from_pred && disable_feature mrc_tx enabled cfl && enable_feature smooth_hv @@ -602,11 +599,6 @@ log_echo "disabling fp_mb_stats" disable_feature fp_mb_stats fi - if ! enabled rect_tx; then - log_echo "ext_partition_types requires rect_tx;" - log_echo "enabling rect_tx;" - enable_feature rect_tx - fi fi # Enable accounting and inspection when building the analyzer if enabled analyzer; then
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc index bccbdee..6226458 100644 --- a/test/av1_inv_txfm2d_test.cc +++ b/test/av1_inv_txfm2d_test.cc
@@ -102,7 +102,6 @@ const AV1InvTxfm2dParam av1_inv_txfm2d_param[] = { #if CONFIG_EXT_TX -#if CONFIG_RECT_TX AV1InvTxfm2dParam(DCT_DCT, TX_4X8, 2, 0.007), AV1InvTxfm2dParam(ADST_DCT, TX_4X8, 2, 0.012), AV1InvTxfm2dParam(DCT_ADST, TX_4X8, 2, 0.012), @@ -142,7 +141,7 @@ AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_16X8, 2, 0.032), AV1InvTxfm2dParam(ADST_FLIPADST, TX_16X8, 2, 0.033), AV1InvTxfm2dParam(FLIPADST_ADST, TX_16X8, 2, 0.032), -#endif + AV1InvTxfm2dParam(FLIPADST_DCT, TX_4X4, 2, 0.002), AV1InvTxfm2dParam(DCT_FLIPADST, TX_4X4, 2, 0.002), AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_4X4, 2, 0.002),