From bd0c3409a8910d5d08ead81425cd6a02b229c8a3 Mon Sep 17 00:00:00 2001 From: Fritz Koenig Date: Tue, 20 Sep 2011 10:51:06 -0700 Subject: [PATCH] Move neon only arm functions under arm/neon. These files don't contain generic arm code, so should only be compiled by neon. Change-Id: Ie712823aa04d4235e7cfe7a3b725e73ee4c3e564 --- vp8/encoder/arm/{ => neon}/picklpf_arm.c | 0 vp8/vp8cx_arm.mk | 2 +- vpx_scale/arm/{ => neon}/yv12extend_arm.c | 0 vpx_scale/vpx_scale.mk | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename vp8/encoder/arm/{ => neon}/picklpf_arm.c (100%) rename vpx_scale/arm/{ => neon}/yv12extend_arm.c (100%) diff --git a/vp8/encoder/arm/picklpf_arm.c b/vp8/encoder/arm/neon/picklpf_arm.c similarity index 100% rename from vp8/encoder/arm/picklpf_arm.c rename to vp8/encoder/arm/neon/picklpf_arm.c diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index 99b2688ff..f8f054a76 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -18,7 +18,6 @@ VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/picklpf_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c @@ -50,6 +49,7 @@ VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM) #File list for neon # encoder VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/fastquantizeb_neon$(ASM) +VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/picklpf_arm.c VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad8_neon$(ASM) VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad16_neon$(ASM) VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/shortfdct_neon$(ASM) diff --git a/vpx_scale/arm/yv12extend_arm.c b/vpx_scale/arm/neon/yv12extend_arm.c similarity index 100% rename from vpx_scale/arm/yv12extend_arm.c rename to vpx_scale/arm/neon/yv12extend_arm.c diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index edb5419c3..9680ded3c 100644 --- a/vpx_scale/vpx_scale.mk +++ b/vpx_scale/vpx_scale.mk @@ -11,7 +11,6 @@ SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/gen_scalers.c #arm SCALE_SRCS-$(HAVE_ARMV7) += arm/scalesystemdependent.c -SCALE_SRCS-$(HAVE_ARMV7) += arm/yv12extend_arm.c SCALE_SRCS_REMOVE-$(HAVE_ARMV7) += generic/scalesystemdependent.c #neon @@ -19,5 +18,6 @@ SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM) SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_copyframeyonly_neon$(ASM) SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_copysrcframe_func_neon$(ASM) SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_extendframeborders_neon$(ASM) +SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/yv12extend_arm.c SCALE_SRCS-no += $(SCALE_SRCS_REMOVE-yes) -- 2.40.0