From f8f0f81cb11391c6f5eae4713ebf8d6400254042 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Mon, 5 Feb 2024 08:54:29 +0800
Subject: [PATCH] audio: refactor spatializer offload playback

Bug: 307842941
Test: manual test
Change-Id: If958261eaf0b79ee2b9256ab9de79ab2943bf7e5
---
 .../audio_platform_configuration.xml          |  1 +
 audio/husky/aidl_config/mixer_paths_aidl.xml  | 46 +++++++++----------
 .../audio_platform_configuration.xml          |  1 +
 audio/shiba/aidl_config/mixer_paths_aidl.xml  | 46 +++++++++----------
 4 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml
index c7db1ee..4b747bb 100644
--- a/audio/husky/aidl_config/audio_platform_configuration.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration.xml
@@ -27,6 +27,7 @@
       <argument name="ThrottlingSeverity" value="MODERATE" />
     </feature>
     <feature name="RuntimeTuningDump" />
+    <!-- <feature name="spatializer-offload" /> -->
   </features>
 
   <voipVolume>
diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 5f2a320..9aa0c88 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -862,56 +862,56 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback -> speaker">
+  <path name="spatializer-offload-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
-    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  <path name="spatializer-offload-playback-0 -> speaker">
+    <path name="spatializer-offload-playback -> speaker" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
-    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  <path name="spatializer-offload-playback-0 -> speaker-earpiece">
+    <path name="spatializer-offload-playback -> speaker" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
-    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  <path name="spatializer-offload-playback-0 -> speaker-safe">
+    <path name="spatializer-offload-playback -> speaker" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback -> bt">
+  <path name="spatializer-offload-playback -> bt">
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-headset">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-headset">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-speaker">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+  <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
-    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  <path name="spatializer-offload-playback-0 -> usb-headset">
+    <path name="spatializer-offload-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
-    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  <path name="spatializer-offload-playback-0 -> usb-device">
+    <path name="spatializer-offload-playback-0 -> usb" />
   </path>
 
   <path name="haptic-playback -> speaker">
diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml
index c7db1ee..4b747bb 100644
--- a/audio/shiba/aidl_config/audio_platform_configuration.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration.xml
@@ -27,6 +27,7 @@
       <argument name="ThrottlingSeverity" value="MODERATE" />
     </feature>
     <feature name="RuntimeTuningDump" />
+    <!-- <feature name="spatializer-offload" /> -->
   </features>
 
   <voipVolume>
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 5f2a320..9aa0c88 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -862,56 +862,56 @@
     <path name="immersive-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback -> speaker">
+  <path name="spatializer-offload-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> speaker">
-    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  <path name="spatializer-offload-playback-0 -> speaker">
+    <path name="spatializer-offload-playback -> speaker" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
-    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  <path name="spatializer-offload-playback-0 -> speaker-earpiece">
+    <path name="spatializer-offload-playback -> speaker" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
-    <path name="immersive-offloaded-spatializer-playback -> speaker" />
+  <path name="spatializer-offload-playback-0 -> speaker-safe">
+    <path name="spatializer-offload-playback -> speaker" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback -> bt">
+  <path name="spatializer-offload-playback -> bt">
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-headset">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-headset">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-low-energy-speaker">
-    <path name="immersive-offloaded-spatializer-playback -> bt" />
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="spatializer-offload-playback -> bt" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> usb">
+  <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> usb-headset">
-    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  <path name="spatializer-offload-playback-0 -> usb-headset">
+    <path name="spatializer-offload-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
-    <path name="immersive-offloaded-spatializer-playback-0 -> usb" />
+  <path name="spatializer-offload-playback-0 -> usb-device">
+    <path name="spatializer-offload-playback-0 -> usb" />
   </path>
 
   <path name="haptic-playback -> speaker">