commit f722f8bfbb917f86b8f1453dbb81c72b35280046
author Andy Hung <hunga@google.com> Mon Sep 16 22:09:55 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 16 22:09:55 2024 +0000
tree a3b9c9cf91b26d136bc11fe77537c064c02e54c0
parent 55dfef53d38f8b1223cfbb617b45795fdae1d3eb
parent 151a2243e7c3a22dfb177906ad2c2bee8189fe56

Merge "AudioFlinger: Do not create direct secondary output tracks" into main

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(),