Commit 1c4c5d2e authored by Johann's avatar Johann Committed by Johann Koenig

Remove --disable-adopted-experiments option

Change-Id: Ice048df7c909ea09bcafcddc695fc30410345726
parent b2bf48d5
......@@ -17,7 +17,6 @@ if (NOT EMSCRIPTEN)
endif ()
endif ()
option(ENABLE_ADOPTED_EXPERIMENTS "Enable adopted experiments." ON)
option(ENABLE_CCACHE "Enable ccache support." OFF)
option(ENABLE_DISTCC "Enable distcc support." OFF)
option(ENABLE_DOCS "Enable documentation generation (doxygen required)." ON)
......
......@@ -47,24 +47,6 @@ foreach (var ${cmake_cache_vars})
endif ()
endforeach ()
# Adopted experiments get enabled by default. For debugging, make it possible to
# to turn them all off with a single option.
if (NOT ENABLE_ADOPTED_EXPERIMENTS)
get_cmake_property(cmake_cache_vars CACHE_VARIABLES)
unset(var)
foreach (var ${cmake_cache_vars})
unset(var_helpstring)
get_property(var_helpstring CACHE ${var} PROPERTY HELPSTRING)
if ("${var_helpstring}" STREQUAL "AV1 experiment flag.")
if ("${var}" MATCHES "CONFIG_TMV")
# TMV are required for configure compatibility.
else ()
set(${var} 0)
endif ()
endif ()
endforeach ()
endif ()
# Detect target CPU.
if (NOT AOM_TARGET_CPU)
if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR
......
......@@ -430,7 +430,6 @@ CMDLINE_SELECT="
symbolrate
lowbitdepth
experimental
adopted_experiments
colorspace_headers
"
......@@ -477,9 +476,7 @@ post_process_cmdline() {
enabled ${c} && enable_feature ${c##*_}s
done
# Enable adopted experiments by default
soft_enable adopted_experiments
if enabled adopted_experiments; then
# Adopted
soft_enable ext_intra
soft_enable intra_edge
soft_enable mv_compress
......@@ -518,7 +515,6 @@ post_process_cmdline() {
soft_enable ext_skip
soft_enable ext_warped_motion
soft_enable horzonly_frame_superres
fi
# Enable low-bitdepth pixel pipeline by default
soft_enable lowbitdepth
......
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