commit 01b32723fb154dce487e20e980a5daff0764badf
author Andy Hung <hunga@google.com> Fri May 18 13:52:02 2018 -0700
committer Andy Hung <hunga@google.com> Fri May 18 13:52:02 2018 -0700
tree 92612c694eb9ae9365202b9c85b0f3918e4c35eb
parent 1ea2c0f91cb97b17cc8849cf14848b05684b63b7

Effects: Aux effect input is always mono, do not retry as stereo

Test: Solotester on multichannel usb with aux effect
Bug: 79950246
Change-Id: I6e2c3be88d657a5df547dc1034be0e0eecc4b7c2

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index dcf223c..2047dfd 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -595,7 +595,8 @@
             (mConfig.inputCfg.channels != AUDIO_CHANNEL_OUT_STEREO
                     || mConfig.outputCfg.channels != AUDIO_CHANNEL_OUT_STEREO)) {
         // Older effects may require exact STEREO position mask.
-        if (mConfig.inputCfg.channels != AUDIO_CHANNEL_OUT_STEREO) {
+        if (mConfig.inputCfg.channels != AUDIO_CHANNEL_OUT_STEREO
+                && (mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) != EFFECT_FLAG_TYPE_AUXILIARY) {
             ALOGV("Overriding effect input channels %#x as STEREO", mConfig.inputCfg.channels);
             mConfig.inputCfg.channels = AUDIO_CHANNEL_OUT_STEREO;
         }