Commit b122e017 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

daala_tx: Fix default daala_tx_dstN compile flags.

Correctly set the daala_tx_dst8 and daala_tx_dst32 experiment flags in
 both the configure and cmake build systems.
By default daala_tx_dst8 is disabled and daala_tx_dst32 is enabled.

Change-Id: I6c344f40d6603fd766403d915d6689d6c9650257
parent a14de5b3
......@@ -120,7 +120,7 @@ set(CONFIG_DAALA_TX32 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX4 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX64 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX8 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX_DST32 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX_DST32 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DAALA_TX_DST8 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DCT_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DEBLOCK_13TAP 1 CACHE NUMBER "AV1 experiment flag.")
......
......@@ -51,7 +51,6 @@ macro (fix_experiment_configs)
set(CONFIG_DAALA_TX16 1)
set(CONFIG_DAALA_TX32 1)
set(CONFIG_DAALA_TX64 1)
set(CONFIG_DAALA_TX_DST32 1)
endif ()
if (CONFIG_DAALA_TX_DST8)
......
......@@ -553,6 +553,8 @@ post_process_cmdline() {
enabled striped_loop_restoration && enable_feature loop_restoration
enabled adapt_scan && enable_feature lv_map
soft_enable daala_tx_dst32
if enabled daala_tx; then
enable_feature highbitdepth
enable_feature daala_tx4
......@@ -560,7 +562,6 @@ post_process_cmdline() {
enable_feature daala_tx16
enable_feature daala_tx32
enable_feature daala_tx64
! disabled daala_tx_dst32 && enable_feature daala_tx_dst32
fi
if enabled daala_tx64 && ! enabled tx64x64; then
log_echo "daala_tx64 requires tx64x64, so disabling daala_tx64"
......
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