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

Commit ab1fe306 authored by Eric Laurent's avatar Eric Laurent
Browse files

do not merge - Fix issue 3371096. 

EffectModule::process() was copying effect chain input buffer to
output buffer if no effect was active instead of accumulating it.

Change-Id: If4ca75601ea69a088d0f71d88aec53e90a1dec89
parent 65d39eeb

services/audioflinger/AudioFlinger.cpp

+10 −8
Original line number Diff line number Diff line
@@ -5433,19 +5433,21 @@ void AudioFlinger::EffectModule::process() 


        // clear auxiliary effect input buffer for next accumulation

        if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_AUXILIARY) {

            memset(mConfig.inputCfg.buffer.raw, 0, mConfig.inputCfg.buffer.frameCount*sizeof(int32_t));

            memset(mConfig.inputCfg.buffer.raw, 0,

                   mConfig.inputCfg.buffer.frameCount*sizeof(int32_t));

        }

    } else if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_INSERT &&

                mConfig.inputCfg.buffer.raw != mConfig.outputCfg.buffer.raw) {

        // If an insert effect is idle and input buffer is different from output buffer, copy input to

        // output

        // If an insert effect is idle and input buffer is different from output buffer,

        // accumulate input onto output

        sp<EffectChain> chain = mChain.promote();

        if (chain != 0 && chain->activeTracks() != 0) {

            size_t size = mConfig.inputCfg.buffer.frameCount * sizeof(int16_t);

            if (mConfig.inputCfg.channels == CHANNEL_STEREO) {

                size *= 2;

            size_t frameCnt = mConfig.inputCfg.buffer.frameCount * 2;  //always stereo here

            int16_t *in = mConfig.inputCfg.buffer.s16;

            int16_t *out = mConfig.outputCfg.buffer.s16;

            for (size_t i = 0; i < frameCnt; i++) {

                out[i] = clamp16((int32_t)out[i] + (int32_t)in[i]);

            }

            memcpy(mConfig.outputCfg.buffer.raw, mConfig.inputCfg.buffer.raw, size);

        }

    }

}