commit ced573023855c47e6139ea590128d0309a4396b4
author Andy Hung <hunga@google.com> Wed Aug 14 11:37:57 2024 -0700
committer Andy Hung <hunga@google.com> Fri Sep 13 19:14:59 2024 -0700
tree 7f8ae2d8f85cff5cbe467b0890eb867522fdd1b8
parent 3eba089825dc0fc80ef2c56cab50fb0dcf1ebf84

AudioPolicyManager: Do not allow secondary outputs with PCM offload

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

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index f36d8d5..d512665 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1251,7 +1251,8 @@
 
     // FIXME: in case of RENDER policy, the output capabilities should be checked
     if ((secondaryMixes != nullptr && !secondaryMixes->empty())
-            && !audio_is_linear_pcm(config->format)) {
+            && (!audio_is_linear_pcm(config->format) ||
+                    *flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD)) {
         ALOGD("%s: rejecting request as secondary mixes only support pcm", __func__);
         return BAD_VALUE;
     }
@@ -7415,7 +7416,8 @@
                     client->getSecondaryOutputs().begin(),
                     client->getSecondaryOutputs().end(),
                     secondaryDescs.begin(), secondaryDescs.end())) {
-                if (!audio_is_linear_pcm(client->config().format)) {
+                if (client->flags() & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD
+                        || !audio_is_linear_pcm(client->config().format)) {
                     // If the format is not PCM, the tracks should be invalidated to get correct
                     // behavior when the secondary output is changed.
                     clientsToInvalidate.push_back(client->portId());