Commit e5cfa6f7 authored by Cheng Chen's avatar Cheng Chen

Change config dependency of loopfilter_level

Loopfilter_level depends on var_tx and parallel_deblocking.
Change configue to ensure dependency.

Change-Id: I11e3c8ddf7910fbb7252a5f8dbc49f24ad079841
parent 14e1b74e
......@@ -103,6 +103,21 @@ macro (fix_experiment_configs)
endif ()
endif ()
if (CONFIG_LOOPFILTER_LEVEL)
if (NOT CONFIG_EXT_DELTA_Q)
change_config_and_warn(CONFIG_EXT_DELTA_Q 1 CONFIG_LOOPFILTER_LEVEL)
endif ()
if (NOT CONFIG_PARALLEL_DEBLOCKING)
change_config_and_warn(CONFIG_PARALLEL_DEBLOCKING 1 CONFIG_LOOPFILTER_LEVEL)
endif ()
endif ()
if (CONFIG_LPF_SB)
if (CONFIG_LOOPFILTER_LEVEL)
change_config_and_warn(CONFIG_LOOPFILTER_LEVEL 0 CONFIG_LPF_SB)
endif ()
endif ()
if (CONFIG_MFMV)
if (NOT CONFIG_FRAME_MARKER)
change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_MFMV)
......@@ -121,12 +136,6 @@ macro (fix_experiment_configs)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_TXK_SEL)
endif ()
endif ()
if (CONFIG_LPF_SB)
if (CONFIG_LOOPFILTER_LEVEL)
change_config_and_warn(CONFIG_LOOPFILTER_LEVEL 0 CONFIG_FRAME_SIGN_BIAS)
endif ()
endif ()
endmacro ()
endif () # AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_
......@@ -569,6 +569,8 @@ post_process_cmdline() {
enabled ext_skip && enable_feature frame_marker
enabled horzonly_frame_superres && enable_feature frame_superres
enabled ext_warped_motion && enable_feature warped_motion
enabled loopfilter_level && enable_feature parallel_deblocking
enabled loopfilter_level && enable_feature ext_delta_q
if enabled rawbits && enabled ans; then
log_echo "rawbits requires not ans, so disabling rawbits"
......
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