commit e2994a5c536d1af5533ec00e3a1f94600fc53696
author Yaowu Xu <yaowu@google.com> Tue Jan 23 14:37:51 2018 -0800
committer Yaowu Xu <yaowu@google.com> Wed Jan 24 01:20:33 2018 +0000
tree 0f473ddd222d68380041cfeb92cd0e1e488e8bd6
parent dd8600f5f7a32a0ea7e96b8cca7c1262b11af012

Add experiment aom_qm_ext and its dependency

Change-Id: I243e2a3cbae5b4eebe7fbabcb9f55552e9f13bd8

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 4f6b039..10d7dcf 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -107,6 +107,7 @@
 # AV1 experiment flags.
 set(CONFIG_AMVR 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_AOM_QM 1 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_AOM_QM_EXT 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_BGSPRITE 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_CFL 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_CICP 0 CACHE NUMBER "AV1 experiment flag.")

build/cmake/aom_experiment_deps.cmake

diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake
index 2b56fc1..e6204a7 100644
--- a/build/cmake/aom_experiment_deps.cmake
+++ b/build/cmake/aom_experiment_deps.cmake
@@ -137,6 +137,12 @@
       change_config_and_warn(CONFIG_LV_MAP 1 CONFIG_TXK_SEL)
     endif ()
   endif ()
+
+  if (CONFIG_AOM_QM_EXT)
+    if (NOT CONFIG_AOM_QM)
+      change_config_and_warn(CONFIG_AOM_QM 1 CONFIG_AOM_QM_EXT)
+    endif ()
+  endif ()
 endmacro ()
 
 endif ()  # AOM_BUILD_CMAKE_AOM_EXPERIMENT_DEPS_CMAKE_