Evolution-X-Devices/device_google_bramble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "audio: update audio table and acdbs" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-06 07:49:46 +00:00
committed by Android (Google) Code Review
parent 1a3a4411e8 c04bed4e3f
commit d5a9ebc808
2 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
audio/audio_platform_info_bolero_snd.xml
View File

@@ -35,8 +35,8 @@
<device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" acdb_id="201"/>
<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_HEADSET" acdb_id="56"/>
<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"/>
@@ -59,7 +59,7 @@
<device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>
<device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>
<device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>
<device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" acdb_id="8"/>
<device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" acdb_id="55"/>
<device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="143"/>
<device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC" acdb_id="8"/>
<device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="512"/>
@@ -67,17 +67,21 @@
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" acdb_id="117"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" acdb_id="109"/>
<device name="SND_DEVICE_IN_USB_HEADSET_MIC" acdb_id="4"/>
<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="4"/>
<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="19"/>
<device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="19"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_SPEAKER" acdb_id="14"/>
<device name="SND_DEVICE_IN_VOICE_TTY_VCO_SPEAKER_MIC" acdb_id="19"/>
<device name="SND_DEVICE_OUT_USB_HEADSET_SPEC" acdb_id="45"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" acdb_id="45"/>
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="44"/>
<device name="SND_DEVICE_IN_CAMCORDER_LANDSCAPE" acdb_id="61"/>
<device name="SND_DEVICE_IN_CAMCORDER_INVERT_LANDSCAPE" acdb_id="62"/>
<device name="SND_DEVICE_IN_CAMCORDER_PORTRAIT" acdb_id="63"/>
<device name="SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE" acdb_id="64"/>
<device name="SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE" acdb_id="65"/>
<device name="SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT" acdb_id="66"/>
<device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" acdb_id="44"/>
<device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" acdb_id="41"/>
<device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="44"/>
</acdb_ids>
<module_ids>
@@ -184,8 +188,17 @@
<device name="SND_DEVICE_OUT_VOICE_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headset" interface="RX_CDC_DMA_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_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_USB" backend="usb-headphones" 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_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_3"/>
<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_VCO_HANDSET_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_TTY_HCO_USB_MIC" backend="usb-headset-mic" interface="USB_AUDIO_TX"/>
<device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="handset" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_HANDSET" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="QUIN_TDM_RX_0"/>
@@ -203,7 +216,6 @@
<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_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"/>
@@ -250,9 +262,6 @@
<device name="SND_DEVICE_IN_VOICE_DMIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_QMIC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC" backend="handset-mic" interface="PRI_TDM_TX_0"/>

52
audio/mixer_paths_bolero_snd.xml
View File

@@ -1460,7 +1460,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">
@@ -1474,7 +1474,7 @@
<path name="voicemmode1-call voice-tty-hco-handset">
<ctl name="QUIN_TDM_RX_0_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1"/>
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
</path>
<path name="voicemmode1-call display-port-and-usb-headset-mic">
@@ -1765,8 +1765,8 @@
</path>
<path name="dmic-endfire">
<ctl name="ADC1 Capture Volume" id="0" value="45"/>
<ctl name="ADC2 Capture Volume" id="0" value="45"/>
<ctl name="ADC1 Capture Volume" id="0" value="47"/>
<ctl name="ADC2 Capture Volume" id="0" value="47"/>
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
</path>
@@ -1871,7 +1871,7 @@
</path>
<path name="handset-mic">
<ctl name="ADC1 Capture Volume" id="0" value="43"/>
<ctl name="ADC1 Capture Volume" id="0" value="23"/>
<ctl name="PRI_TDM_TX_0 Channels" value="One"/>
<ctl name="Stereo1 DMIC Mux" value="DMIC1" />
</path>
@@ -1910,6 +1910,8 @@
<ctl name="HPHR_COMP Switch" value="1" />
<ctl name="HPHL_RDAC Switch" value="1" />
<ctl name="HPHR_RDAC Switch" value="1" />
<ctl name="RX_RX0 Digital Volume" value="74" />
<ctl name="RX_RX1 Digital Volume" value="74" />
</path>
<path name="headphones-44.1">
@@ -1937,12 +1939,23 @@
<path name="headset-mic-liquid">
<path name="amic2" />
</path>
<path name="voice-handset">
<path name="handset" />
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6.5" />
</path>
<path name="voice-handset-tmus">
<path name="handset" />
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6.5" />
</path>
<path name="voice-hac-handset">
<path name="handset" />
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6.5" />
</path>
<path name="voice-handset-hdk">
@@ -1952,8 +1965,9 @@
<path name="voice-handset-tmus-hdk">
<path name="handset" />
</path>
<path name="voice-speaker">
<path name="speaker" />
<path name="speaker-mono" />
</path>
<path name="voice-speaker-stereo">
@@ -1997,7 +2011,9 @@
</path>
<path name="voice-headset-mic">
<path name="headset-mic" />
<path name="amic2" />
<ctl name="ADC2 Volume" value="0" />
<ctl name="TX_DEC0 Volume" value="84" />
</path>
<path name="speaker-and-headphones">
@@ -2042,6 +2058,7 @@
<path name="voice-rec-mic">
<path name="handset-mic" />
<ctl name="ADC1 Capture Volume" id="0" value="53"/>
</path>
<path name="camcorder-mic">
@@ -2081,8 +2098,8 @@
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
<ctl name="ADC1 Capture Volume" id="0" value="45"/>
<ctl name="ADC2 Capture Volume" id="0" value="45"/>
<ctl name="ADC1 Capture Volume" id="0" value="50"/>
<ctl name="ADC2 Capture Volume" id="0" value="50"/>
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
</path>
@@ -2227,11 +2244,18 @@
<path name="tty-headphones">
<ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
<ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
<ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
<ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
<ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
<ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX_COMP1 Switch" value="1" />
<ctl name="RX_COMP2 Switch" value="1" />
<ctl name="HPHL_COMP Switch" value="1" />
<ctl name="HPHR_COMP Switch" value="1" />
<ctl name="HPHL_RDAC Switch" value="1" />
<ctl name="HPHR_RDAC Switch" value="1" />
</path>
<path name="voice-tty-full-headphones">
@@ -2246,13 +2270,13 @@
<path name="voice-tty-hco-handset">
<ctl name="TTY Mode" value="HCO" />
<path name="handset" />
<path name="speaker-mono" />
</path>
<path name="voice-tty-hco-handset-hdk">
<ctl name="TTY Mode" value="HCO" />
<path name="handset" />
<path name="speaker-mono" />
</path>
<path name="voice-tty-full-headset-mic">
@@ -2266,19 +2290,23 @@
</path>
<path name="voice-tty-vco-handset-mic">
<path name="dmic3" />
<path name="voice-speaker-dmic-ef" />
</path>
<path name="unprocessed-handset-mic">
<path name="handset-mic" />
<ctl name="ADC1 Capture Volume" id="0" value="27"/>
</path>
<path name="unprocessed-mic">
<path name="unprocessed-handset-mic" />
<ctl name="ADC1 Capture Volume" id="0" value="27"/>
</path>
<path name="unprocessed-stereo-mic">
<path name="voice-rec-dmic-ef" />
<ctl name="ADC1 Capture Volume" id="0" value="27"/>
<ctl name="ADC2 Capture Volume" id="0" value="27"/>
</path>
<path name="unprocessed-three-mic">