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

Test: Local Test
Bug: 274870625
Change-Id: I850679b60bc523f5e88884729d5439056dcafab3
---
 audio/felix/aidl_config/mixer_paths_aidl.xml | 164 +++++++++++++++++--
 1 file changed, 148 insertions(+), 16 deletions(-)

diff --git a/audio/felix/aidl_config/mixer_paths_aidl.xml b/audio/felix/aidl_config/mixer_paths_aidl.xml
index 8821ce1..65dc7d3 100644
--- a/audio/felix/aidl_config/mixer_paths_aidl.xml
+++ b/audio/felix/aidl_config/mixer_paths_aidl.xml
@@ -388,10 +388,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>
@@ -412,10 +420,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>
@@ -436,10 +452,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>
@@ -465,10 +489,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>
@@ -489,14 +521,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>
@@ -517,10 +565,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>
@@ -541,10 +597,26 @@
     <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 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
+  </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" />
@@ -567,11 +639,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" />
@@ -581,10 +661,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>
@@ -593,10 +681,22 @@
     <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="usb-device-microphones -> voip-capture-0">
+    <path name="usb-microphones -> primary-capture-0" />
+  </path>
+
   <path name="bt-mic -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
@@ -609,10 +709,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>
@@ -639,10 +747,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>
@@ -655,10 +771,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>
@@ -711,10 +835,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>
@@ -896,7 +1028,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" />