diff options
author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-07 08:57:00 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-04-07 08:57:00 -0700 |
commit | ca7ad44a8b6764b5935143bfe55700cbddb0d990 (patch) | |
tree | 3deec7c47357544dc34171ecff2df503236142d3 | |
parent | 9907d161584415c81de1099678f160da172fd1a6 (diff) | |
parent | 592a6d976887e7d5f5aca42db52ef6c6576648f5 (diff) | |
download | frameworks_base-ca7ad44a8b6764b5935143bfe55700cbddb0d990.zip frameworks_base-ca7ad44a8b6764b5935143bfe55700cbddb0d990.tar.gz frameworks_base-ca7ad44a8b6764b5935143bfe55700cbddb0d990.tar.bz2 |
Merge "audioflinger: Enable ARMv5TE optimized resampler"
-rw-r--r-- | services/audioflinger/AudioResampler.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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 { |