Commit 0e4a9a75 authored by Jingning Han's avatar Jingning Han

Set adapt-scan dependency on lv-map

This makes it easier to maintain and test the coding performance of
adaptive scan order.

BUG=aomedia:1073

Change-Id: I982dd1c5c3b38691584b5ef98326fc342b3f2697
parent 1db5a9ce
......@@ -14,6 +14,12 @@ set(AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_ 1)
# Adjusts CONFIG_* CMake variables to address conflicts between active AV1
# experiments.
macro (fix_experiment_configs)
if (CONFIG_ADAPT_SCAN)
if (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_ADAPT_SCAN)
endif()
endif()
if (CONFIG_AMVR)
if (NOT CONFIG_HASH_ME)
change_config_and_warn(CONFIG_HASH_ME 1 CONFIG_AMVR)
......
......@@ -550,6 +550,7 @@ post_process_cmdline() {
enabled loopfilter_level && enable_feature parallel_deblocking
enabled loopfilter_level && enable_feature ext_delta_q
enabled striped_loop_restoration && enable_feature loop_restoration
enabled adapt_scan && enable_feature lv_map
if enabled daala_tx; then
enable_feature highbitdepth
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment