diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-11 17:27:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-11 17:27:12 -0700 |
| commit | 4d0243980123378e9dd69022bf4ddca729d84126 (patch) | |
| tree | 297e2b94a1675f8053588a445238acd6e8f99da4 /services/audioflinger/AudioResampler.cpp | |
| parent | 17b32853e0bb44a7a34c436141ee26e1405243a9 (diff) | |
| parent | 16bc76ae6b1ee053626695814742c807b42cbce6 (diff) | |
| download | frameworks_av-4d0243980123378e9dd69022bf4ddca729d84126.zip frameworks_av-4d0243980123378e9dd69022bf4ddca729d84126.tar.gz frameworks_av-4d0243980123378e9dd69022bf4ddca729d84126.tar.bz2 | |
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '4430670f48f75661293371dab8db55865f5f56e0':
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 5c3b43f..dca795c 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 { |