Remove --disable-adopted-experiments option
Change-Id: Ice048df7c909ea09bcafcddc695fc30410345726
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c10e33c..81f23ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@
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)
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 8048491..2e07726 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -47,24 +47,6 @@
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
diff --git a/configure b/configure
index 83ede83..cb2b4ea 100755
--- a/configure
+++ b/configure
@@ -430,7 +430,6 @@
symbolrate
lowbitdepth
experimental
- adopted_experiments
colorspace_headers
"
@@ -477,48 +476,45 @@
enabled ${c} && enable_feature ${c##*_}s
done
- # Enable adopted experiments by default
- soft_enable adopted_experiments
- if enabled adopted_experiments; then
- soft_enable ext_intra
- soft_enable intra_edge
- soft_enable mv_compress
- soft_enable dual_filter
- soft_enable aom_qm
- soft_enable dist_8x8
- soft_enable loop_restoration
- soft_enable ext_partition
- soft_enable ext_partition_types
+ # Adopted
+ soft_enable ext_intra
+ soft_enable intra_edge
+ soft_enable mv_compress
+ soft_enable dual_filter
+ soft_enable aom_qm
+ soft_enable dist_8x8
+ soft_enable loop_restoration
+ soft_enable ext_partition
+ soft_enable ext_partition_types
- # Provisional adopted
- soft_enable reference_buffer
- soft_enable loopfiltering_across_tiles
- soft_enable palette_throughput
- soft_enable tempmv_signaling
- soft_enable ext_comp_refs
- soft_enable ext_delta_q
- soft_enable parallel_deblocking
- soft_enable obu
- soft_enable loopfilter_level
- soft_enable cfl
- soft_enable deblock_13tap
- soft_enable max_tile
- soft_enable frame_marker
- soft_enable kf_ctx
- soft_enable striped_loop_restoration
- soft_enable ext_intra_mod
- soft_enable frame_size
- soft_enable segment_globalmv
- soft_enable short_filter
- soft_enable simplify_tx_mode
- soft_enable tx64x64
- soft_enable rect_tx_ext
- soft_enable rect_tx_ext_intra
- soft_enable filter_intra
- soft_enable ext_skip
- soft_enable ext_warped_motion
- soft_enable horzonly_frame_superres
- fi
+ # Provisional adopted
+ soft_enable reference_buffer
+ soft_enable loopfiltering_across_tiles
+ soft_enable palette_throughput
+ soft_enable tempmv_signaling
+ soft_enable ext_comp_refs
+ soft_enable ext_delta_q
+ soft_enable parallel_deblocking
+ soft_enable obu
+ soft_enable loopfilter_level
+ soft_enable cfl
+ soft_enable deblock_13tap
+ soft_enable max_tile
+ soft_enable frame_marker
+ soft_enable kf_ctx
+ soft_enable striped_loop_restoration
+ soft_enable ext_intra_mod
+ soft_enable frame_size
+ soft_enable segment_globalmv
+ soft_enable short_filter
+ soft_enable simplify_tx_mode
+ soft_enable tx64x64
+ soft_enable rect_tx_ext
+ soft_enable rect_tx_ext_intra
+ soft_enable filter_intra
+ soft_enable ext_skip
+ soft_enable ext_warped_motion
+ soft_enable horzonly_frame_superres
# Enable low-bitdepth pixel pipeline by default
soft_enable lowbitdepth
