Google GitGoogle Git
Sign in
android/device/google/bramble/9963b95^!/.
commit
9963b9542f94ce7304cb5e0f468f8d6125947673
[log]
author
vincenttew <vincenttew@google.com>
Thu Jan 16 11:12:05 2020 +0800
committer
vincenttew <vincenttew@google.com>
Fri Jan 17 10:55:25 2020 +0800
tree
b2d5283663a9df74d186e43c7c6e82025fc53795
parent
4bdf805eaca0a3c59542d1901b1fd1a69b205a4b [diff]
audio: update audio table

Change list:
[Platform]
1.Modify VoIP USB headset ID
2.Modify ringtone
3.Modify mono recording
4.Modify stereo recording
5.Modify ACDB ID of VoIP and Modify backend

[Mixer]
1.Modify the Voicemmode1-call speaker
2.Modify the dmic-endfire gain from 47 to 55
3.Modify voice-handset PCM gain from 6.5 to 8
voice-handset-tmus PCM gain  from 6.5 to 8
voice-hac-handset PCM gain from 6.5 to 6
4.Modify voice-headset-mic ADC volume from 0 to 12
5.Modify speaker-dmic-endfire ADC volume from 45 to 47
6.Modify TTY-headphones gain digital volume to 79
7.Modify voice-tty-full-headset-mic
8.Modify the path of echo reference

[ACDB]
1.Add TTY parameters
2.Add parameters of speaker phone
3.Modify handsfree
4.Add sampling rate at the ringtone

Bug: 147726600
Test: build pass
Change-Id: I4132e9e03bd021a8ee18852c152cc1be013dd810
Signed-off-by: vincenttew <vincenttew@google.com>

diff --git a/audio/acdbdata/Bluetooth_cal.acdb b/audio/acdbdata/Bluetooth_cal.acdb
index 6a0aa6c..22faade 100644
--- a/audio/acdbdata/Bluetooth_cal.acdb
+++ b/audio/acdbdata/Bluetooth_cal.acdb
Binary files differ

diff --git a/audio/acdbdata/Global_cal.acdb b/audio/acdbdata/Global_cal.acdb
index 4eb8f15..904c040 100644
--- a/audio/acdbdata/Global_cal.acdb
+++ b/audio/acdbdata/Global_cal.acdb
Binary files differ

diff --git a/audio/acdbdata/Handset_cal.acdb b/audio/acdbdata/Handset_cal.acdb
index e71b948..9914ece 100644
--- a/audio/acdbdata/Handset_cal.acdb
+++ b/audio/acdbdata/Handset_cal.acdb
Binary files differ

diff --git a/audio/acdbdata/Headset_cal.acdb b/audio/acdbdata/Headset_cal.acdb
index 2690528..43f735d 100644
--- a/audio/acdbdata/Headset_cal.acdb
+++ b/audio/acdbdata/Headset_cal.acdb
Binary files differ

diff --git a/audio/acdbdata/Speaker_cal.acdb b/audio/acdbdata/Speaker_cal.acdb
index 003ecda..d663950 100644
--- a/audio/acdbdata/Speaker_cal.acdb
+++ b/audio/acdbdata/Speaker_cal.acdb
Binary files differ

diff --git a/audio/acdbdata/workspaceFile.qwsp b/audio/acdbdata/workspaceFile.qwsp
index 1af0e20..ba68fab 100644
--- a/audio/acdbdata/workspaceFile.qwsp
+++ b/audio/acdbdata/workspaceFile.qwsp
Binary files differ

diff --git a/audio/audio_platform_info_bolero_snd.xml b/audio/audio_platform_info_bolero_snd.xml
index 57ff512..514779a 100644
--- a/audio/audio_platform_info_bolero_snd.xml
+++ b/audio/audio_platform_info_bolero_snd.xml

@@ -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"/>

diff --git a/audio/mixer_paths_bolero_snd.xml b/audio/mixer_paths_bolero_snd.xml
index d5ae2af..3885e7d 100644
--- a/audio/mixer_paths_bolero_snd.xml
+++ b/audio/mixer_paths_bolero_snd.xml

@@ -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"/>
     </path>
 
@@ -1943,19 +1944,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">
@@ -2012,7 +2013,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>
 
@@ -2104,11 +2105,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"/>
     </path>
 
@@ -2256,6 +2256,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">
@@ -2281,8 +2283,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">