commit 4430670f48f75661293371dab8db55865f5f56e0
author Brad Fitzpatrick <bradfitz@android.com> Thu Apr 07 09:08:58 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 07 09:08:58 2011 -0700
tree abca0edf2cd3ef27f5f85ed5d7b687f8083c8270
parent 4754c79a77dc09259dee7e018710a96fe167bb8e
parent ca7ad44a8b6764b5935143bfe55700cbddb0d990

am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"

* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
  audioflinger: Enable ARMv5TE optimized resampler

services/audioflinger/AudioResampler.cpp

diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp
index 5dabacb..245bfdf 100644
--- a/services/audioflinger/AudioResampler.cpp
+++ b/services/audioflinger/AudioResampler.cpp
@@ -26,11 +26,15 @@
 #include "AudioResamplerSinc.h"
 #include "AudioResamplerCubic.h"
 
+#ifdef __arm__
+#include <machine/cpu-features.h>
+#endif
+
 namespace android {
 
-#ifdef __ARM_ARCH_5E__  // optimized asm option
+#ifdef __ARM_HAVE_HALFWORD_MULTIPLY // optimized asm option
     #define ASM_ARM_RESAMP1 // enable asm optimisation for ResamplerOrder1
-#endif // __ARM_ARCH_5E__
+#endif // __ARM_HAVE_HALFWORD_MULTIPLY
 // ----------------------------------------------------------------------------
 
 class AudioResamplerOrder1 : public AudioResampler {