Remove screen content restriction in txfm feature Removed screen content restriction in txfm_rd_gate_level feature. This change had no impact on encoding speed and quality of screen content encoding. This applied to speed 3, 4, and 5. BUG=aomedia:2711 Change-Id: Id080220e7d18375ccab65f134eb7ec1897fe0d17
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c index ca14157..661baf8 100644 --- a/av1/encoder/speed_features.c +++ b/av1/encoder/speed_features.c
@@ -480,9 +480,8 @@ if (cpi->oxcf.comp_type_cfg.enable_smooth_interintra) sf->inter_sf.disable_smooth_interintra = boosted ? 0 : 1; sf->inter_sf.reuse_compound_type_decision = 1; - sf->inter_sf.txfm_rd_gate_level = (boosted || allow_screen_content_tools) - ? 0 - : (is_boosted_arf2_bwd_type ? 1 : 2); + sf->inter_sf.txfm_rd_gate_level = + boosted ? 0 : (is_boosted_arf2_bwd_type ? 1 : 2); sf->intra_sf.prune_palette_search_level = 2; @@ -529,8 +528,7 @@ sf->inter_sf.adaptive_mode_search = 1; sf->inter_sf.alt_ref_search_fp = 1; sf->inter_sf.prune_ref_mv_idx_search = 1; - sf->inter_sf.txfm_rd_gate_level = - (boosted || allow_screen_content_tools) ? 0 : 3; + sf->inter_sf.txfm_rd_gate_level = boosted ? 0 : 3; sf->inter_sf.prune_inter_modes_based_on_tpl = boosted ? 0 : 2; sf->inter_sf.prune_compound_using_neighbors = 2; @@ -606,8 +604,7 @@ sf->inter_sf.disable_interinter_wedge = 1; sf->inter_sf.disable_obmc = 1; sf->inter_sf.disable_onesided_comp = 1; - sf->inter_sf.txfm_rd_gate_level = - (boosted || allow_screen_content_tools) ? 0 : 4; + sf->inter_sf.txfm_rd_gate_level = boosted ? 0 : 4; sf->inter_sf.prune_inter_modes_if_skippable = 1; sf->lpf_sf.lpf_pick = LPF_PICK_FROM_FULL_IMAGE_NON_DUAL;