From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/av1/av1_common.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'third_party/aom/av1/av1_common.mk') diff --git a/third_party/aom/av1/av1_common.mk b/third_party/aom/av1/av1_common.mk index ecbfbdb2c..a8ba72016 100644 --- a/third_party/aom/av1/av1_common.mk +++ b/third_party/aom/av1/av1_common.mk @@ -24,6 +24,8 @@ 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 +AV1_COMMON_SRCS-yes += common/daala_tx.c +AV1_COMMON_SRCS-yes += common/daala_tx.h AV1_COMMON_SRCS-yes += common/entropy.h AV1_COMMON_SRCS-yes += common/entropymode.h AV1_COMMON_SRCS-yes += common/entropymv.h @@ -71,6 +73,7 @@ AV1_COMMON_SRCS-yes += common/av1_fwd_txfm2d.c AV1_COMMON_SRCS-yes += common/av1_fwd_txfm1d_cfg.h AV1_COMMON_SRCS-yes += common/av1_inv_txfm2d.c AV1_COMMON_SRCS-yes += common/av1_inv_txfm1d_cfg.h +AV1_COMMON_SRCS-$(HAVE_AVX2) += common/x86/convolve_avx2.c AV1_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/av1_convolve_ssse3.c ifeq ($(CONFIG_HIGHBITDEPTH),yes) AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_sse4.c @@ -88,7 +91,6 @@ AV1_COMMON_SRCS-yes += common/warped_motion.c endif ifeq ($(CONFIG_CDEF),yes) AV1_COMMON_SRCS-yes += common/clpf.c -AV1_COMMON_SRCS-yes += common/clpf.h AV1_COMMON_SRCS-yes += common/clpf_simd.h AV1_COMMON_SRCS-yes += common/cdef_simd.h AV1_COMMON_SRCS-$(HAVE_SSE2) += common/clpf_sse2.c @@ -154,11 +156,10 @@ AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_txfm1d_sse4.h AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_fwd_txfm1d_sse4.c AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_fwd_txfm2d_sse4.c endif -ifeq ($(CONFIG_HIGHBITDEPTH),yes) + AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/highbd_txfm_utility_sse4.h AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/highbd_inv_txfm_sse4.c AV1_COMMON_SRCS-$(HAVE_AVX2) += common/x86/highbd_inv_txfm_avx2.c -endif ifneq ($(CONFIG_HIGHBITDEPTH),yes) AV1_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht4x4_add_neon.c @@ -177,4 +178,11 @@ AV1_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/highbd_warp_plane_ssse3.c endif endif +ifeq ($(CONFIG_CONVOLVE_ROUND),yes) +AV1_COMMON_SRCS-$(HAVE_SSE2) += common/x86/convolve_2d_sse2.c +ifeq ($(CONFIG_HIGHBITDEPTH),yes) +AV1_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/highbd_convolve_2d_ssse3.c +endif +endif + $(eval $(call rtcd_h_template,av1_rtcd,av1/common/av1_rtcd_defs.pl)) -- cgit v1.2.3