land: update audio configs from LA.UM.5.6.c1-02300-8x37.0

Change-Id: I252e703479d8d108a0159a7bbc92a28d88747666
This commit is contained in:
Prateek Chaubey 2018-02-10 07:11:24 +01:00
parent 0747b0f1c2
commit 8c89e7023a
7 changed files with 72 additions and 54 deletions

View file

@ -42,7 +42,7 @@ libraries {
audio_pre_processing {
path /system/lib/soundfx/libqcomvoiceprocessing.so
}
# bug 156482 add dirac effect start
#add dirac effect bug 156518
loudness_enhancer {
path /system/lib/soundfx/libldnhncr.so
}
@ -53,7 +53,6 @@ libraries {
path /system/lib/soundfx/libdirac.so
}
}
# bug 156482 add dirac effect end
# Default pre-processing library. Add to audio_effect.conf "libraries" section if
# audio HAL implements support for default software audio pre-processing effects
@ -232,7 +231,7 @@ effects {
library audio_pre_processing
uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
}
# bug 156482 add dirac effect start
#bug 156518 add dirac effect
music_helper {
library volume_listener
uuid 08b8b058-0590-11e5-ac71-0025b32654a0
@ -345,7 +344,6 @@ global_processing {
}
}
}
# bug 156482 add dirac effect end
# Default pre-processing effects. Add to audio_effect.conf "effects" section if
# audio HAL implements support for them.
#

View file

@ -32,23 +32,30 @@ outputs {
bit_width 16
app_type 69936
}
direct_pcm {
direct_pcm_16 {
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM
formats AUDIO_FORMAT_PCM_16_BIT
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
sampling_rates 44100|48000|96000|192000
bit_width 16
app_type 69936
}
direct_pcm_24 {
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM
formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
sampling_rates 44100|48000|96000|192000
bit_width 24
app_type 69940
}
compress_offload_16 {
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2
sampling_rates 44100|48000
formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2
sampling_rates 44100|48000|96000|192000
bit_width 16
app_type 69936
}
compress_offload_24 {
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS
formats AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS
sampling_rates 44100|48000|96000|192000
bit_width 24
app_type 69940

View file

@ -60,4 +60,3 @@
<device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="137"/>
</acdb_ids>
</audio_platform_info>

View file

@ -57,14 +57,14 @@ audio_hw_modules {
direct_pcm {
sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000
channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1
formats AUDIO_FORMAT_PCM_16_BIT
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM
}
compress_offload {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000
channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1
formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2
formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2
devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
}
@ -98,7 +98,7 @@ audio_hw_modules {
}
surround_sound {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_IN_5POINT1
channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_INDEX_MASK_3|AUDIO_CHANNEL_INDEX_MASK_4|AUDIO_CHANNEL_IN_5POINT1
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC
}

View file

@ -206,6 +206,7 @@
<ctl name="MI2S_DL_HL Switch" value="1" />
<ctl name="MultiMedia1 Mixer INTERNAL_FM_TX" value="0" />
<ctl name="MultiMedia2 Mixer INTERNAL_FM_TX" value="0" />
<ctl name="MultiMedia5 Mixer INTERNAL_FM_TX" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
<!-- fm end -->
@ -485,8 +486,6 @@
</path>
<path name="voice-call">
<ctl name="DEC1 Volume" value="84" />
<ctl name="DEC2 Volume" value="84" />
<ctl name="PRI_MI2S_RX_Voice Mixer CSVoice" value="1" />
<ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="1" />
</path>
@ -913,8 +912,6 @@
<path name="handset-mic">
<path name="adc1" />
<ctl name="DEC1 Volume" value="86" />
<ctl name="DEC2 Volume" value="86" />
<ctl name="IIR1 INP1 MUX" value="DEC1" />
</path>
@ -1053,8 +1050,17 @@
<path name="dmic-endfire" />
</path>
<path name="dmic-endfire-invert">
<ctl name="DEC2 MUX" value="ADC1"/>
<ctl name="DEC1 MUX" value="ADC2"/>
<ctl name="MI2S_TX Channels" value="Two" />
<ctl name="ADC2 MUX" value="INP3" />
<ctl name="ADC1 Volume" value="6" />
<ctl name="ADC3 Volume" value="6" />
</path>
<path name="voice-speaker-dmic-ef">
<path name="dmic-endfire" />
<path name="dmic-endfire-invert" />
</path>
<path name="voice-rec-dmic-ef">
@ -1066,8 +1072,6 @@
</path>
<path name="handset-stereo-dmic-ef">
<ctl name="DEC1 Volume" value="84" />
<ctl name="DEC2 Volume" value="84" />
<path name="speaker-dmic-endfire" />
</path>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--- Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. -->
<!--- Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@ -26,35 +26,47 @@
<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<sound_trigger_platform_info>
<device name="DEVICE_HANDSET_APE_ACDB_ID" value="130" />
<device name="DEVICE_HANDSET_CPE_ACDB_ID" value="128" />
<ctrl name="execution_type" value="APE" /> <!-- value: "CPE" "APE" -->
<ctrl name="max_cpe_sessions" value="1" />
<ctrl name="max_ape_sessions" value="5" />
<ctrl name="enable_failure_detection" value="false" />
<ctrl name="rx_concurrency_disabled" value="true" />
<ctrl name="rx_conc_max_st_ses" value="1" />
<param version="0x0101" /> <!-- this must be the first param -->
<common_config>
<param execution_type="APE" /> <!-- value: "CPE" "APE" -->
<param max_cpe_sessions="1" />
<param max_ape_sessions="5" />
<param enable_failure_detection="false" />
<param rx_concurrency_disabled="true" />
<param rx_conc_max_st_ses="1" />
</common_config>
<acdb_ids>
<param DEVICE_HANDSET_APE_ACDB_ID="130" />
<param DEVICE_HANDSET_CPE_ACDB_ID="128" />
<param DEVICE_HANDSET_CPE_ECPP_ACDB_ID="128" />
</acdb_ids>
<!-- Multiple sound_model_config tags can be listed, each with unique -->
<!-- vendor_uuid. The below tag represents QTI SVA engine sound model -->
<!-- configuration. ISV must use their own unique vendor_uuid. -->
<sound_model_config>
<param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
<param app_type="2" /> <!-- app type used in ACDB -->
<param library="libsmwrapper.so" />
<param max_cpe_phrases="6" />
<param max_cpe_users="3" />
<param max_ape_phrases="10" />
<param max_ape_users="10" />
<param sample_rate="16000" />
<!-- Module and param ids with which the algorithm is integrated in firmware -->
<param load_sound_model_ids="0x00012C0D, 0x00012C14" />
<param unload_sound_model_ids="0x00012C0D, 0x00012C15" />
<param confidence_levels_ids="0x00012C0D, 0x00012C07" />
<param operation_mode_ids="0x00012C0D, 0x00012C02" />
<!-- vendor_uuid for a soundmodel. More than one vendor_uuid tags can be -->
<!-- listed in sequence, the below vendor uuid is reserved for Qualcomm -->
<!-- module. ISV must use their own unique vendor uuid. app_type, -->
<!-- module_id, param_id must match to the calibration database -->
<!-- If ISV vendor_uuid is present, execution_type will be forced to APE -->
<vendor_uuid value="68ab2d40-e860-11e3-95ef-0002a5d5c51b" app_type="2" library="libsmwrapper.so">
<!-- format: "ADPCM_packet" or "PCM_packet" !-->
<!-- transfer_mode: "FTRT" or "RT" -->
<!-- kw_duration is in milli seconds. It is valid only for FTRT transfer mode -->
<capture_keyword format="PCM_packet" transfer_mode="RT" kw_duration="2000" />
<param_type name="load_sound_model" module_id="0x00012C0D" param_id="0x00012C14"/>
<param_type name="unload_sound_model" module_id="0x00012C0D" param_id="0x00012C15"/>
<param_type name="confidence_levels" module_id="0x00012C0D" param_id="0x00012C07"/>
<param_type name="operation_mode" module_id="0x00012C0D" param_id="0x00012C02"/>
<ctrl name="max_cpe_phrases" value="6" />
<ctrl name="max_cpe_users" value="3" />
<ctrl name="max_ape_phrases" value="10" />
<ctrl name="max_ape_users" value="10" />
<ctrl name="client_capture_read_delay" value="2000" /> <!-- in milli seconds -->
</vendor_uuid>
<param capture_keyword="PCM_packet, RT, 2000" />
<param client_capture_read_delay="2000" />
</sound_model_config>
</sound_trigger_platform_info>

View file

@ -40,14 +40,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
voice.record.conc.disabled=false \
voice.voip.conc.disabled=true \
voice.conc.fallbackpath=deep-buffer \
audio.parser.ip.buffer.size=0 \
audio.parser.ip.buffer.size=262144 \
audio_hal.period_size=192 \
ro.qc.sdk.audio.ssr=false \
ro.qc.sdk.audio.fluencetype=fluence \
persist.audio.fluence.voicecall=true \
persist.audio.fluence.voicerec=true \
persist.audio.fluence.voicerec=false \
persist.audio.fluence.speaker=true \
audio.offload.disable=true \
tunnel.audio.encode=false \
audio.offload.buffer.size.kb=64 \
audio.offload.min.duration.secs=30 \
@ -65,10 +64,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
audio.safx.pbe.enabled=true \
audio.pp.asphere.enabled=false \
audio.dolby.ds2.enabled=true \
af.fast_track_multiplier=2 \
audio.dolby.ds2.hardbypass=true \
af.fast_track_multiplier=1 \
persist.speaker.prot.enable=false \
audio.offload.multiaac.enable=true \
audio.dolby.ds2.hardbypass=true \
flac.sw.decoder.24bit.support=true \
media.stagefright.audio.sink=280 \
audio.offload.passthrough=false