commit 4d2cb59a789636383f55063a4222713b3fdd868e
author Nie Wei Feng <nieweifeng@oppo.corp-partner.google.com> Fri May 26 15:18:04 2023 -0700
committer Andy Hung <hunga@google.com> Fri May 26 15:21:33 2023 -0700
tree 296f967ecc5a8dc7978b0a054bf02c1724921905
parent 792f44845e375a336f3b60dfeff086e67a335464

EffectChain: fix removeEffect_l for global aux effects

Causes output stuttering with global aux effects such as environmental reverb.

Test: see bug
Bug: 284258913
Change-Id: I32132f3b52c655ab350715df7097d63adc0ce9c3

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 1c46ddd..6963bb9 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -2447,7 +2447,8 @@
 
             // 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.