commit aa35085d53e1844e78fa245c131c883e44b35cc3
author Treehugger Robot <treehugger-gerrit@google.com> Sat Apr 01 05:21:58 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 01 05:21:58 2023 +0000
tree cbbb6cc9992657094a07ab4204997f396659cb5e
parent 99bceaf336ba4d387edf5dad71b01a50f9877d3c
parent 73e7387cfae0f00d2c0ec5e2f81acf2a1e4f3541

Merge "disable audio balance in voip call for mono channel"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 16c72cc..7ba9243 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6196,12 +6196,17 @@
         if (left > GAIN_FLOAT_UNITY) {
             left = GAIN_FLOAT_UNITY;
         }
-        left *= v * mMasterBalanceLeft; // DirectOutputThread balance applied as track volume
         right = float_from_gain(gain_minifloat_unpack_right(vlr));
         if (right > GAIN_FLOAT_UNITY) {
             right = GAIN_FLOAT_UNITY;
         }
-        right *= v * mMasterBalanceRight;
+        left *= v;
+        right *= v;
+        if (mAudioFlinger->getMode() != AUDIO_MODE_IN_COMMUNICATION
+                || audio_channel_count_from_out_mask(mChannelMask) > 1) {
+            left *= mMasterBalanceLeft; // DirectOutputThread balance applied as track volume
+            right *= mMasterBalanceRight;
+        }
     }
 
     if (lastTrack) {