Commit 4e884047 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Add the DAALA_TX experiment.

Change-Id: I408dbcf69b3f680e5de570e080ce39aeacbf618d
parent f5d71a69
......@@ -122,11 +122,12 @@ set(CONFIG_COMPOUND_SEGMENT 1 CACHE NUMBER "AV1 experiment flag.")
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.")
......
......@@ -164,6 +164,14 @@ if (CONFIG_VAR_TX_NO_TX_MODE AND NOT CONFIG_VAR_TX)
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)
......
......@@ -292,6 +292,7 @@ EXPERIMENT_LIST="
cfl
xiphrc
dct_only
daala_tx
daala_dct4
daala_dct8
daala_dct16
......@@ -568,6 +569,13 @@ post_process_cmdline() {
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
......
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