commit 7e7c185caeb02927eca412547d5076ff5592b55b
author Jerome Jiang <jianj@google.com> Wed Sep 18 12:49:40 2019 -0700
committer Jerome Jiang <jianj@google.com> Thu Sep 19 17:16:48 2019 +0000
tree c9e9a77b2c95a2a925d4a0f7c055d02a221315cc
parent bbc5ec275b06f322bc70c49739b79c635e8e3feb

Force HBD flag when FORCE_HIGHBITDEPTH_DECODING is set.

BUG=b/139764277,aomedia:2500,aomedia:2501,aomedia:2502

Change-Id: I88280c671d0681c9ba4575f5271ac3b2cc80d1ed

build/cmake/aom_configure.cmake

diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 30d95e7..635b57a 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -30,6 +30,11 @@
   set(FORCE_HIGHBITDEPTH_DECODING 1 CACHE NUMBER "${cmake_cmdline_helpstring}")
 endif()
 
+if(FORCE_HIGHBITDEPTH_DECODING AND NOT CONFIG_AV1_HIGHBITDEPTH)
+  change_config_and_warn(CONFIG_AV1_HIGHBITDEPTH 1
+                         "FORCE_HIGHBITDEPTH_DECODING")
+endif()
+
 # Generate the user config settings.
 list(APPEND aom_build_vars ${AOM_CONFIG_VARS} ${AOM_OPTION_VARS})
 foreach(cache_var ${aom_build_vars})