aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorPrajakta Gudadhe <pgudadhe@nvidia.com>2012-06-11 14:08:27 -0700
committerJohn Reck <jreck@google.com>2013-07-15 13:12:43 -0700
commit6a3be8dfbb7c258e7fbbd11f1078bf11c9be89bd (patch)
tree977ba1a67a508d29799d75af44c8361953af4cfc /Android.mk
parentb84b1409efc0e2df28ff0969e10d33e40fc458f2 (diff)
downloadandroid_external_jpeg-6a3be8dfbb7c258e7fbbd11f1078bf11c9be89bd.tar.gz
android_external_jpeg-6a3be8dfbb7c258e7fbbd11f1078bf11c9be89bd.tar.bz2
android_external_jpeg-6a3be8dfbb7c258e7fbbd11f1078bf11c9be89bd.zip
JPEG decoding neon optimization
Bug: 6633342 The idct and color conversion are neon accelerated. Note, neon accelerations and armv6 assembly accelerations are muturaly exclusive. When neon is not available, the armv6 assembly is used. Change-Id: I4a7093e2199893154d64b43f2b0282971c19426c
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 5bb0657..6e78c74 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,9 +40,17 @@ ifeq ($(TARGET_ARCH_VARIANT),x86-atom)
LOCAL_SRC_FILES += jidctintelsse.c
endif
-# enable armv6 idct assembly
ifeq ($(strip $(TARGET_ARCH)),arm)
- LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT
+ ifeq ($(ARCH_ARM_HAVE_NEON),true)
+ #use NEON accelerations
+ LOCAL_CFLAGS += -DNV_ARM_NEON
+ LOCAL_SRC_FILES += \
+ jsimd_arm_neon.S \
+ jsimd_neon.c
+ else
+ # enable armv6 idct assembly
+ LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT
+ endif
endif
# use mips assembler IDCT implementation if MIPS DSP-ASE is present