commit dd2e7a8ec3894faa66776f058355b1acff2b7e31
author Andy Hung <hunga@google.com> Wed Oct 31 14:19:13 2018 -0700
committer Andy Hung <hunga@google.com> Wed Oct 31 14:56:21 2018 -0700
tree cd8e83299ec9f2700d73ab1346c72b23bbff8484
parent fec151edf5e525c8d8f2a448d1e080d90b63e3a6

Effects: Fix multichannel accumulate when disabled

Ensure all channels are accumulated.

Test: Use 4ch USB device, play MP3 with effects, see bug
Bug: 115693755
Change-Id: Ic1eb04dcff34284b3fff67266874eca41a43e523

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 1ce48a9..73882a6 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -309,8 +309,8 @@
     // input and output effect buffers without an intermediary effect process.
     // TODO: consider implementing channel conversion.
     const size_t safeInputOutputSampleCount =
-            inChannelCount != outChannelCount ? 0
-                    : outChannelCount * std::min(
+            mInChannelCountRequested != mOutChannelCountRequested ? 0
+                    : mOutChannelCountRequested * std::min(
                             mConfig.inputCfg.buffer.frameCount,
                             mConfig.outputCfg.buffer.frameCount);
     const auto accumulateInputToOutput = [this, safeInputOutputSampleCount]() {