diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-07 09:08:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 09:08:58 -0700 |
| commit | 16bc76ae6b1ee053626695814742c807b42cbce6 (patch) | |
| tree | 06c113970fbaa463f2530c6351c7c7e6dd992ea0 /services/audioflinger/AudioResampler.cpp | |
| parent | 9a03bfb071e0969b14a1ead7c85a12bd3df564a1 (diff) | |
| parent | 0c0a1c0c37dbd2646a732da706d6777283c83e44 (diff) | |
| download | frameworks_av-16bc76ae6b1ee053626695814742c807b42cbce6.zip frameworks_av-16bc76ae6b1ee053626695814742c807b42cbce6.tar.gz frameworks_av-16bc76ae6b1ee053626695814742c807b42cbce6.tar.bz2 | |
am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler
Diffstat (limited to 'services/audioflinger/AudioResampler.cpp')
| -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 { |