commit 481bfe3ae16c00e43a40261227f46ed2bd56ee6d
author Andy Hung <hunga@google.com> Mon Dec 18 14:00:29 2023 -0800
committer Andy Hung <hunga@google.com> Mon Dec 18 17:16:48 2023 -0800
tree d1a8020bae5097278366796288f99f73b9eb5763
parent 83287b464f7ce2fae411cc0b9ea8f54e778afdc3

AudioPolicy: Add stereo spatialization support

Test: adb shell setprop persist.device_config.aconfig_flags.media_audio.com.android.media.audio.stereo_spatialization true
Test: adb shell pkill audioserver
Test: adb shell dumpsys media.audio_policy
Bug: 303920722
Change-Id: Icb91f84802e8cb62a5c93dcf339fcf51424dd78f

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 7e11204..2e13178 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -41,6 +41,7 @@
 
 #include <Serializer.h>
 #include <android/media/audio/common/AudioPort.h>
+#include <com_android_media_audio.h>
 #include <cutils/bitops.h>
 #include <cutils/properties.h>
 #include <media/AudioParameter.h>
@@ -5970,7 +5971,11 @@
     // some positional channel masks and PCM format
 
     if (config != nullptr && *config != AUDIO_CONFIG_INITIALIZER) {
-        if (!audio_is_channel_mask_spatialized(config->channel_mask)) {
+        const bool channel_mask_spatialized =
+                com_android_media_audio_stereo_spatialization()
+                ? audio_channel_mask_contains_stereo(config->channel_mask)
+                : audio_is_channel_mask_spatialized(config->channel_mask);
+        if (!channel_mask_spatialized) {
             return false;
         }
         if (!audio_is_linear_pcm(config->format)) {