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 | a944e591fceba2f13a979af9327e258fcf017c9c (patch) | |
| tree | 33c4289f87f6bf299bd57ca071b9b8442ddcec2b /services | |
| parent | da64f6cf3ce9652dcb1ad7e14e17dd2dbe2c7bd7 (diff) | |
| parent | 07c25b651216daac884bd503c02b788418165b50 (diff) | |
| download | frameworks_base-a944e591fceba2f13a979af9327e258fcf017c9c.zip frameworks_base-a944e591fceba2f13a979af9327e258fcf017c9c.tar.gz frameworks_base-a944e591fceba2f13a979af9327e258fcf017c9c.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 5c3b43fc..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 { |