Delete daala-dist and cdef-dist experiments in configure Since those two experiments have been merged into the dist-8x8 experiment and can be turned on by 'aomenc' ccommand line option, "--tune=[daala-dist|cdef-dist]". Change-Id: If21542a6868147538f5c3be6ad49368579db4b53
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 1d8297b..3a45737 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -116,7 +116,6 @@ set(CONFIG_CFL 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_CHROMA_2X2 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_CHROMA_SUB8X8 1 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_CDEF_DIST 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COEF_INTERLEAVE 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COLORSPACE_HEADERS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COMPOUND_ROUND 0 CACHE NUMBER "AV1 experiment flag.") @@ -129,7 +128,6 @@ set(CONFIG_DAALA_DCT4 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DAALA_DCT64 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DAALA_DCT8 0 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_DAALA_DIST 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DCT_ONLY 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DELTA_Q 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_DEPENDENT_HORZTILES 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure index b2faff6..0fd09e3 100755 --- a/configure +++ b/configure
@@ -317,8 +317,6 @@ masked_tx dependent_horztiles dist_8x8 - daala_dist - cdef_dist tripred palette_throughput ref_adapt @@ -538,8 +536,6 @@ soft_enable tempmv_signaling # Fix up experiment dependencies - enabled daala_dist && enable_feature dist_8x8 - enabled cdef_dist && enable_feature dist_8x8 enabled pvq && disable_feature chroma_2x2 enabled pvq && disable_feature rect_tx enabled pvq && disable_feature ext_tx