Commit d78f64b9 authored by Tom Finegan's avatar Tom Finegan

Organize CMake experiment deps control.

Alpha sort the experiment dep checks.

Change-Id: Ic55628db67c57fdb53a6b92f2d5b42eed6528fcf
parent ba6d84c0
......@@ -14,14 +14,28 @@ 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_AMVR)
if (NOT CONFIG_HASH_ME)
change_config_and_warn(CONFIG_HASH_ME 1 CONFIG_AMVR)
endif ()
endif ()
if (CONFIG_ANALYZER)
if (NOT CONFIG_INSPECTION)
change_config_and_warn(CONFIG_INSPECTION 1 CONFIG_ANALYZER)
endif ()
endif ()
if (CONFIG_VAR_TX_NO_TX_MODE AND NOT CONFIG_VAR_TX)
change_config_and_warn(CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE)
if (CONFIG_CTX1D)
if (NOT CONFIG_EXT_TX)
change_config_and_warn(CONFIG_EXT_TX 1 CONFIG_CTX1D)
endif ()
if (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_CTX1D)
endif ()
if (CONFIG_PVQ)
change_config_and_warn(CONFIG_PVQ 0 CONFIG_CTX1D)
endif ()
endif ()
if (CONFIG_DAALA_TX)
......@@ -41,15 +55,15 @@ macro (fix_experiment_configs)
if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR
CONFIG_DAALA_DCT32 OR CONFIG_DAALA_DCT64)
if (CONFIG_TXMG)
change_config_and_warn(CONFIG_TXMG 0 CONFIG_DAALA_DCTx)
endif ()
if (CONFIG_LGT)
change_config_and_warn(CONFIG_LGT 0 CONFIG_DAALA_DCTx)
endif ()
if (NOT CONFIG_LOWBITDEPTH)
change_config_and_warn(CONFIG_LOWBITDEPTH 1 CONFIG_DAALA_DCTx)
endif ()
if (CONFIG_TXMG)
change_config_and_warn(CONFIG_TXMG 0 CONFIG_DAALA_DCTx)
endif ()
endif ()
if (CONFIG_EXT_PARTITION_TYPES)
......@@ -64,26 +78,22 @@ macro (fix_experiment_configs)
endif ()
endif ()
if (CONFIG_TXK_SEL)
if (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_TXK_SEL)
if (CONFIG_FRAME_SIGN_BIAS)
if (NOT CONFIG_FRAME_MARKER)
change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_FRAME_SIGN_BIAS)
endif ()
endif ()
if (CONFIG_CTX1D)
if (NOT CONFIG_LV_MAP)
change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_CTX1D)
endif ()
if (NOT CONFIG_EXT_TX)
change_config_and_warn(CONFIG_EXT_TX 1 CONFIG_CTX1D)
if (CONFIG_HORZONLY_FRAME_SUPERRES)
if (NOT CONFIG_FRAME_SUPERRES)
change_config_and_warn(CONFIG_FRAME_SUPERRES 1
CONFIG_HORZONLY_FRAME_SUPERRES)
endif ()
endif ()
if (CONFIG_STRIPED_LOOP_RESTORATION)
if (NOT CONFIG_LOOP_RESTORATION)
change_config_and_warn(CONFIG_LOOP_RESTORATION 1
CONFIG_STRIPED_LOOP_RESTORATION)
if (CONFIG_JNT_COMP)
if (NOT CONFIG_FRAME_MARKER)
change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_JNT_COMP)
endif ()
endif ()
......@@ -100,22 +110,6 @@ macro (fix_experiment_configs)
endif ()
endif ()
if (CONFIG_JNT_COMP)
if (NOT CONFIG_FRAME_MARKER)
change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_JNT_COMP)
endif ()
endif ()
if (CONFIG_FRAME_SIGN_BIAS)
if (NOT CONFIG_FRAME_MARKER)
change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_FRAME_SIGN_BIAS)
endif ()
endif ()
if (CONFIG_AMVR)
change_config_and_warn(CONFIG_HASH_ME 1 CONFIG_AMVR)
endif ()
if (CONFIG_PVQ)
if (CONFIG_EXT_TX)
change_config_and_warn(CONFIG_EXT_TX 0 CONFIG_PVQ)
......@@ -126,11 +120,27 @@ macro (fix_experiment_configs)
if (CONFIG_VAR_TX)
change_config_and_warn(CONFIG_VAR_TX 0 CONFIG_PVQ)
endif ()
if (CONFIG_VAR_TX_NO_TX_MODE)
change_config_and_warn(CONFIG_VAR_TX_NO_TX_MODE 0 CONFIG_PVQ)
endif ()
endif ()
if (CONFIG_HORZONLY_FRAME_SUPERRES)
if (NOT CONFIG_FRAME_SUPERRES)
change_config_and_warn(CONFIG_FRAME_SUPERRES 1 CONFIG_HORZONLY_FRAME_SUPERRES)
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)
endif ()
endif ()
if (CONFIG_VAR_TX_NO_TX_MODE)
if (NOT_CONFIG_VAR_TX)
change_config_and_warn(CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE)
endif ()
endif ()
endmacro ()
......
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