commit a6018899f9df9be5ad4e66fd1e38b6ef2b66d64e
author Andy Hung <hunga@google.com> Wed Feb 21 14:32:16 2018 -0800
committer Andy Hung <hunga@google.com> Wed Feb 21 15:12:13 2018 -0800
tree ee9d4e8eb22142cf70833a5995fa4c7412983050
parent 08de5c2378a0e84ae41c05b26f8cb6de045023ef

AudioMixer: Fix aux effect pointer computation

Test: Solo Tester + BT + Preset Reverb Aux Effect
Bug: 73723887
Change-Id: Ia765d49214bf855737d0d28a1ba08ba44267aed0

media/libaudioprocessing/AudioMixer.cpp

diff --git a/media/libaudioprocessing/AudioMixer.cpp b/media/libaudioprocessing/AudioMixer.cpp
index 2042913..93ed5f2 100644
--- a/media/libaudioprocessing/AudioMixer.cpp
+++ b/media/libaudioprocessing/AudioMixer.cpp
@@ -1393,13 +1393,12 @@
                     // been enabled for mixing.
                     if (t->mIn == nullptr) break;
 
-                    if (CC_UNLIKELY(aux != NULL)) {
-                        aux += outFrames;
-                    }
                     (t.get()->*t->hook)(
                             outTemp + outFrames * t->mMixerChannelCount, t->buffer.frameCount,
-                            mResampleTemp.get() /* naked ptr */, aux);
+                            mResampleTemp.get() /* naked ptr */,
+                            aux != nullptr ? aux + outFrames : nullptr);
                     outFrames += t->buffer.frameCount;
+
                     t->bufferProvider->releaseBuffer(&t->buffer);
                 }
             }
@@ -1687,7 +1686,7 @@
 
         out += outFrames * channels;
         if (aux != NULL) {
-            aux += channels;
+            aux += outFrames;
         }
         numFrames -= b.frameCount;