openkylin
/
device_google_redfin
mirror of https://gitee.com/openkylin/device_google_redfin.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "audio: update audio_platform and mixer for TTY" into qt-qpr1-dev 

Change-Id: I38d4c9ba2952433845b029ee4645fa1dc3a6800a
This commit is contained in:
TreeHugger Robot 2019-12-09 08:23:07 +00:00 committed by Cyan_Hsieh
parent c18100d69e 66d2cb0952
commit f681a3dbc7
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/audio_platform_info_noextcodec_snd.xml
View File

@ -36,7 +36,7 @@
<device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="98"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" acdb_id="14"/>
<device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" acdb_id="10"/>
<device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="10"/>
<device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="56"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="15"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET" acdb_id="514"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="513"/>
@ -202,7 +202,10 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="QUIN_TDM_RX_0-and-HDMI"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="QUIN_TDM_RX_0-and-DISPLAY_PORT"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="QUIN_TDM_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_USB" backend="usb-headset" interface="USB_AUDIO_RX"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="voice-tty-hco-handset" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_IN_VOICE_TTY_FULL_USB_MIC" backend="usb-headset-mic" interface="USB_AUDIO_TX"/>
<device name="SND_DEVICE_IN_VOICE_TTY_HCO_USB_MIC" backend="usb-headset-mic" interface="USB_AUDIO_TX"/>
<device name="SND_DEVICE_OUT_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HANDSET" interface="QUIN_TDM_RX_0"/>

15
audio/mixer_paths_noextcodec_snd.xml
View File

@ -1457,7 +1457,7 @@
<path name="voicemmode1-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer PRI_TDM_TX_0_MMode1" value="1"/>
</path>
<path name="voicemmode1-call speaker-and-usb-headphones">
@ -1481,7 +1481,7 @@
<path name="voicemmode1-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer PRI_TDM_TX_0_MMode1" value="1" />
</path>
<path name="voicemmode2-call">
@ -1542,7 +1542,7 @@
<path name="voicemmode2-call usb-headphones">
<ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" />
</path>
<path name="voicemmode2-call speaker-and-usb-headphones">
@ -1566,7 +1566,7 @@
<path name="voicemmode2-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode2" value="1" />
</path>
<!-- VoIP Rx settings -->
@ -1951,6 +1951,7 @@
<path name="voice-handset-tmus-hdk">
<path name="handset" />
</path>
<path name="voice-speaker">
<path name="speaker-mono" />
</path>
@ -2244,13 +2245,13 @@
<path name="voice-tty-hco-handset">
<ctl name="TTY Mode" value="HCO" />
<path name="handset" />
<path name="voice-speaker"/>
</path>
<path name="voice-tty-hco-handset-hdk">
<ctl name="TTY Mode" value="HCO" />
<path name="handset" />
<path name="voice-speaker-hdk" />
</path>
<path name="voice-tty-full-headset-mic">
@ -2264,7 +2265,7 @@
</path>
<path name="voice-tty-vco-handset-mic">
<path name="dmic3" />
<path name="voice-speaker-dmic-ef" />
</path>
<path name="unprocessed-handset-mic">