diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-11 17:32:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-11 17:32:37 -0700 |
| commit | 5820e52f9bf3c40839d33457975b6c9629ab1c79 (patch) | |
| tree | b3ca36c6552981cbe8455a2b5b6b25fcedd5c8ea /services | |
| parent | b661326137b5329e714be57d4b9321c7410385c5 (diff) | |
| parent | 4d0243980123378e9dd69022bf4ddca729d84126 (diff) | |
| download | frameworks_av-5820e52f9bf3c40839d33457975b6c9629ab1c79.zip frameworks_av-5820e52f9bf3c40839d33457975b6c9629ab1c79.tar.gz frameworks_av-5820e52f9bf3c40839d33457975b6c9629ab1c79.tar.bz2 | |
am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '07c25b651216daac884bd503c02b788418165b50':
audioflinger: Enable ARMv5TE optimized resampler
Diffstat (limited to 'services')
| -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 { |