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

Commit 6b86fcdc authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "EffectChain: fix removeEffect_l for global aux effects" am: d38bd2ac... 

Merge "EffectChain: fix removeEffect_l for global aux effects" am: d38bd2ac am: ba9f1d4b am: 09e5ee9b am: 355a423d am: 3628beff am: 4ed9e9ef

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2607729



Change-Id: I684f6ac18a81f4a1836a8dca57329566d5080e23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 738999f6 4ed9e9ef

services/audioflinger/Effects.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2456,7 +2456,8 @@ size_t AudioFlinger::EffectChain::removeEffect_l(const sp<EffectModule>& effect, 


            // make sure the input buffer configuration for the new first effect in the chain

            // is updated if needed (can switch from HAL channel mask to mixer channel mask)

            if (i == 0 && size > 1) {

            if (type != EFFECT_FLAG_TYPE_AUXILIARY // TODO(b/284522658) breaks for aux FX, why?

                    && i == 0 && size > 1) {

                mEffects[0]->configure();

                mEffects[0]->setInBuffer(mInBuffer);

                mEffects[0]->updateAccessMode();      // reconfig if neeeded.