commit 436c9177a69a522975742b8e65714bce5865c6ff
author Vlad Popa <pvlad@google.com> Tue Aug 02 15:25:08 2022 +0200
committer Vlad Popa <pvlad@google.com> Fri Aug 05 17:07:30 2022 +0200
tree 969ba7d0e5e795fddd02169710317b6651fbdaee
parent e2f5aef5b1c0840bd296aac2c00cc136bfca36d2

Report volume shaper mute events

This is now included as part of the playback mute notifications.

Test: run cts-dev -m CtsMediaAudioTestCases -t android.media.audio.cts.AudioPlaybackConfigurationTest
Bug: 235521198
Change-Id: Ide5e61464e5de6729ad9bfb861e930afb1719260

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index f5eed63..745dbf2 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5393,7 +5393,8 @@
                                    mStreamTypes[track->streamType()].volume == 0.f,
                                    mStreamTypes[track->streamType()].mute,
                                    track->isPlaybackRestricted(),
-                                   vlf == 0.f && vrf == 0.f});
+                                   vlf == 0.f && vrf == 0.f,
+                                   vh == 0.f});
 
                 vlf *= volume;
                 vrf *= volume;
@@ -5575,7 +5576,8 @@
                                    mStreamTypes[track->streamType()].volume == 0.f,
                                    mStreamTypes[track->streamType()].mute,
                                    track->isPlaybackRestricted(),
-                                   vlf == 0.f && vrf == 0.f});
+                                   vlf == 0.f && vrf == 0.f,
+                                   vh == 0.f});
 
                 // now apply the master volume and stream type volume and shaper volume
                 vlf *= v * vh;
@@ -6198,7 +6200,8 @@
                        mStreamTypes[track->streamType()].volume == 0.f,
                        mStreamTypes[track->streamType()].mute,
                        track->isPlaybackRestricted(),
-                       clientVolumeMute});
+                       clientVolumeMute,
+                       shaperVolume == 0.f});
 
     if (lastTrack) {
         track->setFinalVolume((left + right) / 2.f);