Merge "AudioMixer: Fix aux effect pointer computation"

6 years ago · f2f20bdd7b
parent 7dc2089881 a6018899f9
commit f2f20bdd7b
1 changed files with 4 additions and 5 deletions
--- a/media/libaudioprocessing/AudioMixer.cpp
+++ b/media/libaudioprocessing/AudioMixer.cpp
@ -1393,13 +1393,12 @@ void AudioMixer::process__genericResampling()
                    // 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 @@ void AudioMixer::process__noResampleOneTrack()

        out += outFrames * channels;
        if (aux != NULL) {
-            aux += channels;
+            aux += outFrames;
        }
        numFrames -= b.frameCount;