diff options
Diffstat (limited to 'third_party/aom/av1/av1.cmake')
| -rw-r--r-- | third_party/aom/av1/av1.cmake | 160 |
1 files changed, 114 insertions, 46 deletions
diff --git a/third_party/aom/av1/av1.cmake b/third_party/aom/av1/av1.cmake index 945166b2d..140eec815 100644 --- a/third_party/aom/av1/av1.cmake +++ b/third_party/aom/av1/av1.cmake @@ -89,7 +89,8 @@ set(AOM_AV1_DECODER_SOURCES "${AOM_ROOT}/av1/decoder/dsubexp.c" "${AOM_ROOT}/av1/decoder/dsubexp.h" "${AOM_ROOT}/av1/decoder/dthread.c" - "${AOM_ROOT}/av1/decoder/dthread.h") + "${AOM_ROOT}/av1/decoder/dthread.h" + "${AOM_ROOT}/av1/decoder/symbolrate.h") set(AOM_AV1_ENCODER_SOURCES "${AOM_ROOT}/av1/av1_cx_iface.c" @@ -123,6 +124,8 @@ set(AOM_AV1_ENCODER_SOURCES "${AOM_ROOT}/av1/encoder/extend.h" "${AOM_ROOT}/av1/encoder/firstpass.c" "${AOM_ROOT}/av1/encoder/firstpass.h" + "${AOM_ROOT}/av1/encoder/hash.c" + "${AOM_ROOT}/av1/encoder/hash.h" "${AOM_ROOT}/av1/encoder/hybrid_fwd_txfm.c" "${AOM_ROOT}/av1/encoder/hybrid_fwd_txfm.h" "${AOM_ROOT}/av1/encoder/lookahead.c" @@ -131,6 +134,8 @@ set(AOM_AV1_ENCODER_SOURCES "${AOM_ROOT}/av1/encoder/mbgraph.h" "${AOM_ROOT}/av1/encoder/mcomp.c" "${AOM_ROOT}/av1/encoder/mcomp.h" + "${AOM_ROOT}/av1/encoder/palette.c" + "${AOM_ROOT}/av1/encoder/palette.h" "${AOM_ROOT}/av1/encoder/picklpf.c" "${AOM_ROOT}/av1/encoder/picklpf.h" "${AOM_ROOT}/av1/encoder/ratectrl.c" @@ -167,11 +172,6 @@ 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 - "${AOM_ROOT}/av1/common/mips/dspr2/av1_itrans16_dspr2.c" - "${AOM_ROOT}/av1/common/mips/dspr2/av1_itrans4_dspr2.c" - "${AOM_ROOT}/av1/common/mips/dspr2/av1_itrans8_dspr2.c") - set(AOM_AV1_COMMON_INTRIN_MSA "${AOM_ROOT}/av1/common/mips/msa/av1_idct16x16_msa.c" "${AOM_ROOT}/av1/common/mips/msa/av1_idct4x4_msa.c" @@ -190,9 +190,6 @@ set(AOM_AV1_ENCODER_INTRIN_SSE2 set(AOM_AV1_ENCODER_ASM_SSSE3_X86_64 "${AOM_ROOT}/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm") -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" @@ -222,7 +219,6 @@ if (CONFIG_HIGHBITDEPTH) else () set(AOM_AV1_COMMON_INTRIN_NEON ${AOM_AV1_COMMON_INTRIN_NEON} - "${AOM_ROOT}/av1/encoder/arm/neon/dct_neon.c" "${AOM_ROOT}/av1/common/arm/neon/iht4x4_add_neon.c" "${AOM_ROOT}/av1/common/arm/neon/iht8x8_add_neon.c") @@ -234,14 +230,10 @@ endif () if (CONFIG_CDEF) set(AOM_AV1_COMMON_SOURCES ${AOM_AV1_COMMON_SOURCES} - "${AOM_ROOT}/av1/common/clpf.c" - "${AOM_ROOT}/av1/common/clpf_simd.h" - "${AOM_ROOT}/av1/common/cdef_simd.h" "${AOM_ROOT}/av1/common/cdef.c" "${AOM_ROOT}/av1/common/cdef.h" - "${AOM_ROOT}/av1/common/od_dering.c" - "${AOM_ROOT}/av1/common/od_dering.h" - "${AOM_ROOT}/av1/common/od_dering_simd.h") + "${AOM_ROOT}/av1/common/cdef_block.c" + "${AOM_ROOT}/av1/common/cdef_block.h") set(AOM_AV1_ENCODER_SOURCES ${AOM_AV1_ENCODER_SOURCES} @@ -249,32 +241,70 @@ if (CONFIG_CDEF) set(AOM_AV1_COMMON_INTRIN_SSE2 ${AOM_AV1_COMMON_INTRIN_SSE2} - "${AOM_ROOT}/av1/common/clpf_sse2.c" - "${AOM_ROOT}/av1/common/od_dering_sse2.c") + "${AOM_ROOT}/av1/common/cdef_block_sse2.c") set(AOM_AV1_COMMON_INTRIN_SSSE3 ${AOM_AV1_COMMON_INTRIN_SSSE3} - "${AOM_ROOT}/av1/common/clpf_ssse3.c" - "${AOM_ROOT}/av1/common/od_dering_ssse3.c") + "${AOM_ROOT}/av1/common/cdef_block_ssse3.c") set(AOM_AV1_COMMON_INTRIN_SSE4_1 ${AOM_AV1_COMMON_INTRIN_SSE4_1} - "${AOM_ROOT}/av1/common/clpf_sse4.c" - "${AOM_ROOT}/av1/common/od_dering_sse4.c") + "${AOM_ROOT}/av1/common/cdef_block_sse4.c") + + set(AOM_AV1_COMMON_INTRIN_AVX2 + ${AOM_AV1_COMMON_INTRIN_AVX2} + "${AOM_ROOT}/av1/common/cdef_block_avx2.c") set(AOM_AV1_COMMON_INTRIN_NEON ${AOM_AV1_COMMON_INTRIN_NEON} - "${AOM_ROOT}/av1/common/clpf_neon.c" - "${AOM_ROOT}/av1/common/od_dering_neon.c") + "${AOM_ROOT}/av1/common/cdef_block_neon.c") + + if (NOT CONFIG_CDEF_SINGLEPASS) + set(AOM_AV1_COMMON_SOURCES + ${AOM_AV1_COMMON_SOURCES} + "${AOM_ROOT}/av1/common/clpf.c" + "${AOM_ROOT}/av1/common/clpf_simd.h" + "${AOM_ROOT}/av1/common/cdef_block_simd.h") + + set(AOM_AV1_COMMON_INTRIN_SSE2 + ${AOM_AV1_COMMON_INTRIN_SSE2} + "${AOM_ROOT}/av1/common/clpf_sse2.c") + + set(AOM_AV1_COMMON_INTRIN_SSSE3 + ${AOM_AV1_COMMON_INTRIN_SSSE3} + "${AOM_ROOT}/av1/common/clpf_ssse3.c") + + set(AOM_AV1_COMMON_INTRIN_SSE4_1 + ${AOM_AV1_COMMON_INTRIN_SSE4_1} + "${AOM_ROOT}/av1/common/clpf_sse4.c") + + set(AOM_AV1_COMMON_INTRIN_NEON + ${AOM_AV1_COMMON_INTRIN_NEON} + "${AOM_ROOT}/av1/common/clpf_neon.c") + endif () endif () if (CONFIG_CONVOLVE_ROUND) + set(AOM_AV1_COMMON_INTRIN_SSE2 + ${AOM_AV1_COMMON_INTRIN_SSE2} + "${AOM_ROOT}/av1/common/x86/convolve_2d_sse2.c") + if (CONFIG_HIGHBITDEPTH) + set(AOM_AV1_COMMON_INTRIN_SSSE3 + ${AOM_AV1_COMMON_INTRIN_SSSE3} + "${AOM_ROOT}/av1/common/x86/highbd_convolve_2d_ssse3.c") + endif () + + if(NOT CONFIG_COMPOUND_ROUND) + set(AOM_AV1_COMMON_INTRIN_SSE4_1 + ${AOM_AV1_COMMON_INTRIN_SSE4_1} + "${AOM_ROOT}/av1/common/x86/av1_convolve_scale_sse4.c") + endif() + 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} "${AOM_ROOT}/av1/encoder/wedge_utils.c") @@ -282,7 +312,6 @@ if (CONFIG_EXT_INTER) set(AOM_AV1_ENCODER_INTRIN_SSE2 ${AOM_AV1_ENCODER_INTRIN_SSE2} "${AOM_ROOT}/av1/encoder/x86/wedge_utils_sse2.c") -endif () if (CONFIG_FILTER_INTRA) set(AOM_AV1_COMMON_INTRIN_SSE4_1 @@ -297,6 +326,13 @@ if (CONFIG_ACCOUNTING) "${AOM_ROOT}/av1/decoder/accounting.h") endif () +if (CONFIG_BGSPRITE) + set(AOM_AV1_ENCODER_SOURCES + ${AOM_AV1_ENCODER_SOURCES} + "${AOM_ROOT}/av1/encoder/bgsprite.c" + "${AOM_ROOT}/av1/encoder/bgsprite.h") +endif () + if (CONFIG_GLOBAL_MOTION) set(AOM_AV1_ENCODER_SOURCES ${AOM_AV1_ENCODER_SOURCES} @@ -331,11 +367,21 @@ if (CONFIG_INTERNAL_STATS) "${AOM_ROOT}/av1/encoder/blockiness.c") endif () -if (CONFIG_PALETTE) +if (CONFIG_LV_MAP) + set(AOM_AV1_COMMON_SOURCES + ${AOM_AV1_COMMON_SOURCES} + "${AOM_ROOT}/av1/common/txb_common.c" + "${AOM_ROOT}/av1/common/txb_common.h") + + set(AOM_AV1_DECODER_SOURCES + ${AOM_AV1_DECODER_SOURCES} + "${AOM_ROOT}/av1/decoder/decodetxb.c" + "${AOM_ROOT}/av1/decoder/decodetxb.h") + set(AOM_AV1_ENCODER_SOURCES ${AOM_AV1_ENCODER_SOURCES} - "${AOM_ROOT}/av1/encoder/palette.c" - "${AOM_ROOT}/av1/encoder/palette.h") + "${AOM_ROOT}/av1/encoder/encodetxb.c" + "${AOM_ROOT}/av1/encoder/encodetxb.h") endif () if (CONFIG_CFL) @@ -361,6 +407,19 @@ if (CONFIG_LOOP_RESTORATION) "${AOM_ROOT}/av1/encoder/pickrst.h") endif () +if (CONFIG_INTRA_EDGE) + set(AOM_AV1_COMMON_INTRIN_SSE4_1 + ${AOM_AV1_COMMON_INTRIN_SSE4_1} + "${AOM_ROOT}/av1/common/x86/intra_edge_sse4.c") +endif () + +if (CONFIG_NCOBMC_ADAPT_WEIGHT) + set(AOM_AV1_COMMON_SOURCES + ${AOM_AV1_COMMON_SOURCES} + "${AOM_ROOT}/av1/common/ncobmc_kernels.c" + "${AOM_ROOT}/av1/common/ncobmc_kernels.h") +endif () + if (CONFIG_PVQ) set(AOM_AV1_COMMON_SOURCES ${AOM_AV1_COMMON_SOURCES} @@ -417,9 +476,6 @@ if (CONFIG_PVQ) ${AOM_AV1_DECODER_INTRIN_SSE2} "${AOM_ROOT}/av1/encoder/x86/dct_intrin_sse2.c") - set(AOM_AV1_DECODER_INTRIN_SSSE3 - ${AOM_AV1_DECODER_INTRIN_SSSE3} - "${AOM_ROOT}/av1/encoder/x86/dct_ssse3.c") endif () endif () @@ -444,6 +500,28 @@ if (CONFIG_WARPED_MOTION OR CONFIG_GLOBAL_MOTION) endif () endif () +if (CONFIG_HASH_ME) + set(AOM_AV1_ENCODER_SOURCES + ${AOM_AV1_ENCODER_SOURCES} + "${AOM_ROOT}/av1/encoder/hash_motion.h" + "${AOM_ROOT}/av1/encoder/hash_motion.c" + "${AOM_ROOT}/third_party/vector/vector.h" + "${AOM_ROOT}/third_party/vector/vector.c") +endif () + +if (CONFIG_Q_ADAPT_PROBS) + set(AOM_AV1_COMMON_SOURCES + ${AOM_AV1_COMMON_SOURCES} + "${AOM_ROOT}/av1/common/token_cdfs.h") +endif () + +if (CONFIG_XIPHRC) + set(AOM_AV1_ENCODER_SOURCES + ${AOM_AV1_ENCODER_SOURCES} + "${AOM_ROOT}/av1/encoder/ratectrl_xiph.c" + "${AOM_ROOT}/av1/encoder/ratectrl_xiph.h") +endif () + # Setup AV1 common/decoder/encoder targets. The libaom target must exist before # this function is called. function (setup_av1_targets) @@ -472,7 +550,7 @@ function (setup_av1_targets) endif () if (HAVE_SSE2) - require_flag_nomsvc("-msse2" NO) + require_compiler_flag_nomsvc("-msse2" NO) add_intrinsics_object_library("-msse2" "sse2" "aom_av1_common" "AOM_AV1_COMMON_INTRIN_SSE2" "aom") if (CONFIG_AV1_DECODER) @@ -494,7 +572,7 @@ function (setup_av1_targets) endif () if (HAVE_SSSE3) - require_flag_nomsvc("-mssse3" NO) + require_compiler_flag_nomsvc("-mssse3" NO) add_intrinsics_object_library("-mssse3" "ssse3" "aom_av1_common" "AOM_AV1_COMMON_INTRIN_SSSE3" "aom") @@ -504,15 +582,10 @@ function (setup_av1_targets) "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") - endif () endif () if (HAVE_SSE4_1) - require_flag_nomsvc("-msse4.1" NO) + require_compiler_flag_nomsvc("-msse4.1" NO) add_intrinsics_object_library("-msse4.1" "sse4" "aom_av1_common" "AOM_AV1_COMMON_INTRIN_SSE4_1" "aom") @@ -530,7 +603,7 @@ function (setup_av1_targets) endif () if (HAVE_AVX2) - require_flag_nomsvc("-mavx2" NO) + require_compiler_flag_nomsvc("-mavx2" NO) add_intrinsics_object_library("-mavx2" "avx2" "aom_av1_common" "AOM_AV1_COMMON_INTRIN_AVX2" "aom") @@ -556,11 +629,6 @@ function (setup_av1_targets) endif () endif () - if (HAVE_DSPR2) - add_intrinsics_object_library("" "dspr2" "aom_av1_common" - "AOM_AV1_COMMON_INTRIN_DSPR2" "aom") - endif () - if (HAVE_MSA) add_intrinsics_object_library("" "msa" "aom_av1_common" "AOM_AV1_COMMON_INTRIN_MSA" "aom") |