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

Merge "audio: change in-call-capture paths and remove unused ctls" into 24D1-dev am: f04d29f270

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27018295

Change-Id: Id63d44a1dfbdebacbc01956d062deb48b0d33241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Li 2024-04-23 19:38:35 +00:00 • committed by Automerger Merge Worker
commit 36fa0f3094
3 changed files with 153 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

101
audio/caiman/aidl_config/mixer_paths_aidl.xml
View file

@ -71,8 +71,6 @@
<ctl name="R ASPTX4 Slot Position" value="7" />
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1" />
<ctl name="R VBSTMON Output Switch" value="1" />
<ctl name="DRE DRE Switch" value="1" />
<ctl name="R DRE DRE Switch" value="1" />
@ -144,7 +142,6 @@
<ctl name="TDM_1_RX Mixer EP5" value="0" />
<ctl name="TDM_1_RX Mixer EP6" value="0" />
<ctl name="TDM_1_RX Mixer EP7" value="0" />
<ctl name="TDM_1_RX Mixer EP8" value="0" />
<ctl name="TDM_1_RX Mixer NoHost1" value="0" />
<ctl name="USB_RX Mixer EP1" value="0" />
@ -1226,53 +1223,9 @@
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-0 -> in-call-capture-0" />
<path name="in-call-capture-source-1 -> in-call-capture-1" />
<path name="in-call-capture-source-2 -> in-call-capture-2" />
<!-- codec setting -->
<!-- Rx device -->
@ -1419,6 +1372,54 @@
<path name="usb-microphones" />
</path>
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="in-call-capture-source-0 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="in-call-capture-source-0 (VOICE_CALL)">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="in-call-capture-source-0">
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="in-call-capture-source-1 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="in-call-capture-source-1 (VOICE_CALL)">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="in-call-capture-source-1">
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-2 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="in-call-capture-source-2 (VOICE_CALL)">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="in-call-capture-source-2">
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->

101
audio/komodo/aidl_config/mixer_paths_aidl.xml
View file

@ -71,8 +71,6 @@
<ctl name="R ASPTX4 Slot Position" value="7" />
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1" />
<ctl name="R VBSTMON Output Switch" value="1" />
<ctl name="DRE DRE Switch" value="1" />
<ctl name="R DRE DRE Switch" value="1" />
@ -144,7 +142,6 @@
<ctl name="TDM_1_RX Mixer EP5" value="0" />
<ctl name="TDM_1_RX Mixer EP6" value="0" />
<ctl name="TDM_1_RX Mixer EP7" value="0" />
<ctl name="TDM_1_RX Mixer EP8" value="0" />
<ctl name="TDM_1_RX Mixer NoHost1" value="0" />
<ctl name="USB_RX Mixer EP1" value="0" />
@ -1226,53 +1223,9 @@
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-0 -> in-call-capture-0" />
<path name="in-call-capture-source-1 -> in-call-capture-1" />
<path name="in-call-capture-source-2 -> in-call-capture-2" />
<!-- codec setting -->
<!-- Rx device -->
@ -1419,6 +1372,54 @@
<path name="usb-microphones" />
</path>
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="in-call-capture-source-0 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="in-call-capture-source-0 (VOICE_CALL)">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="in-call-capture-source-0">
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="in-call-capture-source-1 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="in-call-capture-source-1 (VOICE_CALL)">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="in-call-capture-source-1">
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-2 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="in-call-capture-source-2 (VOICE_CALL)">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="in-call-capture-source-2">
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->

101
audio/tokay/aidl_config/mixer_paths_aidl.xml
View file

@ -71,8 +71,6 @@
<ctl name="R ASPTX4 Slot Position" value="7" />
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1" />
<ctl name="R VBSTMON Output Switch" value="1" />
<ctl name="DRE DRE Switch" value="1" />
<ctl name="R DRE DRE Switch" value="1" />
@ -144,7 +142,6 @@
<ctl name="TDM_1_RX Mixer EP5" value="0" />
<ctl name="TDM_1_RX Mixer EP6" value="0" />
<ctl name="TDM_1_RX Mixer EP7" value="0" />
<ctl name="TDM_1_RX Mixer EP8" value="0" />
<ctl name="TDM_1_RX Mixer NoHost1" value="0" />
<ctl name="USB_RX Mixer EP1" value="0" />
@ -1226,53 +1223,9 @@
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="telephony-rx -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-0 -> in-call-capture-0" />
<path name="in-call-capture-source-1 -> in-call-capture-1" />
<path name="in-call-capture-source-2 -> in-call-capture-2" />
<!-- codec setting -->
<!-- Rx device -->
@ -1419,6 +1372,54 @@
<path name="usb-microphones" />
</path>
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="in-call-capture-source-0 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="in-call-capture-source-0 (VOICE_CALL)">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="in-call-capture-source-0">
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="in-call-capture-source-1 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="in-call-capture-source-1 (VOICE_CALL)">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="in-call-capture-source-1">
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-2 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="in-call-capture-source-2 (VOICE_CALL)">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="in-call-capture-source-2">
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->