Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba3d10f authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Bug 5522189 re-enable ARM opts but disable inline"

parents 16991b14 cd498c3f

services/audioflinger/AudioResampler.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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