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" into qt-qpr1-dev am: 628113d58f

Browse Source 
Change-Id: I230a7cafaf061752bc3173f054fa6dc49aa11479
This commit is contained in:
Automerger Merge Worker
2020-01-21 06:33:42 +00:00
parent 7e7f4cf5b0 628113d58f
commit f86ff779eb
8 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
audio/acdbdata/Bluetooth_cal.acdb
View File

Binary file not shown.

BIN
audio/acdbdata/Global_cal.acdb
View File

Binary file not shown.

BIN
audio/acdbdata/Handset_cal.acdb
View File

Binary file not shown.

BIN
audio/acdbdata/Headset_cal.acdb
View File

Binary file not shown.

BIN
audio/acdbdata/Speaker_cal.acdb
View File

Binary file not shown.

BIN
audio/acdbdata/workspaceFile.qwsp
View File

Binary file not shown.

18
audio/audio_platform_info_bolero_snd.xml
View File

@@ -61,10 +61,10 @@
<device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>
<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_USB_HEADSET_MIC_AEC" acdb_id="55"/>
<device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="512"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" acdb_id="111"/>
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" acdb_id="117"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" acdb_id="41"/>
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" acdb_id="19"/>
<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="19"/>
@@ -82,6 +82,9 @@
<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"/>
<device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="4"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" acdb_id="34"/>
<device name="SND_DEVICE_OUT_VOICE_HEADSET" acdb_id="45"/>
</acdb_ids>
<module_ids>
@@ -184,7 +187,7 @@
<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES" backend="speaker-and-headphones" interface="QUIN_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE" backend="speaker-and-headphones" interface="QUIN_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET" backend="speaker-and-usb-headphones" interface="QUIN_TDM_RX_0-and-USB_AUDIO_RX"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<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"/>
@@ -199,18 +202,19 @@
<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_IN_HANDSET_DMIC_STEREO" backend="handset-mic" interface="PRI_TDM_TX_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_SAFE" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_SAFE" backend="speaker" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="QUIN_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="QUIN_TDM_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_2" interface="QUIN_TDM_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT" interface="QUIN_TDM_RX_0"/>

28
audio/mixer_paths_bolero_snd.xml
View File

@@ -527,8 +527,8 @@
<ctl name="R ASP TX4 Source" value="Zero" />
<!-- CS35L41 TX source end -->
<!-- CS35L41 TX slot(to QCT ADSP) -->
<ctl name="ASPTX1 Slot Position" value="0" />
<ctl name="R ASPTX1 Slot Position" value="1" />
<ctl name="ASPTX1 Slot Position" value="1" />
<ctl name="R ASPTX1 Slot Position" value="0" />
<ctl name="ASPTX2 Slot Position" value="4" />
<ctl name="R ASPTX2 Slot Position" value="5" />
<ctl name="ASPTX3 Slot Position" value="2" />
@@ -1413,6 +1413,7 @@
</path>
<path name="voicemmode1-call speaker">
<ctl name="VOC_EXT_EC MUX" value="QUIN_TDM_TX" />
<ctl name="QUIN_TDM_RX_0_Voice Mixer VoiceMMode1" value="1"/>
<ctl name="VoiceMMode1_Tx Mixer PRI_TDM_TX_0_MMode1" value="1"/>
</path>
@@ -1765,8 +1766,8 @@
</path>
<path name="dmic-endfire">
<ctl name="ADC1 Capture Volume" id="0" value="47"/>
<ctl name="ADC2 Capture Volume" id="0" value="47"/>
<ctl name="ADC1 Capture Volume" id="0" value="55"/>
<ctl name="ADC2 Capture Volume" id="0" value="55"/>
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
@@ -1949,19 +1950,19 @@
<path name="voice-handset">
<path name="handset" />
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6.5" />
<ctl name="AMP PCM Gain" value="8" />
</path>
<path name="voice-handset-tmus">
<path name="handset" />
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6.5" />
<ctl name="AMP PCM Gain" value="8" />
</path>
<path name="voice-hac-handset">
<path name="handset" />
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6.5" />
<ctl name="AMP PCM Gain" value="6" />
</path>
<path name="voice-handset-hdk">
@@ -2018,7 +2019,7 @@
<path name="voice-headset-mic">
<path name="amic2" />
<ctl name="ADC2 Volume" value="0" />
<ctl name="ADC2 Volume" value="12" />
<ctl name="TX_DEC0 Volume" value="84" />
</path>
@@ -2114,11 +2115,10 @@
</path>
<path name="speaker-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 Channel Offset" id="0" value="8" />
<ctl name="PRI TDM TX Channel Offset" id="1" value="0" />
<ctl name="PRI TDM TX Channel Offset" id="2" value="12" />
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
@@ -2272,6 +2272,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="79" />
<ctl name="RX_RX1 Digital Volume" value="79" />
</path>
<path name="voice-tty-full-headphones">
@@ -2297,8 +2299,8 @@
<path name="voice-tty-full-headset-mic">
<path name="amic2" />
<ctl name="ADC2 Volume" value="0" />
<ctl name="TX_DEC0 Volume" value="84" />
<ctl name="ADC2 Volume" value="12" />
<ctl name="TX_DEC0 Volume" value="88" />
</path>
<path name="voice-tty-hco-headset-mic">