diff options
author | Glenn Kasten <gkasten@google.com> | 2011-11-17 14:08:31 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 14:08:31 -0800 |
commit | 0c5ce9b35aa34688bca86b93beee743b6ff250df (patch) | |
tree | 9d0d0f330ebe704bb34d8dd28ad93d8608b51e70 | |
parent | 60047ae30cc816e98ddb4b0b48e58c34c3d1f486 (diff) | |
parent | c23e2f2464eb3748599d47af7d8986b856f3c179 (diff) | |
download | frameworks_av-0c5ce9b35aa34688bca86b93beee743b6ff250df.zip frameworks_av-0c5ce9b35aa34688bca86b93beee743b6ff250df.tar.gz frameworks_av-0c5ce9b35aa34688bca86b93beee743b6ff250df.tar.bz2 |
Merge "Bug 5522189 re-enable ARM opts but disable inline"
-rw-r--r-- | services/audioflinger/AudioResampler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp index 906794b..e945ce0 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -33,7 +33,7 @@ namespace android { #ifdef __ARM_HAVE_HALFWORD_MULTIPLY // optimized asm option - //#define ASM_ARM_RESAMP1 // enable asm optimisation for ResamplerOrder1 + #define ASM_ARM_RESAMP1 // enable asm optimisation for ResamplerOrder1 #endif // __ARM_HAVE_HALFWORD_MULTIPLY // ---------------------------------------------------------------------------- @@ -390,6 +390,7 @@ resampleMono16_exit: * phaseFraction : phase fraction for next interpolation * *******************************************************************/ +__attribute__((noinline)) void AudioResamplerOrder1::AsmMono16Loop(int16_t *in, int32_t* maxOutPt, int32_t maxInIdx, size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr, uint32_t &phaseFraction, uint32_t phaseIncrement) @@ -500,6 +501,7 @@ void AudioResamplerOrder1::AsmMono16Loop(int16_t *in, int32_t* maxOutPt, int32_t * phaseFraction : phase fraction for next interpolation * *******************************************************************/ +__attribute__((noinline)) void AudioResamplerOrder1::AsmStereo16Loop(int16_t *in, int32_t* maxOutPt, int32_t maxInIdx, size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr, uint32_t &phaseFraction, uint32_t phaseIncrement) @@ -600,6 +602,5 @@ void AudioResamplerOrder1::AsmStereo16Loop(int16_t *in, int32_t* maxOutPt, int32 // ---------------------------------------------------------------------------- -} -; // namespace android +} // namespace android |