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

Commit e26308ad authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am b083d3b8: Merge "Initialize resampling buffer per track." 

* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
  Initialize resampling buffer per track.
parents 5c009b03 2151d7b8

services/audioflinger/AudioMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,6 @@ void AudioMixer::process__genericResampling(state_t* state) 
{

    int32_t* const outTemp = state->outputTemp;

    const size_t size = sizeof(int32_t) * MAX_NUM_CHANNELS * state->frameCount;

    memset(outTemp, 0, size);



    size_t numFrames = state->frameCount;
@@ -997,6 +996,7 @@ void AudioMixer::process__genericResampling(state_t* state) 
        }

        e0 &= ~(e1);

        int32_t *out = t1.mainBuffer;

        memset(outTemp, 0, size);

        while (e1) {

            const int i = 31 - __builtin_clz(e1);

            e1 &= ~(1<<i);