commit e0c3d791757109b0302cf74e7027bcada2221b1f
author Andy Hung <hunga@google.com> Mon Jun 01 09:41:24 2020 -0700
committer Andy Hung <hunga@google.com> Mon Jun 01 09:42:02 2020 -0700
tree 4bf6b11b7fd84e06a3b60f94f45cd4f9e5933742
parent d40bc7615ff9bb6aac308083c51980437a9c6a21

AudioMixer: Fix expand mono track to multi-channel

Fix commit c5cf9e2c9696fac73b70336deea73f2dfb537689.

Test: Instrumented apk, see bug for apk and details
Bug: 157618660
Change-Id: Ib4eae82db101f9fd895c3d70b2d24446ce26a7bf

media/libaudioprocessing/AudioMixerBase.cpp

diff --git a/media/libaudioprocessing/AudioMixerBase.cpp b/media/libaudioprocessing/AudioMixerBase.cpp
index 64f91fe..a54e22f 100644
--- a/media/libaudioprocessing/AudioMixerBase.cpp
+++ b/media/libaudioprocessing/AudioMixerBase.cpp
@@ -1500,7 +1500,7 @@
     ALOGVV("track__Resample\n");
     mResampler->setSampleRate(sampleRate);
     const bool ramp = needsRamp();
-    if (MIXTYPE == MIXTYPE_MONOEXPAND || MIXTYPE == MIXTYPE_STEREOEXPAND
+    if (MIXTYPE == MIXTYPE_MONOEXPAND || MIXTYPE == MIXTYPE_STEREOEXPAND // custom volume handling
             || ramp || aux != NULL) {
         // if ramp:        resample with unity gain to temp buffer and scale/mix in 2nd step.
         // if aux != NULL: resample with unity gain to temp buffer then apply send level.

media/libaudioprocessing/AudioMixerOps.h

diff --git a/media/libaudioprocessing/AudioMixerOps.h b/media/libaudioprocessing/AudioMixerOps.h
index 2748182..80bd093 100644
--- a/media/libaudioprocessing/AudioMixerOps.h
+++ b/media/libaudioprocessing/AudioMixerOps.h
@@ -236,7 +236,8 @@
             || MIXTYPE == MIXTYPE_MULTI_SAVEONLY_STEREOVOL
             || MIXTYPE == MIXTYPE_STEREOEXPAND);
     auto proc = [](auto& a, const auto& b) {
-        if constexpr (MIXTYPE == MIXTYPE_MULTI_STEREOVOL) {
+        if constexpr (MIXTYPE == MIXTYPE_MULTI_STEREOVOL
+                || MIXTYPE == MIXTYPE_STEREOEXPAND) {
             a += b;
         } else {
             a = b;