Remove deprecated functions and speed features Change-Id: I2a402bce4cbbbcebf8fe5a0e480b433f744353c1
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index d158f22..6200cd8 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -2374,36 +2374,6 @@ return rd; } -static int skip_txfm_search(const AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs, - TX_TYPE tx_type, TX_SIZE tx_size) { - const MACROBLOCKD *const xd = &x->e_mbd; - const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; - const int is_inter = is_inter_block(mbmi); - (void)bs; - - if (x->cb_partition_scan && tx_type != DCT_DCT) return 1; - - if (mbmi->ref_mv_idx > 0 && tx_type != DCT_DCT) return 1; - if (!is_inter && x->use_default_intra_tx_type && - tx_type != get_default_tx_type(0, xd, tx_size)) - return 1; - if (is_inter && x->use_default_inter_tx_type && - tx_type != get_default_tx_type(0, xd, tx_size)) - return 1; - const AV1_COMMON *const cm = &cpi->common; - const TxSetType tx_set_type = - get_ext_tx_set_type(tx_size, is_inter, cm->reduced_tx_set_used); - if (!av1_ext_tx_used[tx_set_type][tx_type]) return 1; - if (is_inter) { - if (cpi->sf.tx_type_search.prune_mode > NO_PRUNE) { - if (!do_tx_type_search(tx_type, x->tx_search_prune[tx_set_type], - cpi->sf.tx_type_search.prune_mode)) - return 1; - } - } - return 0; -} - static int64_t estimate_yrd_for_sb(const AV1_COMP *const cpi, BLOCK_SIZE bs, MACROBLOCK *x, int *r, int64_t *d, int *s, int64_t *sse, int64_t ref_best_rd) {
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c index 7b9dac6..2fc488f 100644 --- a/av1/encoder/speed_features.c +++ b/av1/encoder/speed_features.c
@@ -193,7 +193,6 @@ sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V; sf->intra_uv_mode_mask[TX_16X16] = UV_INTRA_DC_H_V_CFL; - sf->tx_size_search_breakout = 1; sf->partition_search_breakout_rate_thr = 80; // Use transform domain distortion. @@ -474,7 +473,6 @@ // Recode loop tolerance %. sf->recode_tolerance = 25; sf->default_interp_filter = SWITCHABLE; - sf->tx_size_search_breakout = 0; sf->partition_search_breakout_dist_thr = 0; sf->partition_search_breakout_rate_thr = 0; sf->simple_model_rd_from_var = 0;
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h index 6e52618..6b6f385 100644 --- a/av1/encoder/speed_features.h +++ b/av1/encoder/speed_features.h
@@ -518,10 +518,6 @@ // default interp filter choice InterpFilter default_interp_filter; - // Early termination in transform size search, which only applies while - // tx_size_search_method is USE_FULL_RD. - int tx_size_search_breakout; - // adaptive interp_filter search to allow skip of certain filter types. int adaptive_interp_filter_search;