commit 151a2243e7c3a22dfb177906ad2c2bee8189fe56
author Andy Hung <hunga@google.com> Mon Aug 19 19:03:55 2024 -0700
committer Andy Hung <hunga@google.com> Fri Sep 13 19:12:54 2024 -0700
tree 9b53f07bffeec3e7a449003483f9e2c7c4453e03
parent 3eba089825dc0fc80ef2c56cab50fb0dcf1ebf84

AudioFlinger: Do not create direct secondary output tracks

Test: Live Caption
Flag: EXEMPT bugfix
Bug: 359862350
Merged-In: Ie0b7c1b2a5aaf02f71da7decd0e9df534fdd0a57
Change-Id: Ie0b7c1b2a5aaf02f71da7decd0e9df534fdd0a57

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 2c1976b..537a097 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3948,8 +3948,12 @@
         // TODO: We could check compatibility of the secondaryThread with the PatchTrack
         // for fast usage: thread has fast mixer, sample rate matches, etc.;
         // for now, we exclude fast tracks by removing the Fast flag.
+        constexpr audio_output_flags_t kIncompatiblePatchTrackFlags =
+                static_cast<audio_output_flags_t>(AUDIO_OUTPUT_FLAG_FAST
+                        | AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD);
+
         const audio_output_flags_t outputFlags =
-                (audio_output_flags_t)(track->getOutputFlags() & ~AUDIO_OUTPUT_FLAG_FAST);
+                (audio_output_flags_t)(track->getOutputFlags() & ~kIncompatiblePatchTrackFlags);
         sp<IAfPatchTrack> patchTrack = IAfPatchTrack::create(secondaryThread,
                                                        track->streamType(),
                                                        track->sampleRate(),