diff options
| author | Fritz Koenig <frkoenig@google.com> | 2012-01-19 15:18:31 -0800 |
|---|---|---|
| committer | Fritz Koenig <frkoenig@google.com> | 2012-01-20 10:38:15 -0800 |
| commit | 892102842a7bfd5dc8f37ed4c69c3d68e1293df4 (patch) | |
| tree | fcf90d3b86eae619199a80c0d8f2e161937f75a4 /vpx_scale | |
| parent | ac97b089d1000848f350480ec355b90e4f1f4ef7 (diff) | |
| download | libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar.gz libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar.bz2 libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.zip | |
Disconnect ARM tgt_isa from dsp extensions
A processor with ARMv7 instructions does not
necessarily have NEON dsp extensions. This CL
has the added side effect of allowing the ability
to enable/disable the dsp extensions cleanly.
Change-Id: Ie1e879b8fe131885bc3d4138a0acc9ffe73a36df
Diffstat (limited to 'vpx_scale')
| -rw-r--r-- | vpx_scale/arm/scalesystemdependent.c | 2 | ||||
| -rw-r--r-- | vpx_scale/arm/yv12extend_arm.h | 2 | ||||
| -rw-r--r-- | vpx_scale/vpx_scale.mk | 10 | ||||
| -rw-r--r-- | vpx_scale/yv12extend.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vpx_scale/arm/scalesystemdependent.c b/vpx_scale/arm/scalesystemdependent.c index a6ba5bd43..57b16a1a3 100644 --- a/vpx_scale/arm/scalesystemdependent.c +++ b/vpx_scale/arm/scalesystemdependent.c @@ -16,7 +16,7 @@ void vp8_arch_arm_vpx_scale_init() { -#if HAVE_ARMV7 +#if HAVE_NEON #if CONFIG_RUNTIME_CPU_DETECT int flags = arm_cpu_caps(); if (flags & HAS_NEON) diff --git a/vpx_scale/arm/yv12extend_arm.h b/vpx_scale/arm/yv12extend_arm.h index adfca812f..897c6728f 100644 --- a/vpx_scale/arm/yv12extend_arm.h +++ b/vpx_scale/arm/yv12extend_arm.h @@ -15,7 +15,7 @@ #include "vpx_config.h" #include "vpx_scale/yv12config.h" -#if HAVE_ARMV7 +#if HAVE_NEON void vp8_yv12_extend_frame_borders_neon(YV12_BUFFER_CONFIG *ybf); /* Copy Y,U,V buffer data from src to dst, filling border of dst as well. */ diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index c8385fe22..e0b2ca587 100644 --- a/vpx_scale/vpx_scale.mk +++ b/vpx_scale/vpx_scale.mk @@ -15,10 +15,10 @@ SCALE_SRCS-$(ARCH_ARM) += arm/yv12extend_arm.h SCALE_SRCS-$(ARCH_ARM) += arm/scalesystemdependent.c #neon -SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM) -SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_copy_y_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-$(HAVE_NEON) += arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM) +SCALE_SRCS-$(HAVE_NEON) += arm/neon/vp8_vpxyv12_copy_y_neon$(ASM) +SCALE_SRCS-$(HAVE_NEON) += arm/neon/vp8_vpxyv12_copysrcframe_func_neon$(ASM) +SCALE_SRCS-$(HAVE_NEON) += arm/neon/vp8_vpxyv12_extendframeborders_neon$(ASM) +SCALE_SRCS-$(HAVE_NEON) += arm/neon/yv12extend_arm.c SCALE_SRCS-no += $(SCALE_SRCS_REMOVE-yes) diff --git a/vpx_scale/yv12extend.h b/vpx_scale/yv12extend.h index c8bf95540..72d046bc4 100644 --- a/vpx_scale/yv12extend.h +++ b/vpx_scale/yv12extend.h @@ -16,7 +16,7 @@ #include "vpx_scale/yv12config.h" #include "vpx_scale/generic/yv12extend_generic.h" -#if HAVE_ARMV7 +#if HAVE_NEON #include "vpx_scale/arm/yv12extend_arm.h" #endif |