remove CONFIG_SHARP_SETTINGS this left over experiment flag is almost a noop; it controls the default for intrabc, but that setting doesn't respond to the value of sharpness so it's a bit inconsistent. intrabc also requires screen content tools to be enabled, which are not by default. Bug: aomedia:3228 Change-Id: Ib26d96c42b8774ce1b16195a806b5021bcc680d2
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index 9a2b985..380a55e 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -302,13 +302,13 @@ 1, // enable smooth intra modes usage for sequence 1, // enable Paeth intra mode usage for sequence 1, // enable CFL uv intra mode usage for sequence - 1, // enable directional intra mode usage for sequence - 1, // enable D45 to D203 intra mode usage for sequence - 1, // superres - 1, // enable overlay - 1, // enable palette - !CONFIG_SHARP_SETTINGS, // enable intrabc - 1, // enable angle delta + 1, // enable directional intra mode usage for sequence + 1, // enable D45 to D203 intra mode usage for sequence + 1, // superres + 1, // enable overlay + 1, // enable palette + 1, // enable intrabc + 1, // enable angle delta #if CONFIG_DENOISE 0, // noise_level 32, // noise_block_size @@ -450,27 +450,27 @@ 1, // enable smooth intra modes usage for sequence 1, // enable Paeth intra mode usage for sequence 1, // enable CFL uv intra mode usage for sequence - 1, // enable directional intra mode usage for sequence - 1, // enable D45 to D203 intra mode usage for sequence - 1, // superres - 1, // enable overlay - 1, // enable palette - !CONFIG_SHARP_SETTINGS, // enable intrabc - 1, // enable angle delta + 1, // enable directional intra mode usage for sequence + 1, // enable D45 to D203 intra mode usage for sequence + 1, // superres + 1, // enable overlay + 1, // enable palette + 1, // enable intrabc + 1, // enable angle delta #if CONFIG_DENOISE - 0, // noise_level - 32, // noise_block_size - 1, // enable_dnl_denoising + 0, // noise_level + 32, // noise_block_size + 1, // enable_dnl_denoising #endif - 0, // chroma_subsampling_x - 0, // chroma_subsampling_y - 0, // reduced_tx_type_set - 0, // use_intra_dct_only - 0, // use_inter_dct_only - 0, // use_intra_default_tx_only - 1, // enable_tx_size_search - 0, // quant_b_adapt - 0, // vbr_corpus_complexity_lap + 0, // chroma_subsampling_x + 0, // chroma_subsampling_y + 0, // reduced_tx_type_set + 0, // use_intra_dct_only + 0, // use_inter_dct_only + 0, // use_intra_default_tx_only + 1, // enable_tx_size_search + 0, // quant_b_adapt + 0, // vbr_corpus_complexity_lap { SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX, SEQ_LEVEL_MAX,
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 0ae5885..4c39a3a 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -137,7 +137,6 @@ set_aom_config_var(CONFIG_RD_DEBUG 0 "AV1 experiment.") set_aom_config_var(CONFIG_RD_COMMAND 0 "AV1 experiment: Use external rdmult and q_index.") -set_aom_config_var(CONFIG_SHARP_SETTINGS 0 "AV1 experiment.") set_aom_config_var( CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 1 "AV1 experiment: Disable full_pixel_motion_search_based_split on BLOCK_8X8.")