commit 7a1c913eb9fb9279baad1b1bb7c2e311e75abb57
author Andy Hung <hunga@google.com> Fri May 18 17:16:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 18 17:16:56 2018 -0700
tree 2e053b917f1b8fc887cd6172bb1824f08d27c8fc
parent 3e0db91be9a81ea6d9b132c636e683a6b4f9bb8d
parent a63f07bfcf6ca82d985634a2548e05de0f03fc81

Effects: Aux effect input is always mono, do not retry as stereo am: 01b32723fb
am: a63f07bfcf

Change-Id: Ib4c80c48512cfc36c552499d0ebbdb27f87b1898

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 5e82b75..f89c6db 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;
         }