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/service/Spatializer.cpp

diff --git a/services/audiopolicy/service/Spatializer.cpp b/services/audiopolicy/service/Spatializer.cpp
index 90418a5..d550fe5 100644
--- a/services/audiopolicy/service/Spatializer.cpp
+++ b/services/audiopolicy/service/Spatializer.cpp
@@ -394,7 +394,11 @@
         return status;
     }
     for (const auto channelMask : channelMasks) {
-        if (!audio_is_channel_mask_spatialized(channelMask)) {
+        const bool channel_mask_spatialized =
+                com_android_media_audio_stereo_spatialization()
+                ? audio_channel_mask_contains_stereo(channelMask)
+                : audio_is_channel_mask_spatialized(channelMask);
+        if (!channel_mask_spatialized) {
             ALOGW("%s: ignoring channelMask:%#x", __func__, channelMask);
             continue;
         }
@@ -1239,6 +1243,10 @@
     base::StringAppendF(&ss, "%sDisplayOrientation: %f\n", prefixSpace.c_str(),
                         mDisplayOrientation);
 
+    // 4. Show flag or property state.
+    base::StringAppendF(&ss, "%sStereo Spatialization: %s\n", prefixSpace.c_str(),
+            com_android_media_audio_stereo_spatialization() ? "true" : "false");
+
     ss.append(prefixSpace + "CommandLog:\n");
     ss += mLocalLog.dumpToString((prefixSpace + " ").c_str(), mMaxLocalLogLine);