Add hbd sources to lists only when hbd is enabled.
Instead of removing high bit depth sources when CONFIG_AV1_HIGHBITDEPTH
is disabled, add them only when CONFIG_AV1_HIGHBITDEPTH is enabled.
Change-Id: Ibdc25197de8ab1bb2c389f230d02734d9f3d1c4e
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index f9ee9b5..4da5127 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -65,9 +65,7 @@
"${AOM_ROOT}/aom_dsp/x86/convolve.h"
"${AOM_ROOT}/aom_dsp/x86/convolve_sse2.h"
"${AOM_ROOT}/aom_dsp/x86/fft_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/highbd_intrapred_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/intrapred_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/intrapred_x86.h"
"${AOM_ROOT}/aom_dsp/x86/loopfilter_sse2.c"
@@ -78,10 +76,10 @@
"${AOM_ROOT}/aom_dsp/x86/sum_squares_sse2.h"
"${AOM_ROOT}/aom_dsp/x86/bitdepth_conversion_sse2.h")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_DSP_COMMON_INTRIN_SSE2
- "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_sse2.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_DSP_COMMON_INTRIN_SSE2
+ "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_sse2.c"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_sse2.c")
endif()
list(APPEND AOM_DSP_COMMON_ASM_SSSE3
@@ -91,12 +89,11 @@
list(APPEND AOM_DSP_COMMON_INTRIN_SSSE3
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/convolve_ssse3.h"
- "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/intrapred_ssse3.c")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_DSP_COMMON_INTRIN_SSSE3
- "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_ssse3.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_DSP_COMMON_INTRIN_SSSE3
+ "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_ssse3.c")
endif()
list(APPEND AOM_DSP_COMMON_INTRIN_SSE4_1
@@ -114,16 +111,14 @@
"${AOM_ROOT}/aom_dsp/x86/txfm_common_avx2.h"
"${AOM_ROOT}/aom_dsp/x86/convolve_avx2.h"
"${AOM_ROOT}/aom_dsp/x86/fft_avx2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_avx2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/intrapred_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/bitdepth_conversion_avx2.h")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_DSP_COMMON_INTRIN_AVX2
- "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_avx2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_avx2.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_DSP_COMMON_INTRIN_AVX2
+ "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_avx2.c"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_avx2.c")
endif()
list(APPEND AOM_DSP_COMMON_INTRIN_NEON
@@ -201,12 +196,7 @@
"${AOM_ROOT}/aom_dsp/variance.c"
"${AOM_ROOT}/aom_dsp/variance.h")
- list(APPEND AOM_DSP_ENCODER_ASM_SSE2
- "${AOM_ROOT}/aom_dsp/x86/highbd_sad4d_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/highbd_sad_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_impl_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/sad4d_sse2.asm"
+ list(APPEND AOM_DSP_ENCODER_ASM_SSE2 "${AOM_ROOT}/aom_dsp/x86/sad4d_sse2.asm"
"${AOM_ROOT}/aom_dsp/x86/sad_sse2.asm"
"${AOM_ROOT}/aom_dsp/x86/subpel_variance_sse2.asm"
"${AOM_ROOT}/aom_dsp/x86/subtract_sse2.asm")
@@ -219,28 +209,23 @@
"${AOM_ROOT}/aom_dsp/x86/fwd_txfm_impl_sse2.h"
"${AOM_ROOT}/aom_dsp/x86/fwd_txfm_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/fwd_txfm_sse2.h"
- "${AOM_ROOT}/aom_dsp/x86/highbd_quantize_intrin_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_subtract_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/quantize_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/adaptive_quantize_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_adaptive_quantize_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/quantize_x86.h"
"${AOM_ROOT}/aom_dsp/x86/blk_sse_sum_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/sum_squares_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/variance_sse2.c")
- if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(
- REMOVE_ITEM AOM_DSP_ENCODER_ASM_SSE2
- "${AOM_ROOT}/aom_dsp/x86/highbd_sad4d_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/highbd_sad_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm"
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_impl_sse2.asm")
- list(REMOVE_ITEM AOM_DSP_ENCODER_INTRIN_SSE2
- "${AOM_ROOT}/aom_dsp/x86/highbd_adaptive_quantize_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_quantize_intrin_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_subtract_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse2.c")
+ if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_DSP_ENCODER_ASM_SSE2
+ "${AOM_ROOT}/aom_dsp/x86/highbd_sad4d_sse2.asm"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_sad_sse2.asm"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_variance_impl_sse2.asm")
+ list(APPEND AOM_DSP_ENCODER_INTRIN_SSE2
+ "${AOM_ROOT}/aom_dsp/x86/highbd_adaptive_quantize_sse2.c"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_quantize_intrin_sse2.c"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_subtract_sse2.c"
+ "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse2.c")
endif()
list(APPEND AOM_DSP_ENCODER_ASM_SSSE3_X86_64
@@ -259,16 +244,15 @@
"${AOM_ROOT}/aom_dsp/x86/highbd_sad_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/sad_impl_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/variance_avx2.c"
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/sse_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/variance_impl_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_sad_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_variance_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/blk_sse_sum_avx2.c"
"${AOM_ROOT}/aom_dsp/x86/sum_squares_avx2.c")
- if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_DSP_ENCODER_INTRIN_AVX2
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_avx2.c")
+ if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_DSP_ENCODER_INTRIN_AVX2
+ "${AOM_ROOT}/aom_dsp/x86/highbd_variance_avx2.c")
endif()
if(CONFIG_REALTIME_ONLY)
@@ -291,15 +275,13 @@
"${AOM_ROOT}/aom_dsp/x86/jnt_variance_ssse3.c"
"${AOM_ROOT}/aom_dsp/x86/jnt_sad_ssse3.c")
- list(APPEND AOM_DSP_ENCODER_INTRIN_SSE4_1
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse4.c"
- "${AOM_ROOT}/aom_dsp/x86/sse_sse4.c"
+ list(APPEND AOM_DSP_ENCODER_INTRIN_SSE4_1 "${AOM_ROOT}/aom_dsp/x86/sse_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_sad_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_variance_sse4.c")
- if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_DSP_ENCODER_INTRIN_SSE4_1
- "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse4.c")
+ if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_DSP_ENCODER_INTRIN_SSE4_1
+ "${AOM_ROOT}/aom_dsp/x86/highbd_variance_sse4.c")
endif()
if(CONFIG_REALTIME_ONLY)
diff --git a/av1/av1.cmake b/av1/av1.cmake
index 1886083..5630d23 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -312,17 +312,14 @@
"${AOM_ROOT}/av1/common/x86/av1_inv_txfm_ssse3.c"
"${AOM_ROOT}/av1/common/x86/av1_inv_txfm_ssse3.h"
"${AOM_ROOT}/av1/common/x86/cfl_ssse3.c"
- "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_ssse3.c"
- "${AOM_ROOT}/av1/common/x86/highbd_wiener_convolve_ssse3.c"
"${AOM_ROOT}/av1/common/x86/jnt_convolve_ssse3.c"
- "${AOM_ROOT}/av1/common/x86/reconinter_ssse3.c"
"${AOM_ROOT}/av1/common/x86/resize_ssse3.c")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_AV1_COMMON_INTRIN_SSSE3
- "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_ssse3.c"
- "${AOM_ROOT}/av1/common/x86/highbd_wiener_convolve_ssse3.c"
- "${AOM_ROOT}/av1/common/x86/reconinter_ssse3.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_AV1_COMMON_INTRIN_SSSE3
+ "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_ssse3.c"
+ "${AOM_ROOT}/av1/common/x86/highbd_wiener_convolve_ssse3.c"
+ "${AOM_ROOT}/av1/common/x86/reconinter_ssse3.c")
endif()
list(APPEND AOM_AV1_COMMON_INTRIN_SSE4_1
@@ -332,20 +329,17 @@
"${AOM_ROOT}/av1/common/x86/av1_txfm_sse4.c"
"${AOM_ROOT}/av1/common/x86/av1_txfm_sse4.h"
"${AOM_ROOT}/av1/common/x86/filterintra_sse4.c"
- "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_sse4.c"
"${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_sse4.c"
- "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_sse4.c"
- "${AOM_ROOT}/av1/common/x86/highbd_warp_plane_sse4.c"
"${AOM_ROOT}/av1/common/x86/intra_edge_sse4.c"
"${AOM_ROOT}/av1/common/x86/reconinter_sse4.c"
"${AOM_ROOT}/av1/common/x86/selfguided_sse4.c"
"${AOM_ROOT}/av1/common/x86/warp_plane_sse4.c")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_AV1_COMMON_INTRIN_SSE4_1
- "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_sse4.c"
- "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_sse4.c"
- "${AOM_ROOT}/av1/common/x86/highbd_warp_plane_sse4.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_AV1_COMMON_INTRIN_SSE4_1
+ "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_sse4.c"
+ "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_sse4.c"
+ "${AOM_ROOT}/av1/common/x86/highbd_warp_plane_sse4.c")
endif()
if(CONFIG_REALTIME_ONLY)
@@ -362,23 +356,19 @@
"${AOM_ROOT}/av1/common/x86/cfl_avx2.c"
"${AOM_ROOT}/av1/common/x86/convolve_2d_avx2.c"
"${AOM_ROOT}/av1/common/x86/convolve_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_avx2.c"
"${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_wiener_convolve_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_warp_affine_avx2.c"
"${AOM_ROOT}/av1/common/x86/jnt_convolve_avx2.c"
"${AOM_ROOT}/av1/common/x86/reconinter_avx2.c"
"${AOM_ROOT}/av1/common/x86/selfguided_avx2.c"
"${AOM_ROOT}/av1/common/x86/warp_plane_avx2.c"
"${AOM_ROOT}/av1/common/x86/wiener_convolve_avx2.c")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_AV1_COMMON_INTRIN_AVX2
- "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_wiener_convolve_avx2.c"
- "${AOM_ROOT}/av1/common/x86/highbd_warp_affine_avx2.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_AV1_COMMON_INTRIN_AVX2
+ "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_avx2.c"
+ "${AOM_ROOT}/av1/common/x86/highbd_jnt_convolve_avx2.c"
+ "${AOM_ROOT}/av1/common/x86/highbd_wiener_convolve_avx2.c"
+ "${AOM_ROOT}/av1/common/x86/highbd_warp_affine_avx2.c")
endif()
if(CONFIG_REALTIME_ONLY)
@@ -398,8 +388,6 @@
"${AOM_ROOT}/av1/encoder/x86/av1_quantize_sse2.c"
"${AOM_ROOT}/av1/encoder/x86/encodetxb_sse2.c"
"${AOM_ROOT}/av1/encoder/x86/error_intrin_sse2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_sse2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_sse2.c"
"${AOM_ROOT}/av1/encoder/x86/reconinter_enc_sse2.c"
"${AOM_ROOT}/av1/encoder/x86/temporal_filter_sse2.c"
"${AOM_ROOT}/av1/encoder/x86/wedge_utils_sse2.c")
@@ -409,11 +397,10 @@
"${AOM_ROOT}/av1/encoder/x86/av1_temporal_denoiser_sse2.c")
endif()
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(
- REMOVE_ITEM AOM_AV1_ENCODER_INTRIN_SSE2
- "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_sse2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_sse2.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_AV1_ENCODER_INTRIN_SSE2
+ "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_sse2.c"
+ "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_sse2.c")
endif()
list(APPEND AOM_AV1_ENCODER_INTRIN_SSE3 "${AOM_ROOT}/av1/encoder/x86/ml_sse3.c")
@@ -427,16 +414,15 @@
list(APPEND AOM_AV1_ENCODER_INTRIN_SSE4_1
"${AOM_ROOT}/av1/encoder/x86/av1_fwd_txfm1d_sse4.c"
"${AOM_ROOT}/av1/encoder/x86/av1_fwd_txfm2d_sse4.c"
- "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c"
"${AOM_ROOT}/av1/encoder/x86/corner_match_sse4.c"
"${AOM_ROOT}/av1/encoder/x86/encodetxb_sse4.c"
"${AOM_ROOT}/av1/encoder/x86/highbd_fwd_txfm_sse4.c"
"${AOM_ROOT}/av1/encoder/x86/rdopt_sse4.c"
"${AOM_ROOT}/av1/encoder/x86/pickrst_sse4.c")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_AV1_ENCODER_INTRIN_SSE4_1
- "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_AV1_ENCODER_INTRIN_SSE4_1
+ "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c")
endif()
if(CONFIG_REALTIME_ONLY)
@@ -446,10 +432,8 @@
list(APPEND AOM_AV1_ENCODER_INTRIN_AVX2
"${AOM_ROOT}/av1/encoder/x86/av1_quantize_avx2.c"
- "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/corner_match_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/error_intrin_avx2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/av1_fwd_txfm_avx2.h"
"${AOM_ROOT}/av1/encoder/x86/av1_fwd_txfm2d_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/highbd_fwd_txfm_avx2.c"
@@ -458,16 +442,14 @@
"${AOM_ROOT}/av1/encoder/x86/rdopt_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/av1_k_means_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/temporal_filter_avx2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/pickrst_avx2.c"
"${AOM_ROOT}/av1/encoder/x86/cnn_avx2.c")
-if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(
- REMOVE_ITEM AOM_AV1_ENCODER_INTRIN_AVX2
- "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_avx2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_avx2.c"
- "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_avx2.c")
+if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_AV1_ENCODER_INTRIN_AVX2
+ "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_avx2.c"
+ "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_avx2.c"
+ "${AOM_ROOT}/av1/encoder/x86/highbd_temporal_filter_avx2.c")
endif()
if(CONFIG_REALTIME_ONLY)
diff --git a/test/test.cmake b/test/test.cmake
index 0a5e209..ae2db3b 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -152,7 +152,6 @@
"${AOM_ROOT}/test/binary_codes_test.cc"
"${AOM_ROOT}/test/boolcoder_test.cc"
"${AOM_ROOT}/test/cnn_test.cc"
- "${AOM_ROOT}/test/coding_path_sync.cc"
"${AOM_ROOT}/test/decode_multithreaded_test.cc"
"${AOM_ROOT}/test/divu_small_test.cc"
"${AOM_ROOT}/test/dr_prediction_test.cc"
@@ -190,9 +189,9 @@
"${AOM_ROOT}/test/tile_independence_test.cc"
"${AOM_ROOT}/test/tpl_model_test.cc")
endif()
- if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_UNIT_TEST_COMMON_SOURCES
- "${AOM_ROOT}/test/coding_path_sync.cc")
+ if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_UNIT_TEST_COMMON_SOURCES
+ "${AOM_ROOT}/test/coding_path_sync.cc")
endif()
endif()
@@ -278,7 +277,6 @@
"${AOM_ROOT}/test/obmc_sad_test.cc"
"${AOM_ROOT}/test/obmc_variance_test.cc"
"${AOM_ROOT}/test/pickrst_test.cc"
- "${AOM_ROOT}/test/quantize_func_test.cc"
"${AOM_ROOT}/test/sad_test.cc"
"${AOM_ROOT}/test/subtract_test.cc"
"${AOM_ROOT}/test/reconinter_test.cc"
@@ -320,18 +318,17 @@
endif()
list(APPEND AOM_UNIT_TEST_ENCODER_INTRIN_SSE4_1
- "${AOM_ROOT}/test/av1_quantize_test.cc"
"${AOM_ROOT}/test/corner_match_test.cc"
"${AOM_ROOT}/test/simd_cmp_sse4.cc")
- if(NOT CONFIG_AV1_HIGHBITDEPTH)
- list(REMOVE_ITEM AOM_UNIT_TEST_ENCODER_INTRIN_SSE4_1
- "${AOM_ROOT}/test/av1_quantize_test.cc")
+ if(CONFIG_AV1_HIGHBITDEPTH)
+ list(APPEND AOM_UNIT_TEST_ENCODER_INTRIN_SSE4_1
+ "${AOM_ROOT}/test/av1_quantize_test.cc")
endif()
- if(NOT (HAVE_SSE2 OR HAVE_NEON))
- list(REMOVE_ITEM AOM_UNIT_TEST_ENCODER_SOURCES
- "${AOM_ROOT}/test/quantize_func_test.cc")
+ if(HAVE_SSE2 OR HAVE_NEON)
+ list(APPEND AOM_UNIT_TEST_ENCODER_SOURCES
+ "${AOM_ROOT}/test/quantize_func_test.cc")
endif()
if(HAVE_SSE4_1)
