commit a63f07bfcf6ca82d985634a2548e05de0f03fc81
author Andy Hung <hunga@google.com> Fri May 18 16:45:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 18 16:45:33 2018 -0700
tree 665be646af85b9e4a86e1f641f966a76ec39a002
parent 12fea1b4cb95d97aeae8ad42634b5dec12790de6
parent 01b32723fb154dce487e20e980a5daff0764badf

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

Change-Id: I24a77d1fbcb62293917348584f5eaad7e0161262

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;
         }