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

Bug: 307842941
Test: manual test
Change-Id: Ic02c3e62af1d92947d2726e9a80777d877997ccb
---
 .../audio_platform_configuration.xml          |  1 +
 audio/comet/aidl_config/mixer_paths_aidl.xml  | 46 +++++++++----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index 34e3872..1ec1521 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -29,6 +29,7 @@
     </feature>
     <feature name="RuntimeTuningDump" />
     <feature name="SoundDose" />
+    <!-- <feature name="spatializer-offload" /> -->
   </features>
 
   <voipVolume>
diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index fa31054..00e64fb 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -875,56 +875,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">