diff options
Diffstat (limited to 'third_party/aom/av1/av1.cmake')
| -rw-r--r-- | third_party/aom/av1/av1.cmake | 81 |
1 files changed, 49 insertions, 32 deletions
diff --git a/third_party/aom/av1/av1.cmake b/third_party/aom/av1/av1.cmake index 56412c90a3..945166b2d6 100644 --- a/third_party/aom/av1/av1.cmake +++ b/third_party/aom/av1/av1.cmake @@ -33,6 +33,8 @@ 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/debugmodes.c" "${AOM_ROOT}/av1/common/entropy.c" "${AOM_ROOT}/av1/common/entropy.h" @@ -158,9 +160,11 @@ set(AOM_AV1_COMMON_INTRIN_SSSE3 set(AOM_AV1_COMMON_INTRIN_SSE4_1 "${AOM_ROOT}/av1/common/x86/av1_fwd_txfm1d_sse4.c" - "${AOM_ROOT}/av1/common/x86/av1_fwd_txfm2d_sse4.c") + "${AOM_ROOT}/av1/common/x86/av1_fwd_txfm2d_sse4.c" + "${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_sse4.c") set(AOM_AV1_COMMON_INTRIN_AVX2 + "${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_avx2.c" "${AOM_ROOT}/av1/common/x86/hybrid_inv_txfm_avx2.c") set(AOM_AV1_COMMON_INTRIN_DSPR2 @@ -189,7 +193,14 @@ set(AOM_AV1_ENCODER_ASM_SSSE3_X86_64 set(AOM_AV1_ENCODER_INTRIN_SSSE3 "${AOM_ROOT}/av1/encoder/x86/dct_ssse3.c") +set(AOM_AV1_ENCODER_INTRIN_SSE4_1 + ${AOM_AV1_ENCODER_INTRIN_SSE4_1} + "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c" + "${AOM_ROOT}/av1/encoder/x86/highbd_fwd_txfm_sse4.c") + set(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/error_intrin_avx2.c" "${AOM_ROOT}/av1/encoder/x86/hybrid_fwd_txfm_avx2.c") @@ -207,17 +218,7 @@ set(AOM_AV1_ENCODER_INTRIN_MSA if (CONFIG_HIGHBITDEPTH) set(AOM_AV1_COMMON_INTRIN_SSE4_1 ${AOM_AV1_COMMON_INTRIN_SSE4_1} - "${AOM_ROOT}/av1/common/x86/av1_highbd_convolve_sse4.c" - "${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_sse4.c") - - set(AOM_AV1_COMMON_INTRIN_AVX2 - ${AOM_AV1_COMMON_INTRIN_AVX2} - "${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_avx2.c") - - set(AOM_AV1_ENCODER_INTRIN_SSE4_1 - ${AOM_AV1_ENCODER_INTRIN_SSE4_1} - "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c" - "${AOM_ROOT}/av1/encoder/x86/highbd_fwd_txfm_sse4.c") + "${AOM_ROOT}/av1/common/x86/av1_highbd_convolve_sse4.c") else () set(AOM_AV1_COMMON_INTRIN_NEON ${AOM_AV1_COMMON_INTRIN_NEON} @@ -234,7 +235,6 @@ if (CONFIG_CDEF) set(AOM_AV1_COMMON_SOURCES ${AOM_AV1_COMMON_SOURCES} "${AOM_ROOT}/av1/common/clpf.c" - "${AOM_ROOT}/av1/common/clpf.h" "${AOM_ROOT}/av1/common/clpf_simd.h" "${AOM_ROOT}/av1/common/cdef_simd.h" "${AOM_ROOT}/av1/common/cdef.c" @@ -268,6 +268,12 @@ if (CONFIG_CDEF) "${AOM_ROOT}/av1/common/od_dering_neon.c") endif () +if (CONFIG_CONVOLVE_ROUND) + set(AOM_AV1_COMMON_INTRIN_AVX2 + ${AOM_AV1_COMMON_INTRIN_AVX2} + "${AOM_ROOT}/av1/common/x86/convolve_avx2.c") +endif () + if (CONFIG_EXT_INTER) set(AOM_AV1_ENCODER_SOURCES ${AOM_AV1_ENCODER_SOURCES} @@ -442,25 +448,33 @@ endif () # this function is called. function (setup_av1_targets) add_library(aom_av1_common OBJECT ${AOM_AV1_COMMON_SOURCES}) - set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_av1_common) - target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_av1_common>) + list(APPEND AOM_LIB_TARGETS aom_av1_common) + + create_dummy_source_file("aom_av1" "c" "dummy_source_file") + add_library(aom_av1 OBJECT "${dummy_source_file}") + target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_av1_common>) + list(APPEND AOM_LIB_TARGETS aom_av1) + + # Not all generators support libraries consisting only of object files. Add a + # dummy source file to the aom_av1 target. + add_dummy_source_file_to_target("aom_av1" "c") if (CONFIG_AV1_DECODER) add_library(aom_av1_decoder OBJECT ${AOM_AV1_DECODER_SOURCES}) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_av1_decoder) - target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_av1_decoder>) + target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_av1_decoder>) endif () if (CONFIG_AV1_ENCODER) add_library(aom_av1_encoder OBJECT ${AOM_AV1_ENCODER_SOURCES}) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_av1_encoder) - target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_av1_encoder>) + target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_av1_encoder>) endif () if (HAVE_SSE2) require_flag_nomsvc("-msse2" NO) add_intrinsics_object_library("-msse2" "sse2" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_SSE2") + "AOM_AV1_COMMON_INTRIN_SSE2" "aom") if (CONFIG_AV1_DECODER) if (AOM_AV1_DECODER_ASM_SSE2) add_asm_library("aom_av1_decoder_sse2" "AOM_AV1_DECODER_ASM_SSE2" "aom") @@ -468,39 +482,39 @@ function (setup_av1_targets) if (AOM_AV1_DECODER_INTRIN_SSE2) add_intrinsics_object_library("-msse2" "sse2" "aom_av1_decoder" - "AOM_AV1_DECODER_INTRIN_SSE2") + "AOM_AV1_DECODER_INTRIN_SSE2" "aom") endif () endif () if (CONFIG_AV1_ENCODER) add_asm_library("aom_av1_encoder_sse2" "AOM_AV1_ENCODER_ASM_SSE2" "aom") add_intrinsics_object_library("-msse2" "sse2" "aom_av1_encoder" - "AOM_AV1_ENCODER_INTRIN_SSE2") + "AOM_AV1_ENCODER_INTRIN_SSE2" "aom") endif () endif () if (HAVE_SSSE3) require_flag_nomsvc("-mssse3" NO) add_intrinsics_object_library("-mssse3" "ssse3" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_SSSE3") + "AOM_AV1_COMMON_INTRIN_SSSE3" "aom") if (CONFIG_AV1_DECODER) if (AOM_AV1_DECODER_INTRIN_SSSE3) add_intrinsics_object_library("-mssse3" "ssse3" "aom_av1_decoder" - "AOM_AV1_DECODER_INTRIN_SSSE3") + "AOM_AV1_DECODER_INTRIN_SSSE3" "aom") endif () endif () if (CONFIG_AV1_ENCODER) add_intrinsics_object_library("-mssse3" "ssse3" "aom_av1_encoder" - "AOM_AV1_ENCODER_INTRIN_SSSE3") + "AOM_AV1_ENCODER_INTRIN_SSSE3" "aom") endif () endif () if (HAVE_SSE4_1) require_flag_nomsvc("-msse4.1" NO) add_intrinsics_object_library("-msse4.1" "sse4" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_SSE4_1") + "AOM_AV1_COMMON_INTRIN_SSE4_1" "aom") if (CONFIG_AV1_ENCODER) if ("${AOM_TARGET_CPU}" STREQUAL "x86_64") @@ -510,7 +524,7 @@ function (setup_av1_targets) if (AOM_AV1_ENCODER_INTRIN_SSE4_1) add_intrinsics_object_library("-msse4.1" "sse4" "aom_av1_encoder" - "AOM_AV1_ENCODER_INTRIN_SSE4_1") + "AOM_AV1_ENCODER_INTRIN_SSE4_1" "aom") endif () endif () endif () @@ -518,11 +532,11 @@ function (setup_av1_targets) if (HAVE_AVX2) require_flag_nomsvc("-mavx2" NO) add_intrinsics_object_library("-mavx2" "avx2" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_AVX2") + "AOM_AV1_COMMON_INTRIN_AVX2" "aom") if (CONFIG_AV1_ENCODER) add_intrinsics_object_library("-mavx2" "avx2" "aom_av1_encoder" - "AOM_AV1_ENCODER_INTRIN_AVX2") + "AOM_AV1_ENCODER_INTRIN_AVX2" "aom") endif () endif () @@ -531,29 +545,32 @@ function (setup_av1_targets) add_intrinsics_object_library("${AOM_INTRIN_NEON_FLAG}" "neon" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_NEON") + "AOM_AV1_COMMON_INTRIN_NEON" "aom") endif () if (AOM_AV1_ENCODER_INTRIN_NEON) add_intrinsics_object_library("${AOM_INTRIN_NEON_FLAG}" "neon" "aom_av1_encoder" - "AOM_AV1_ENCODER_INTRIN_NEON") + "AOM_AV1_ENCODER_INTRIN_NEON" "aom") endif () endif () if (HAVE_DSPR2) add_intrinsics_object_library("" "dspr2" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_DSPR2") + "AOM_AV1_COMMON_INTRIN_DSPR2" "aom") endif () if (HAVE_MSA) add_intrinsics_object_library("" "msa" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_MSA") + "AOM_AV1_COMMON_INTRIN_MSA" "aom") add_intrinsics_object_library("" "msa" "aom_av1_encoder" - "AOM_AV1_ENCODER_INTRIN_MSA") + "AOM_AV1_ENCODER_INTRIN_MSA" "aom") endif () + target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_dsp>) + target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_scale>) + # Pass the new lib targets up to the parent scope instance of # $AOM_LIB_TARGETS. set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE) |