land: Revert to M Audio
Signed-off-by: Darshan Manjrekar <darshanmanjrekar1205@gmail.com>
This commit is contained in:
parent
69b0e7a1d2
commit
a95bc5fe1e
7 changed files with 255 additions and 164 deletions
|
@ -1,22 +1,3 @@
|
|||
#
|
||||
# This file was modified by Dolby Laboratories, Inc. The portions of the
|
||||
# code that are surrounded by "DOLBY..." are copyrighted and
|
||||
# licensed separately, as follows:
|
||||
#
|
||||
# (C) 2012-2016 Dolby Laboratories, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# List of effect libraries to load. Each library element must contain a "path" element
|
||||
# giving the full path of the library .so file.
|
||||
# libraries {
|
||||
|
@ -25,51 +6,54 @@
|
|||
# }
|
||||
# }
|
||||
libraries {
|
||||
# This is a proxy library that will be an abstraction for
|
||||
# the HW and SW effects
|
||||
|
||||
#proxy {
|
||||
#path /system/lib/soundfx/libeffectproxy.so
|
||||
#}
|
||||
|
||||
# This is the SW implementation library of the effect
|
||||
#libSW {
|
||||
#path /system/lib/soundfx/libswwrapper.so
|
||||
#}
|
||||
|
||||
# This is the HW implementation library for the effect
|
||||
#libHW {
|
||||
#path /system/lib/soundfx/libhwwrapper.so
|
||||
#}
|
||||
|
||||
bundle {
|
||||
path /system/lib/soundfx/libbundlewrapper.so
|
||||
}
|
||||
reverb {
|
||||
path /system/lib/soundfx/libreverbwrapper.so
|
||||
}
|
||||
visualizer {
|
||||
qcbassboost {
|
||||
path /vendor/lib/soundfx/libqcbassboost.so
|
||||
}
|
||||
qcvirt {
|
||||
path /vendor/lib/soundfx/libqcvirt.so
|
||||
}
|
||||
qcreverb {
|
||||
path /vendor/lib/soundfx/libqcreverb.so
|
||||
}
|
||||
visualizer_sw {
|
||||
path /system/lib/soundfx/libvisualizer.so
|
||||
}
|
||||
visualizer_hw {
|
||||
path /system/lib/soundfx/libqcomvisualizer.so
|
||||
}
|
||||
downmix {
|
||||
path /system/lib/soundfx/libdownmix.so
|
||||
}
|
||||
loudness_enhancer {
|
||||
path /system/lib/soundfx/libldnhncr.so
|
||||
}
|
||||
#bug 156482 add dirac
|
||||
dirac {
|
||||
proxy {
|
||||
path /system/lib/soundfx/libeffectproxy.so
|
||||
}
|
||||
offload_bundle {
|
||||
path /system/lib/soundfx/libqcompostprocbundle.so
|
||||
}
|
||||
audio_pre_processing {
|
||||
path /system/lib/soundfx/libqcomvoiceprocessing.so
|
||||
}
|
||||
# bug 156482 add dirac effect start
|
||||
loudness_enhancer {
|
||||
path /system/lib/soundfx/libldnhncr.so
|
||||
}
|
||||
volume_listener {
|
||||
path /system/lib/soundfx/libvolumelistener.so
|
||||
}
|
||||
dirac {
|
||||
path /system/lib/soundfx/libdirac.so
|
||||
}
|
||||
#DOLBY_ENABLE
|
||||
dap_sw {
|
||||
path /system/vendor/lib/soundfx/libswdap.so
|
||||
}
|
||||
dap_hw {
|
||||
path /system/vendor/lib/soundfx/libhwdap.so
|
||||
}
|
||||
#DOLBY_END
|
||||
}
|
||||
# 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
|
||||
|
@ -117,70 +101,196 @@ effects {
|
|||
#} End of effect proxy
|
||||
|
||||
bassboost {
|
||||
library bundle
|
||||
uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
|
||||
library proxy
|
||||
uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library qcbassboost
|
||||
uuid 23aca180-44bd-11e2-bcfd-0800200c9a66
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
virtualizer {
|
||||
library bundle
|
||||
uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
|
||||
library proxy
|
||||
uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library qcvirt
|
||||
uuid e6c98a16-22a3-11e2-b87b-f23c91aec05e
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
equalizer {
|
||||
library bundle
|
||||
uuid ce772f20-847d-11df-bb17-0002a5d5c51b
|
||||
library proxy
|
||||
uuid c8e70ecd-48ca-456e-8a4f-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library bundle
|
||||
uuid ce772f20-847d-11df-bb17-0002a5d5c51b
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid a0dac280-401c-11e3-9379-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
volume {
|
||||
library bundle
|
||||
uuid 119341a0-8469-11df-81f9-0002a5d5c51b
|
||||
}
|
||||
reverb_env_aux {
|
||||
library reverb
|
||||
uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
|
||||
library proxy
|
||||
uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library qcreverb
|
||||
uuid a8c1e5f3-293d-43cd-95ec-d5e26c02e217
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid 79a18026-18fd-4185-8233-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
reverb_env_ins {
|
||||
library reverb
|
||||
uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
|
||||
library proxy
|
||||
uuid b707403a-a1c1-4291-9573-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library qcreverb
|
||||
uuid 791fff8b-8129-4655-83a4-59bc61034c3a
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
reverb_pre_aux {
|
||||
library reverb
|
||||
uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
|
||||
library proxy
|
||||
uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library qcreverb
|
||||
uuid 53ef1db5-c0c0-445b-b060-e34d20ebb70a
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid 6987be09-b142-4b41-9056-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
reverb_pre_ins {
|
||||
library reverb
|
||||
uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
|
||||
library proxy
|
||||
uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b
|
||||
|
||||
libsw {
|
||||
library qcreverb
|
||||
uuid b08a0e38-22a5-11e2-b87b-f23c91aec05e
|
||||
}
|
||||
|
||||
libhw {
|
||||
library offload_bundle
|
||||
uuid aa2bebf6-47cf-4613-9bca-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
visualizer {
|
||||
library visualizer
|
||||
uuid d069d9e0-8329-11df-9168-0002a5d5c51b
|
||||
library proxy
|
||||
uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c
|
||||
|
||||
libsw {
|
||||
library visualizer_sw
|
||||
uuid d069d9e0-8329-11df-9168-0002a5d5c51b
|
||||
}
|
||||
|
||||
libhw {
|
||||
library visualizer_hw
|
||||
uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b
|
||||
}
|
||||
}
|
||||
downmix {
|
||||
library downmix
|
||||
uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
|
||||
}
|
||||
hw_acc {
|
||||
library offload_bundle
|
||||
uuid 7d1580bd-297f-4683-9239-e475b6d1d69f
|
||||
}
|
||||
loudness_enhancer {
|
||||
library loudness_enhancer
|
||||
uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
|
||||
}
|
||||
dirac {
|
||||
aec {
|
||||
library audio_pre_processing
|
||||
uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
|
||||
}
|
||||
ns {
|
||||
library audio_pre_processing
|
||||
uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
|
||||
}
|
||||
# bug 156482 add dirac effect start
|
||||
music_helper {
|
||||
library volume_listener
|
||||
uuid 08b8b058-0590-11e5-ac71-0025b32654a0
|
||||
}
|
||||
ring_helper {
|
||||
library volume_listener
|
||||
uuid 0956df94-0590-11e5-bdbe-0025b32654a0
|
||||
}
|
||||
alarm_helper {
|
||||
library volume_listener
|
||||
uuid 09f303e2-0590-11e5-8fdb-0025b32654a0
|
||||
}
|
||||
# voice_helper is called when stream type is voice_call in VoIP usecase
|
||||
voice_helper {
|
||||
library volume_listener
|
||||
uuid 0ace5c08-0590-11e5-ae9e-0025b32654a0
|
||||
}
|
||||
notification_helper {
|
||||
library volume_listener
|
||||
uuid 0b776dde-0590-11e5-81ba-0025b32654a0
|
||||
}
|
||||
dirac {
|
||||
library dirac
|
||||
uuid e069d9e0-8329-11df-9168-0002a5d5c51b
|
||||
}
|
||||
#DOLBY_ENABLE
|
||||
dap {
|
||||
library proxy
|
||||
uuid 9d4921da-8225-4f29-aefa-39537a04bcaa
|
||||
}
|
||||
|
||||
libsw {
|
||||
library dap_sw
|
||||
uuid 6ab06da4-c516-4611-8166-452799218539
|
||||
}
|
||||
# additional effect from vendor
|
||||
# UUID generated using version 1
|
||||
|
||||
libhw {
|
||||
library dap_hw
|
||||
uuid a0c30891-8246-4aef-b8ad-d53e26da0253
|
||||
output_session_processing {
|
||||
music {
|
||||
music_helper {
|
||||
}
|
||||
}
|
||||
}
|
||||
#DOLBY_END
|
||||
# ---------------bug 156482 add dirac --------------------#
|
||||
ring {
|
||||
ring_helper {
|
||||
}
|
||||
}
|
||||
alarm {
|
||||
alarm_helper {
|
||||
}
|
||||
}
|
||||
# stream type voice_call is used for VoIP call
|
||||
voice_call {
|
||||
voice_helper {
|
||||
}
|
||||
}
|
||||
notification {
|
||||
notification_helper {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Audio global processor configurations.
|
||||
# The global processor configuration consists in a list of effects elements.
|
||||
# The name of the effect element must be the name of one of the effects in
|
||||
|
@ -238,8 +348,8 @@ 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.
|
||||
#
|
||||
|
@ -292,6 +402,17 @@ global_processing {
|
|||
# ...
|
||||
# }
|
||||
|
||||
# Added aec, ns effects for voice_commuincation, which are supported by the board
|
||||
|
||||
pre_processing {
|
||||
voice_communication {
|
||||
aec {
|
||||
}
|
||||
ns {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#
|
||||
# TODO: add default audio pre processor configurations after debug and tuning phase
|
||||
#
|
||||
|
|
|
@ -32,30 +32,23 @@ outputs {
|
|||
bit_width 16
|
||||
app_type 69936
|
||||
}
|
||||
direct_pcm_16 {
|
||||
direct_pcm {
|
||||
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM
|
||||
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
|
||||
formats AUDIO_FORMAT_PCM_16_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_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
|
||||
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
|
||||
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_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS
|
||||
formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS
|
||||
sampling_rates 44100|48000|96000|192000
|
||||
bit_width 24
|
||||
app_type 69940
|
||||
|
|
|
@ -58,15 +58,6 @@
|
|||
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>
|
||||
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="136"/>
|
||||
<device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="137"/>
|
||||
|
||||
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE" acdb_id="121"/>
|
||||
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" acdb_id="105"/>
|
||||
<device name="SND_DEVICE_IN_SPEAKER_DMIC_BROADSIDE" acdb_id="119"/>
|
||||
<device name="SND_DEVICE_IN_SPEAKER_DMIC_NS_BROADSIDE" acdb_id="120"/>
|
||||
<device name="SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC" acdb_id="12"/>
|
||||
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="135"/>
|
||||
<device name="SND_DEVICE_OUT_SPEAKER_WSA" acdb_id="14"/>
|
||||
|
||||
</acdb_ids>
|
||||
</audio_platform_info>
|
||||
|
||||
|
|
|
@ -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|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT
|
||||
formats AUDIO_FORMAT_PCM_16_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_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_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
|
||||
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_INDEX_MASK_3|AUDIO_CHANNEL_INDEX_MASK_4|AUDIO_CHANNEL_IN_5POINT1
|
||||
channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_IN_5POINT1
|
||||
formats AUDIO_FORMAT_PCM_16_BIT
|
||||
devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC
|
||||
}
|
||||
|
|
|
@ -206,7 +206,6 @@
|
|||
<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 -->
|
||||
|
@ -486,6 +485,8 @@
|
|||
</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>
|
||||
|
@ -905,13 +906,15 @@
|
|||
<path name="handset">
|
||||
<ctl name="RX1 MIX1 INP1" value="RX1" />
|
||||
<ctl name="RDAC2 MUX" value="RX1" />
|
||||
<ctl name="RX1 Digital Volume" value="92" />
|
||||
<ctl name="RX1 Digital Volume" value="84" />
|
||||
<ctl name="EAR PA Gain" value="POS_6_DB" />
|
||||
<ctl name="EAR_S" value="Switch" />
|
||||
</path>
|
||||
|
||||
<path name="handset-mic">
|
||||
<path name="adc1" />
|
||||
<ctl name="DEC1 Volume" value="84" />
|
||||
<ctl name="DEC2 Volume" value="84" />
|
||||
<ctl name="IIR1 INP1 MUX" value="DEC1" />
|
||||
</path>
|
||||
|
||||
|
@ -1050,17 +1053,8 @@
|
|||
<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-invert" />
|
||||
<path name="dmic-endfire" />
|
||||
</path>
|
||||
|
||||
<path name="voice-rec-dmic-ef">
|
||||
|
@ -1072,6 +1066,8 @@
|
|||
</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>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!--- Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. -->
|
||||
<!--- Copyright (c) 2013-2014, 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,48 +26,35 @@
|
|||
<!--- 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>
|
||||
<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" />
|
||||
<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" />
|
||||
|
||||
<!-- 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 -->
|
||||
<param capture_keyword="PCM_packet, RT, 2000" />
|
||||
<param client_capture_read_delay="2000" />
|
||||
</sound_model_config>
|
||||
<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>
|
||||
|
||||
</sound_trigger_platform_info>
|
||||
|
||||
|
|
|
@ -23,13 +23,12 @@ vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so
|
|||
vendor/lib/rfsa/adsp/libscveT2T_skel.so
|
||||
vendor/lib/rfsa/adsp/libscveTextReco_skel.so
|
||||
|
||||
# Audio - from santoni
|
||||
# Audio - from land
|
||||
etc/drc/drc_cfg_5.1.txt
|
||||
etc/drc/drc_cfg_AZ.txt
|
||||
etc/surround_sound_3mic/surround_sound_rec_5.1.cfg
|
||||
etc/surround_sound_3mic/surround_sound_rec_AZ.cfg
|
||||
etc/surround_sound_3mic/surround_sound_rec_5.1.cfg
|
||||
lib/soundfx/libdirac.so
|
||||
lib/libDiracAPI_SHARED.so
|
||||
vendor/etc/diracmobile.config
|
||||
vendor/lib/libacdb-fts.so
|
||||
vendor/lib/libacdbloader.so
|
||||
|
@ -41,9 +40,9 @@ vendor/lib/libaudcal.so
|
|||
vendor/lib/libaudioalsa.so
|
||||
vendor/lib/libaudiodevarb.so
|
||||
vendor/lib/libdrc.so
|
||||
vendor/lib/libhwdaphal.so
|
||||
vendor/lib/libqct_resampler.so
|
||||
vendor/lib/libsurround_3mic_proc.so
|
||||
vendor/lib/libswvdec.so
|
||||
vendor/lib/soundfx/libqcbassboost.so
|
||||
vendor/lib/soundfx/libqcreverb.so
|
||||
vendor/lib/soundfx/libqcvirt.so
|
||||
|
@ -55,12 +54,16 @@ vendor/lib64/libadiertac.so
|
|||
vendor/lib64/libaudcal.so
|
||||
vendor/lib64/libaudioalsa.so
|
||||
vendor/lib64/libaudiodevarb.so
|
||||
vendor/lib64/libhwdaphal.so
|
||||
vendor/lib64/soundfx/libqcbassboost.so
|
||||
vendor/lib64/soundfx/libqcreverb.so
|
||||
vendor/lib64/soundfx/libqcvirt.so
|
||||
vendor/lib64/libswvdec.so
|
||||
|
||||
# Audio ACDB - from santoni
|
||||
# Audio ACDB - from land
|
||||
etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb
|
||||
etc/acdbdata/MTP/MTP_General_cal.acdb
|
||||
etc/acdbdata/MTP/MTP_Global_cal.acdb
|
||||
etc/acdbdata/MTP/MTP_Handset_cal.acdb
|
||||
etc/acdbdata/MTP/MTP_Hdmi_cal.acdb
|
||||
etc/acdbdata/MTP/MTP_Headset_cal.acdb
|
||||
etc/acdbdata/MTP/MTP_Speaker_cal.acdb
|
||||
etc/acdbdata/QRD/msm8952-sku2-snd-card/QRD_SKU2_Bluetooth_cal.acdb
|
||||
etc/acdbdata/QRD/msm8952-sku2-snd-card/QRD_SKU2_General_cal.acdb
|
||||
etc/acdbdata/QRD/msm8952-sku2-snd-card/QRD_SKU2_Global_cal.acdb
|
||||
|
|
Loading…
Reference in a new issue