commit 4e884047d06eed5ac16674a32abc83bc2e836f5a
author Nathan E. Egge <negge@mozilla.com> Wed Sep 13 12:05:29 2017 -0400
committer Nathan Egge <negge@mozilla.com> Fri Sep 15 23:58:03 2017 +0000
tree ddc466be6c63eaa41dc27a9e96dbe10150471fda
parent f5d71a696d99a1995cebe80a7f7eff457ace4bd2

Add the DAALA_TX experiment.

Change-Id: I408dbcf69b3f680e5de570e080ce39aeacbf618d

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 4ea94e9..42d2870 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -122,11 +122,12 @@
 set(CONFIG_COMPOUND_SINGLEREF 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_CONVOLVE_ROUND 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_CDEF 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_DAALA_TX 0 CACHE NUMBER "Internal flag.")
+set(CONFIG_DAALA_DCT4 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_DAALA_DCT8 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DAALA_DCT16 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_DAALA_DCT32 0 CACHE NUMBER "AV1 experiment flag.")
-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_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.")

build/cmake/aom_configure.cmake

diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 69602a5..148899f 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -164,6 +164,14 @@
    change_config_and_warn(CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE)
 endif()
 
+if (CONFIG_DAALA_TX)
+   set(CONFIG_DAALA_DCT4 1)
+   set(CONFIG_DAALA_DCT8 1)
+   set(CONFIG_DAALA_DCT16 1)
+   set(CONFIG_DAALA_DCT32 1)
+   set(CONFIG_DAALA_DCT64 1)
+endif()
+
 if (CONFIG_DAALA_DCT64 AND NOT CONFIG_TX64X64)
    message(WARNING "--- CONFIG_DAALA_DCT64 requires CONFIG_TX64X64, disabling.")
    set(CONFIG_DAALA_DCT64 0)

configure

diff --git a/configure b/configure
index abe31b8..5039624 100755
--- a/configure
+++ b/configure
@@ -292,6 +292,7 @@
     cfl
     xiphrc
     dct_only
+    daala_tx
     daala_dct4
     daala_dct8
     daala_dct16
@@ -568,6 +569,13 @@
       log_echo "rawbits requires not ans, so disabling rawbits"
       disable_feature rawbits
     fi
+    if enabled daala_tx; then
+      enable_feature daala_dct4
+      enable_feature daala_dct8
+      enable_feature daala_dct16
+      enable_feature daala_dct32
+      enable_feature daala_dct64
+    fi
     if enabled daala_dct64 && ! enabled tx64x64; then
       log_echo "daala_dct64 requires tx64x64, so disabling daala_dct64"
       disable_feature daala_dct64