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

audio: add echo reference input am: 564914bd1b

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

Change-Id: Ib341441491ce85f4da5f51e86d46ee220a47d12a
This commit is contained in:
Carter Hsu 2021-06-22 12:30:10 +00:00 • committed by Automerger Merge Worker
commit b9fecd5107
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
audio/oriole/config/audio_policy_configuration.xml
View file

@ -22,6 +22,7 @@
<item>Built-In Mic</item> <item>Built-In Mic</item>
<item>Telephony Tx</item> <item>Telephony Tx</item>
<item>Voice Call And Telephony Rx</item> <item>Voice Call And Telephony Rx</item>
<item>Echo Ref In</item>
</attachedDevices> </attachedDevices>
<defaultOutputDevice>Speaker</defaultOutputDevice> <defaultOutputDevice>Speaker</defaultOutputDevice>
<mixPorts> <mixPorts>
@ -114,6 +115,11 @@
</mixPort> </mixPort>
<mixPort name="hifi_playback" role="source" /> <mixPort name="hifi_playback" role="source" />
<mixPort name="hifi_input" role="sink" /> <mixPort name="hifi_input" role="sink" />
<mixPort name="echo_ref_input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
</mixPorts> </mixPorts>
<devicePorts> <devicePorts>
<!-- Output devices declaration, i.e. Sink DEVICE PORT --> <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
@ -172,6 +178,8 @@
<!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value --> <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value -->
<devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source"> <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
</devicePort> </devicePort>
<devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
</devicePort>
</devicePorts> </devicePorts>
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
@ -211,6 +219,7 @@
<route type="mix" sink="mmap_no_irq_in" <route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,USB Device In,USB Headset In"/> sources="Built-In Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
</routes> </routes>
</module> </module>
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->

9
audio/raven/config/audio_policy_configuration.xml
View file

@ -22,6 +22,7 @@
<item>Built-In Mic</item> <item>Built-In Mic</item>
<item>Telephony Tx</item> <item>Telephony Tx</item>
<item>Voice Call And Telephony Rx</item> <item>Voice Call And Telephony Rx</item>
<item>Echo Ref In</item>
</attachedDevices> </attachedDevices>
<defaultOutputDevice>Speaker</defaultOutputDevice> <defaultOutputDevice>Speaker</defaultOutputDevice>
<mixPorts> <mixPorts>
@ -114,6 +115,11 @@
</mixPort> </mixPort>
<mixPort name="hifi_playback" role="source" /> <mixPort name="hifi_playback" role="source" />
<mixPort name="hifi_input" role="sink" /> <mixPort name="hifi_input" role="sink" />
<mixPort name="echo_ref_input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
</mixPorts> </mixPorts>
<devicePorts> <devicePorts>
<!-- Output devices declaration, i.e. Sink DEVICE PORT --> <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
@ -172,6 +178,8 @@
<!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value --> <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value -->
<devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source"> <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
</devicePort> </devicePort>
<devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
</devicePort>
</devicePorts> </devicePorts>
<!-- route declaration, i.e. list all available sources for a given sink --> <!-- route declaration, i.e. list all available sources for a given sink -->
<routes> <routes>
@ -211,6 +219,7 @@
<route type="mix" sink="mmap_no_irq_in" <route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,USB Device In,USB Headset In"/> sources="Built-In Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
<route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
</routes> </routes>
</module> </module>
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->