Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[USB Audio AIDL] Add mixer_paths for usb audio." into udc-qpr-dev

Browse source
This commit is contained in:
Joey Poomarin Phloyphisut 2023-08-24 05:49:50 +00:00 • committed by Android (Google) Code Review
commit a5c805dc74
2 changed files with 252 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

152
audio/husky/aidl_config/mixer_paths_aidl.xml
View file

@ -377,10 +377,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>
@ -401,10 +409,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>
@ -425,10 +441,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>
@ -454,10 +478,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>
@ -478,14 +510,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>
@ -506,10 +554,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>
@ -530,10 +586,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" />
@ -556,11 +620,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" />
@ -570,10 +642,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>
@ -582,10 +662,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>
@ -598,10 +686,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>
@ -628,10 +724,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>
@ -644,10 +748,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>
@ -700,10 +812,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>
@ -878,7 +998,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" />

132
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -377,10 +377,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>
@ -401,10 +409,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>
@ -425,10 +441,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>
@ -454,10 +478,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>
@ -478,14 +510,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>
@ -506,10 +554,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>
@ -530,10 +586,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" />
@ -556,11 +620,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" />
@ -570,10 +642,14 @@
<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="microphones -> voip-capture-0">
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
@ -582,10 +658,14 @@
<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="bt-mic -> voip-capture-0">
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
@ -598,10 +678,14 @@
<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="bt-mic -> fast-capture-0">
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
@ -628,10 +712,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>
@ -644,10 +736,14 @@
<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="bt-mic -> voice-call-uplink-0">
<ctl name="EP4 TX Mixer BT_TX" value="1" />
</path>
@ -700,10 +796,14 @@
<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="bt-mic -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
@ -878,7 +978,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" />