diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index df67ed9a3669a7d2be7817677d0588368f92ee63..332ca907b5cbdca68f5487c898d0a249b87d87d7 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake @@ -190,7 +190,7 @@ set(CONFIG_SEGMENT_GLOBALMV 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SHORT_FILTER 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SMOOTH_HV 1 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_STRIPED_LOOP_RESTORATION 0 CACHE NUMBER "AV1 experiment flag.") +set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TEMPMV_SIGNALING 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TMV 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TPL_MV 0 CACHE NUMBER "AV1 experiment flag.") diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake index 36d7a53648461624eed08cb125955b48da8c019c..00fe45d6e1fdbe4121387938d386f986ecc89588 100644 --- a/build/cmake/aom_experiment_deps.cmake +++ b/build/cmake/aom_experiment_deps.cmake @@ -124,13 +124,6 @@ macro (fix_experiment_configs) endif () endif () - if (CONFIG_STRIPED_LOOP_RESTORATION) - if (NOT CONFIG_LOOP_RESTORATION) - change_config_and_warn(CONFIG_LOOP_RESTORATION 1 - CONFIG_STRIPED_LOOP_RESTORATION) - endif () - endif () - if (CONFIG_TXK_SEL) if (NOT CONFIG_LV_MAP) change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_TXK_SEL) diff --git a/configure b/configure index 93492fbe3087d7a6571977d1ca47bb8ad24a0cec..ce541ab4bd827ff5154e0cf54973701ac4b93472 100755 --- a/configure +++ b/configure @@ -526,6 +526,7 @@ post_process_cmdline() { soft_enable deblock_13tap soft_enable frame_marker soft_enable kf_ctx + soft_enable striped_loop_restoration fi # Enable low-bitdepth pixel pipeline by default @@ -554,6 +555,7 @@ post_process_cmdline() { enabled horzonly_frame_superres && enable_feature frame_superres enabled loopfilter_level && enable_feature parallel_deblocking enabled loopfilter_level && enable_feature ext_delta_q + enabled striped_loop_restoration && enable_feature loop_restoration if enabled rawbits && enabled ans; then log_echo "rawbits requires not ans, so disabling rawbits" @@ -593,17 +595,6 @@ post_process_cmdline() { log_echo "amvr requires hash_me" enable_feature hash_me fi - - if enabled striped_loop_restoration && ! enabled loop_restoration ; then - log_echo "striped_loop_restoration requires loop_restoration" - log_echo "enable loop_restoration" - enable_feature loop_restoration - fi - if enabled striped_loop_restoration && enabled frame_superres ; then - log_echo "striped_loop_restoration not compatible with frame_superres" - log_echo "disabling striped_loop_restoration" - disable_feature striped_loop_restoration - fi if enabled lpf_sb; then log_echo "lpf_sb can't work with loopfilter_level yet." log_echo "disabling loopfilter_level"