Merge "caimito: add incall stream 3 for gsenet uplink" into main

This commit is contained in:
Rios Kao 2024-07-30 02:56:14 +00:00 committed by Android (Google) Code Review
commit 93b0ed7778
3 changed files with 102 additions and 0 deletions

View file

@ -318,6 +318,7 @@
<ctl name="Incall Capture Stream0" value="Off" />
<ctl name="Incall Capture Stream1" value="Off" />
<ctl name="Incall Capture Stream2" value="Off" />
<ctl name="Incall Capture Stream3" value="Off" />
<!-- These two controls control the muting function of mics and sinks during the voice call. -->
<!-- They would be enabled by HAL. -->
@ -1104,6 +1105,39 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="usb-device-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>

View file

@ -318,6 +318,7 @@
<ctl name="Incall Capture Stream0" value="Off" />
<ctl name="Incall Capture Stream1" value="Off" />
<ctl name="Incall Capture Stream2" value="Off" />
<ctl name="Incall Capture Stream3" value="Off" />
<!-- These two controls control the muting function of mics and sinks during the voice call. -->
<!-- They would be enabled by HAL. -->
@ -1104,6 +1105,39 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="usb-device-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>

View file

@ -318,6 +318,7 @@
<ctl name="Incall Capture Stream0" value="Off" />
<ctl name="Incall Capture Stream1" value="Off" />
<ctl name="Incall Capture Stream2" value="Off" />
<ctl name="Incall Capture Stream3" value="Off" />
<!-- These two controls control the muting function of mics and sinks during the voice call. -->
<!-- They would be enabled by HAL. -->
@ -1104,6 +1105,39 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="usb-device-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>