Commit 72e0f783 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Disable daala_dct64 if tx64x64 is not enabled.

Change-Id: Ib19d9431124b2416abe4a217138ec8bdb029f73c
parent 71b0513b
...@@ -164,10 +164,9 @@ if (CONFIG_VAR_TX_NO_TX_MODE AND NOT CONFIG_VAR_TX) ...@@ -164,10 +164,9 @@ 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) change_config_and_warn(CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE)
endif() endif()
if (CONFIG_DAALA_DCT64) if (CONFIG_DAALA_DCT64 AND NOT CONFIG_TX64X64)
if (NOT CONFIG_TX64X64) message(WARNING "--- CONFIG_DAALA_DCT64 requires CONFIG_TX64X64, disabling.")
change_config_and_warn(CONFIG_TX64X64 1 CONFIG_DAALA_DCT64) set(CONFIG_DAALA_DCT64 0)
endif()
endif() endif()
if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR
......
...@@ -568,8 +568,9 @@ post_process_cmdline() { ...@@ -568,8 +568,9 @@ post_process_cmdline() {
log_echo "rawbits requires not ans, so disabling rawbits" log_echo "rawbits requires not ans, so disabling rawbits"
disable_feature rawbits disable_feature rawbits
fi fi
if enabled daala_dct64; then if enabled daala_dct64 && ! enabled tx64x64; then
enable_feature tx64x64 log_echo "daala_dct64 requires tx64x64, so disabling daala_dct64"
disable_feature daala_dct64
fi fi
if enabled daala_dct4 || if enabled daala_dct4 ||
enabled daala_dct8 || enabled daala_dct8 ||
......
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