commit a4cc45f86037ef7e7832624f9bc7ab9e84556d15
author Shunkai Yao <yaoshunkai@google.com> Fri Jan 12 00:25:20 2024 +0000
committer Shunkai Yao <yaoshunkai@google.com> Sat Jan 13 02:18:40 2024 +0000
tree 98b7ca24ab48b97144f9900a91d3f5a16ad84278
parent 52743c0aab2306c726452086225b3afbcaf0b8f6

EffectChain setVolume_l with EffectChainmutex held

Bug: 315995877
Test: atest AudioTrackTest; atest AudioRecordTest
Test: flush to Pixel and test audio functionality
Change-Id: I933314a2cd3b0911091e9cfc1ffe00e58166827f

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 244a262..67a0bd1 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5497,6 +5497,7 @@
     if (masterMute) {
         masterVolume = 0;
     }
+
     // Delegate master volume control to effect in output mix effect chain if needed
     sp<IAfEffectChain> chain = getEffectChain_l(AUDIO_SESSION_OUTPUT_MIX);
     if (chain != 0) {
@@ -5836,7 +5837,7 @@
 
             mixedTracks++;
 
-            // track->mainBuffer() != mSinkBuffer or mMixerBuffer means
+            // track->mainBuffer() != mSinkBuffer and mMixerBuffer means
             // there is an effect chain connected to the track
             chain.clear();
             if (track->mainBuffer() != mSinkBuffer &&