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

Merge "audio: add immersive-offloaded-spatializer-playback using EP4" into main

Browse source
This commit is contained in:
David Li 2023-12-21 06:11:58 +00:00 • committed by Android (Google) Code Review
commit df056c2d35
2 changed files with 106 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -830,6 +830,54 @@
<path name="immersive-playback-0 -> usb" />
</path>
<path name="immersive-offloaded-spatializer-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>
<path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
<path name="immersive-offloaded-spatializer-playback -> speaker" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
<path name="immersive-offloaded-spatializer-playback -> speaker" />
</path>
<path name="immersive-offloaded-spatializer-playback -> bt">
<ctl name="BT_RX Mixer EP4" value="1" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bt">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-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>
<path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
<path name="immersive-offloaded-spatializer-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" />
@ -986,14 +1034,11 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> sound-trigger-capture-0">
</path>
<path name="microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0">
</path>
<path name="microphones -> sound-trigger-tap-capture-0" />
<path name="microphones -> hotword-lookback-capture-0">
</path>
<path name="microphones -> hotword-lookback-capture-0" />
<!-- voice-call dynamic route -->
<path name="voice-call-downlink-0 -> speaker">
@ -1167,7 +1212,6 @@
<path name="speaker (VOICE)">
<ctl name="ASPTX1 Slot Position" value="1" />
<ctl name="R ASPTX1 Slot Position" value="0" />
<!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR -->

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

@ -830,6 +830,54 @@
<path name="immersive-playback-0 -> usb" />
</path>
<path name="immersive-offloaded-spatializer-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>
<path name="immersive-offloaded-spatializer-playback-0 -> speaker-earpiece">
<path name="immersive-offloaded-spatializer-playback -> speaker" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> speaker-safe">
<path name="immersive-offloaded-spatializer-playback -> speaker" />
</path>
<path name="immersive-offloaded-spatializer-playback -> bt">
<ctl name="BT_RX Mixer EP4" value="1" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bt">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-device">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-headphone">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-playback-0 -> bluetooth-a2dp-speaker">
<path name="immersive-offloaded-spatializer-playback -> bt" />
</path>
<path name="immersive-offloaded-spatializer-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>
<path name="immersive-offloaded-spatializer-playback-0 -> usb-device">
<path name="immersive-offloaded-spatializer-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" />
@ -986,14 +1034,11 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> sound-trigger-capture-0">
</path>
<path name="microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0">
</path>
<path name="microphones -> sound-trigger-tap-capture-0" />
<path name="microphones -> hotword-lookback-capture-0">
</path>
<path name="microphones -> hotword-lookback-capture-0" />
<!-- voice-call dynamic route -->
<path name="voice-call-downlink-0 -> speaker">
@ -1167,7 +1212,6 @@
<path name="speaker (VOICE)">
<ctl name="ASPTX1 Slot Position" value="1" />
<ctl name="R ASPTX1 Slot Position" value="0" />
<!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR -->