commit 81b64e7591d708eece16bbb2edad6fc88592ea33
author Andy Hung <hunga@google.com> Thu Nov 01 17:33:55 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 01 17:33:55 2018 +0000
tree 218d246c3c332a243882c2ba5f7d4a6562e0b2c6
parent 824d1ff69c0487ee8ecdb8836ebfd056c2daf83e
parent e8ac1b2f52dc760bd1abd3dc720a5d9b59df51ad

Merge changes I016e2310,Ic1eb04dc

* changes:
  Effects: Fix write mode for disabled effects
  Effects: Fix multichannel accumulate when disabled

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 1ce48a9..6ab6369 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]() {
@@ -480,7 +480,12 @@
         // accumulate input onto output
         sp<EffectChain> chain = mChain.promote();
         if (chain.get() != nullptr && chain->activeTrackCnt() != 0) {
-            accumulateInputToOutput();
+            // similar handling with data_bypass above.
+            if (mConfig.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE) {
+                accumulateInputToOutput();
+            } else { // EFFECT_BUFFER_ACCESS_WRITE
+                copyInputToOutput();
+            }
         }
     }
 }