Disable intra txb hash checking in all intra mode
No visible speed benefits. On average run coding speed slightly
up by 1% in speed 6.
BUG=aomedia:2959
STATS_CHANGED
Change-Id: I41a745bbc0596f92a2c2deef8dc1bd520f01c4c1
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 23b3047..81c7640 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -595,7 +595,6 @@
sf->tx_sf.adaptive_txb_search_level = 2;
sf->tx_sf.tx_type_search.use_skip_flag_prediction = 2;
- sf->tx_sf.use_intra_txb_hash = 1;
// TODO(any): evaluate if these lpf features can be moved to speed 2.
// For screen content, "prune_sgr_based_on_wiener = 2" cause large quality
@@ -635,9 +634,6 @@
sf->tx_sf.tx_type_search.fast_intra_tx_type_search = 1;
sf->tx_sf.tx_type_search.prune_2d_txfm_mode = TX_TYPE_PRUNE_3;
sf->tx_sf.tx_type_search.prune_tx_type_est_rd = 1;
- // TODO(any): Experiment with enabling of this speed feature as hash state
- // is reset during winner mode processing
- sf->tx_sf.use_intra_txb_hash = 0;
sf->rd_sf.perform_coeff_opt = 5;
sf->rd_sf.tx_domain_dist_thres_level = 2;
@@ -675,11 +671,9 @@
sf->mv_sf.use_bsize_dependent_search_method = 1;
sf->tx_sf.tx_type_search.winner_mode_tx_type_pruning = 2;
- sf->tx_sf.use_intra_txb_hash = 1;
sf->tx_sf.tx_type_search.prune_tx_type_est_rd = 0;
sf->rd_sf.perform_coeff_opt = 6;
-
sf->lpf_sf.cdef_pick_method = CDEF_FAST_SEARCH_LVL4;
}
}
@@ -1685,13 +1679,6 @@
(sf->inter_sf.disable_interintra_wedge_var_thresh != UINT_MAX);
}
- // TODO(any) Currently use_intra_txb_hash is enabled in speed 1,2 for
- // intra-only encoding (key_freq_max == 0). Experiment with this speed feature
- // by enabling for image encoding in speed 1 and 2.
- if (cpi->oxcf.kf_cfg.key_freq_max == 0 && speed >= 1 && speed <= 2) {
- sf->tx_sf.use_intra_txb_hash = 1;
- }
-
// sf->part_sf.partition_search_breakout_dist_thr is set assuming max 64x64
// blocks. Normalise this if the blocks are bigger.
if (MAX_SB_SIZE_LOG2 > 6) {
