From 58e244807730752fa8e54585cfa1f2307024fde7 Mon Sep 17 00:00:00 2001
From: Poomarin Phloyphisut <poomarin@google.com>
Date: Thu, 17 Aug 2023 07:19:42 +0000
Subject: [PATCH] [USB Audio AIDL] Add mixer_paths for usb audio.

Test: Local Test
Bug: 274870625
Change-Id: I84c90997818bd3da33a09218c84222ebaa244bed
---
 .../cheetah/aidl_config/mixer_paths_aidl.xml  | 152 ++++++++++++++++--
 .../panther/aidl_config/mixer_paths_aidl.xml  | 152 ++++++++++++++++--
 2 files changed, 272 insertions(+), 32 deletions(-)

diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
index 17a52c2..ad7aec5 100644
--- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml
+++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
@@ -376,10 +376,18 @@
     <ctl name="BT_RX Mixer EP2" value="1" />
   </path>
 
-  <path name="primary-playback -> usb-headset">
+  <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
 
+  <path name="primary-playback-0 -> usb-headset">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
+  <path name="primary-playback-0 -> usb-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -400,10 +408,18 @@
     <ctl name="BT_RX Mixer RAW" value="1" />
   </path>
 
-  <path name="raw-playback -> usb-headset">
+  <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
 
+  <path name="raw-playback-0 -> usb-headset">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
+  <path name="raw-playback-0 -> usb-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -424,10 +440,18 @@
     <ctl name="BT_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playback -> usb-headset">
+  <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> usb-headset">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> usb-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -453,10 +477,18 @@
     <ctl name="BT_RX Mixer EP7" value="1" />
   </path>
 
-  <path name="compress-offload-playback -> usb-headset">
+  <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
 
+  <path name="compress-offload-playback-0 -> usb-headset">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> usb-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -477,14 +509,30 @@
     <ctl name="BT_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="mmap-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="hifi-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb-headset">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="mmap-playback-0 -> usb-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
 
+  <path name="hifi-playback-0 -> usb-headset">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb-device">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
   <path name="voip-playback -> speaker">
     <ctl name="TDM_0_RX Mixer VOIP" value="1" />
   </path>
@@ -505,10 +553,18 @@
     <ctl name="BT_RX Mixer VOIP" value="1" />
   </path>
 
-  <path name="voip-playback -> usb-headset">
+  <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
 
+  <path name="voip-playback-0 -> usb-headset">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
+  <path name="voip-playback-0 -> usb-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -529,10 +585,18 @@
     <ctl name="BT_RX Mixer IMSV" value="1" />
   </path>
 
-  <path name="immersive-playback -> usb-headset">
+  <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
 
+  <path name="immersive-playback-0 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -555,11 +619,19 @@
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
-  <path name="haptic-playback -> usb-headset">
+  <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
+  <path name="haptic-playback-0 -> usb-headset">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
+  <path name="haptic-playback-0 -> usb-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
@@ -569,10 +641,18 @@
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> primary-capture-0">
+  <path name="usb-microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> primary-capture-0">
+    <path name="usb-microphones-> primary-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> primary-capture-0">
+    <path name="usb-microphones -> primary-capture-0" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -581,10 +661,18 @@
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voip-capture-0">
+  <path name="usb-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
   <path name="bt-mic -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
@@ -597,10 +685,18 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> fast-capture-0">
+  <path name="usb-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
   <path name="bt-mic -> fast-capture-0">
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
@@ -627,10 +723,18 @@
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-call-downlink-0 -> usb-headphone">
+  <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
 
+  <path name="voice-call-downlink-0 -> usb-headset">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> usb-device">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
   <path name="voice-call-downlink-0 -> null-sink">
     <ctl name="INCALL_RX Mixer EP5" value="1" />
   </path>
@@ -643,10 +747,18 @@
     <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voice-call-uplink-0">
+  <path name="usb-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
   <path name="bt-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
@@ -699,10 +811,18 @@
     <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> mmap-capture-0">
+  <path name="usb-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
   <path name="bt-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
@@ -876,7 +996,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="usb-headset-mic">
+  <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml
index 17a52c2..ad7aec5 100644
--- a/audio/panther/aidl_config/mixer_paths_aidl.xml
+++ b/audio/panther/aidl_config/mixer_paths_aidl.xml
@@ -376,10 +376,18 @@
     <ctl name="BT_RX Mixer EP2" value="1" />
   </path>
 
-  <path name="primary-playback -> usb-headset">
+  <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
 
+  <path name="primary-playback-0 -> usb-headset">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
+  <path name="primary-playback-0 -> usb-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -400,10 +408,18 @@
     <ctl name="BT_RX Mixer RAW" value="1" />
   </path>
 
-  <path name="raw-playback -> usb-headset">
+  <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
 
+  <path name="raw-playback-0 -> usb-headset">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
+  <path name="raw-playback-0 -> usb-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -424,10 +440,18 @@
     <ctl name="BT_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playback -> usb-headset">
+  <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> usb-headset">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> usb-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -453,10 +477,18 @@
     <ctl name="BT_RX Mixer EP7" value="1" />
   </path>
 
-  <path name="compress-offload-playback -> usb-headset">
+  <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
 
+  <path name="compress-offload-playback-0 -> usb-headset">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> usb-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -477,14 +509,30 @@
     <ctl name="BT_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="mmap-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="hifi-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb-headset">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="mmap-playback-0 -> usb-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
 
+  <path name="hifi-playback-0 -> usb-headset">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb-device">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
   <path name="voip-playback -> speaker">
     <ctl name="TDM_0_RX Mixer VOIP" value="1" />
   </path>
@@ -505,10 +553,18 @@
     <ctl name="BT_RX Mixer VOIP" value="1" />
   </path>
 
-  <path name="voip-playback -> usb-headset">
+  <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
 
+  <path name="voip-playback-0 -> usb-headset">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
+  <path name="voip-playback-0 -> usb-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -529,10 +585,18 @@
     <ctl name="BT_RX Mixer IMSV" value="1" />
   </path>
 
-  <path name="immersive-playback -> usb-headset">
+  <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
 
+  <path name="immersive-playback-0 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -555,11 +619,19 @@
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
-  <path name="haptic-playback -> usb-headset">
+  <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
+  <path name="haptic-playback-0 -> usb-headset">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
+  <path name="haptic-playback-0 -> usb-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
@@ -569,10 +641,18 @@
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> primary-capture-0">
+  <path name="usb-microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> primary-capture-0">
+    <path name="usb-microphones-> primary-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> primary-capture-0">
+    <path name="usb-microphones -> primary-capture-0" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -581,10 +661,18 @@
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voip-capture-0">
+  <path name="usb-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
   <path name="bt-mic -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
@@ -597,10 +685,18 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> fast-capture-0">
+  <path name="usb-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
   <path name="bt-mic -> fast-capture-0">
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
@@ -627,10 +723,18 @@
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-call-downlink-0 -> usb-headphone">
+  <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
 
+  <path name="voice-call-downlink-0 -> usb-headset">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> usb-device">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
   <path name="voice-call-downlink-0 -> null-sink">
     <ctl name="INCALL_RX Mixer EP5" value="1" />
   </path>
@@ -643,10 +747,18 @@
     <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voice-call-uplink-0">
+  <path name="usb-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
   <path name="bt-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
@@ -699,10 +811,18 @@
     <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> mmap-capture-0">
+  <path name="usb-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
   <path name="bt-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
@@ -876,7 +996,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="usb-headset-mic">
+  <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />