muskie: update audio table

[audio policy]
 i. Fine tune music, alarm, notification and ringtone volume setting for volume listener.
 ii. Fine tune VoIP volume steps in three modes.
[audio platform]
 i. Add gain mapping for volume listener.
 ii. Add USB VoIP SND-device.
[mixer_paths]
 i. Modify audio EC route for VoIP HA&HE

Change-Id: I0c7a505c7b5a6e052a674add5ed610ea87b87014
Signed-off-by: vincent_tew <vincent_tew@htc.com>
This commit is contained in:
vincent_tew
2017-05-15 17:19:52 +08:00
committed by David Lin
parent 9a824ac3a9
commit 0eeab75901
3 changed files with 46 additions and 29 deletions

View File

@@ -48,7 +48,12 @@
<device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" acdb_id="19"/>
<device name="SND_DEVICE_IN_VOICE_TTY_FULL_USB_MIC" acdb_id="16"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_USB" acdb_id="17"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_USB" acdb_id="17"/>
<device name="SND_DEVICE_OUT_VOICE_USB_HEADPHONES" acdb_id="10"/>
<device name="SND_DEVICE_OUT_VOICE_USB_HEADSET" acdb_id="10"/>
<device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC" acdb_id="130 "/>
<device name="SND_DEVICE_IN_VOICE_USB_HEADSET_MIC" acdb_id="8"/>
<device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="143"/>
<device name="SND_DEVICE_IN_VOICE_RECOG_USB_HEADSET_MIC" acdb_id="44"/>
</acdb_ids>
<bit_width_configs>
<device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
@@ -89,5 +94,12 @@
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="voice-tty-hco-handset" interface="QUAT_MI2S_RX"/>
<device name="SND_DEVICE_IN_VOICE_TTY_HCO_USB_MIC" backend="usb-headset-mic" interface="USB_AUDIO_TX"/>
</backend_names>
<gain_db_to_level_mapping>
<gain_level_map db="-8.6" level="4"/>
<gain_level_map db="-6.6" level="3"/>
<gain_level_map db="-4.5" level="2"/>
<gain_level_map db="-2.5" level="1"/>
<gain_level_map db="0" level="0"/>
</gain_db_to_level_mapping>
</audio_platform_info>

View File

@@ -24,25 +24,26 @@ volume index from 0 to 100.
<volumes>
<volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
<point>0,-4200</point>
<point>33,-2800</point>
<point>66,-1400</point>
<point>0,-2900</point>
<point>86,-400</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>0,-2400</point>
<point>33,-1600</point>
<point>66,-800</point>
<point>0,-2000</point>
<point>14,-1650</point>
<point>86,-450</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
<point>0,-2400</point>
<point>33,-1600</point>
<point>66,-800</point>
<point>0,-2650</point>
<point>86,-400</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA">
<point>0,-2900</point>
<point>86,-400</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
<point>1,-3000</point>
<point>33,-2600</point>
@@ -58,9 +59,9 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4000</point>
<point>42,-2710</point>
<point>85,-1620</point>
<point>1,-4680</point>
<point>42,-2070</point>
<point>85,-540</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -70,9 +71,9 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5500</point>
<point>51,-3150</point>
<point>93,-1000</point>
<point>1,-5380</point>
<point>53,-1460,-</point>
<point>93,-210</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -82,10 +83,10 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4400</point>
<point>42,-3110</point>
<point>85,-2020</point>
<point>100,-1600</point>
<point>1,-4680</point>
<point>42,-2070</point>
<point>85,-540</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -94,9 +95,9 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-2970</point>
<point>33,-2010</point>
<point>66,-1020</point>
<point>1,-4680</point>
<point>42,-2070</point>
<point>85,-540</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"

View File

@@ -619,11 +619,15 @@
</path>
<path name="echo-reference handset">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
</path>
<path name="echo-reference headphones">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
<path name="echo-reference usb-headset">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX" />
</path>
<path name="echo-reference usb-headphones">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX" />
</path>
<path name="deep-buffer-playback">
@@ -1845,7 +1849,7 @@
</path>
<path name="incall-rec-downlink">
<ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
<ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
</path>
<path name="incall-rec-downlink bt-sco">