Sync configure/make and cmake on daala_tx

The two build systems treat inclusion of daala_tx related source file
differently, this commit makes them consistent.

This fixes unused object files warning in msvc build.

Change-Id: Ic7d098bcc580cb021706154ab35e0ec83b25394e

av1/av1.cmake

@@ -29,9 +29,6 @@ set(AOM_AV1_COMMON_SOURCES
     "${AOM_ROOT}/av1/common/common_data.h"
     "${AOM_ROOT}/av1/common/convolve.c"
     "${AOM_ROOT}/av1/common/convolve.h"
-    "${AOM_ROOT}/av1/common/daala_tx.c"
-    "${AOM_ROOT}/av1/common/daala_tx.h"
-    "${AOM_ROOT}/av1/common/daala_tx_kernels.h"
     "${AOM_ROOT}/av1/common/debugmodes.c"
     "${AOM_ROOT}/av1/common/entropy.c"
     "${AOM_ROOT}/av1/common/entropy.h"
@@ -76,6 +73,9 @@ set(AOM_AV1_COMMON_SOURCES
 if (CONFIG_DAALA_TX)
   set(AOM_AV1_COMMON_SOURCES
       ${AOM_AV1_COMMON_SOURCES}
+      "${AOM_ROOT}/av1/common/daala_tx.c"
+      "${AOM_ROOT}/av1/common/daala_tx.h"
+      "${AOM_ROOT}/av1/common/daala_tx_kernels.h"
       "${AOM_ROOT}/av1/common/daala_inv_txfm.c"
       "${AOM_ROOT}/av1/common/daala_inv_txfm.h")
 endif ()

av1/av1_common.mk

@@ -24,6 +24,7 @@ AV1_COMMON_SRCS-yes += common/frame_buffers.h
 AV1_COMMON_SRCS-yes += common/alloccommon.h
 AV1_COMMON_SRCS-yes += common/blockd.h
 AV1_COMMON_SRCS-yes += common/common.h
+ifeq ($(CONFIG_DAALA_TX),yes)
 AV1_COMMON_SRCS-yes += common/daala_tx.c
 AV1_COMMON_SRCS-yes += common/daala_tx.h
 AV1_COMMON_SRCS-yes += common/daala_tx_kernels.h
@@ -31,6 +32,7 @@ AV1_COMMON_SRCS-yes += common/daala_inv_txfm.c
 AV1_COMMON_SRCS-yes += common/daala_inv_txfm.h
 AV1_COMMON_SRCS-$(HAVE_AVX2) += common/x86/daala_tx_kernels.h
 AV1_COMMON_SRCS-$(HAVE_AVX2) += common/x86/daala_inv_txfm_avx2.c
+endif
 AV1_COMMON_SRCS-yes += common/entropy.h
 AV1_COMMON_SRCS-yes += common/entropymode.h
 AV1_COMMON_SRCS-yes += common/entropymv.h

av1/av1_cx.mk

@@ -31,8 +31,10 @@ AV1_CX_SRCS-yes += encoder/context_tree.c
 AV1_CX_SRCS-yes += encoder/context_tree.h
 AV1_CX_SRCS-yes += encoder/cost.h
 AV1_CX_SRCS-yes += encoder/cost.c
+ifeq ($(CONFIG_DAALA_TX),yes)
 AV1_CX_SRCS-yes += encoder/daala_fwd_txfm.c
 AV1_CX_SRCS-yes += encoder/daala_fwd_txfm.h
+endif
 AV1_CX_SRCS-yes += encoder/dct.c
 AV1_CX_SRCS-yes += encoder/hybrid_fwd_txfm.c
 AV1_CX_SRCS-yes += encoder/hybrid_fwd_txfm.h

build/cmake/aom_config_defaults.cmake

@@ -116,7 +116,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 1 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_DAALA_TX_DST32 0 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.")

build/cmake/aom_experiment_deps.cmake

@@ -39,6 +39,7 @@ macro (fix_experiment_configs)
   endif ()
 
   if (CONFIG_DAALA_TX)
+     set(CONFIG_DAALA_TX_DST32 1)
      set(CONFIG_DAALA_TX4 1)
      set(CONFIG_DAALA_TX8 1)
      set(CONFIG_DAALA_TX16 1)
@@ -46,6 +47,15 @@ macro (fix_experiment_configs)
      set(CONFIG_DAALA_TX64 1)
   endif ()
 
+  if (NOT CONFIG_DAALA_TX)
+     set(CONFIG_DAALA_TX_DST32 0)
+     set(CONFIG_DAALA_TX4 0)
+     set(CONFIG_DAALA_TX8 0)
+     set(CONFIG_DAALA_TX16 0)
+     set(CONFIG_DAALA_TX32 0)
+     set(CONFIG_DAALA_TX64 0)
+  endif ()
+
   if (CONFIG_DAALA_TX_DST8)
     if (NOT CONFIG_DAALA_TX8)
       set(CONFIG_DAALA_TX_DST8 0)

configure

@@ -548,14 +548,19 @@ post_process_cmdline() {
     enabled striped_loop_restoration && enable_feature loop_restoration
     enabled loopfiltering_across_tiles_ext && enable_feature loopfiltering_across_tiles
 
-    soft_enable daala_tx_dst32
-
     if enabled daala_tx; then
+      soft_enable daala_tx_dst32
       enable_feature daala_tx4
       enable_feature daala_tx8
       enable_feature daala_tx16
       enable_feature daala_tx32
       enable_feature daala_tx64
+    else
+      disable_feature daala_tx4
+      disable_feature daala_tx8
+      disable_feature daala_tx16
+      disable_feature daala_tx32
+      disable_feature daala_tx64
     fi
     if enabled daala_tx64 && ! enabled tx64x64; then
       log_echo "daala_tx64 requires tx64x64, so disabling daala_tx64"