commit c9c49cdffb5c344d3ed81f3b4f9575d5b93b83e1
author yucliu <yucliu@google.com> Mon Jul 13 16:25:21 2020 -0700
committer Yuchen Liu <yucliu@google.com> Thu Aug 13 19:08:20 2020 +0000
tree 6edf6d93a7a67eeefe765aa1e1b58097fd13baa2
parent 6559924d9f035c5707a2a2de0d415cd463e4c831

Add flag DIRECT to track flags for track running on DirectOutputThread

If the playback thread is DirectOutputThread, add
AUDIO_OUTPUT_FLAG_DIRECT to the track's flags. This allows HAL to
receive `Flush`, as well as many other control signals, when client
sends the commands.

Bug: 111196161
Test: On device
Change-Id: I48fae1e05cfb7aabf53a050c72ec78d18e478b0a

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 850a8b3..90b59b3 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2356,10 +2356,20 @@
             }
         }
 
+        // Set DIRECT flag if current thread is DirectOutputThread. This can
+        // happen when the playback is rerouted to direct output thread by
+        // dynamic audio policy.
+        // Do NOT report the flag changes back to client, since the client
+        // doesn't explicitly request a direct flag.
+        audio_output_flags_t trackFlags = *flags;
+        if (mType == DIRECT) {
+            trackFlags = static_cast<audio_output_flags_t>(trackFlags | AUDIO_OUTPUT_FLAG_DIRECT);
+        }
+
         track = new Track(this, client, streamType, attr, sampleRate, format,
                           channelMask, frameCount,
                           nullptr /* buffer */, (size_t)0 /* bufferSize */, sharedBuffer,
-                          sessionId, creatorPid, uid, *flags, TrackBase::TYPE_DEFAULT, portId);
+                          sessionId, creatorPid, uid, trackFlags, TrackBase::TYPE_DEFAULT, portId);
 
         lStatus = track != 0 ? track->initCheck() : (status_t) NO_MEMORY;
         if (lStatus != NO_ERROR) {