More blobs missing, audio start over at stock

This commit is contained in:
Daniel Moran (garwynn) 2014-05-28 16:42:50 -05:00
parent 387f7bb827
commit 36211e55b4
5 changed files with 256 additions and 275 deletions

View File

@ -6,12 +6,18 @@
# }
# }
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 HW implementation library for the effect
offload {
path /system/lib/soundfx/libaudioeffectoffload.so
}
bundle {
path /system/lib/soundfx/libbundlewrapper.so
}
cm {
path /system/lib/soundfx/libcyanogen-dsp.so
}
reverb {
path /system/lib/soundfx/libreverbwrapper.so
}
@ -24,14 +30,30 @@ libraries {
downmix {
path /system/lib/soundfx/libdownmix.so
}
proxy {
path /system/lib/soundfx/libeffectproxy.so
mysound {
path /system/lib/libmysound.so
}
audio_pre_processing {
soundalive {
path /system/lib/libaudiosa.so
}
soundalive_sec {
path /system/lib/soundfx/libaudiosa_sec.so
}
loudness_enhancer {
path /system/lib/soundfx/libldnhncr.so
}
pre_processing {
path /system/lib/soundfx/libqcomvoiceprocessing.so
}
}
# Default pre-processing library. Add to audio_effect.conf "libraries" section if
# audio HAL implements support for default software audio pre-processing effects
#
# pre_processing {
# path /system/lib/soundfx/libaudiopreprocessing.so
# }
# list of effects to load. Each effect element must contain a "library" and a "uuid" element.
# The value of the "library" element must correspond to the name of one library element in the
# "libraries" element.
@ -48,27 +70,53 @@ libraries {
# }
effects {
compression {
library cm
uuid f27317f4-c984-4de6-9a90-545759495bf2
soundalive {
library proxy
uuid 05227ea0-50bb-11e3-ac69-0002a5d5c51b
libsw {
library soundalive_sec
uuid cf65eb39-ce2f-48a8-a903-ceb818c06745
}
libhw {
library offload
uuid 0b2dbc60-50bb-11e3-988b-0002a5d5c51b
}
}
bassboost {
# library bundle
# uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
library cm
uuid 42b5cbf5-4dd8-4e79-a5fb-cceb2cb54e13
library proxy
uuid 10e50dc0-50bb-11e3-a9b0-0002a5d5c51b
libsw {
library soundalive
uuid a926a540-418a-11e1-b2f1-0002a5d5c51b
}
libhw {
library offload
uuid 16a70d80-50bb-11e3-8959-0002a5d5c51b
}
}
virtualizer {
# library bundle
# uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
library cm
uuid 7c6cc5f8-6f34-4449-a282-bed84f1a5b5a
library proxy
uuid 1db5b180-50bb-11e3-888e-0002a5d5c51b
libsw {
library soundalive
uuid c747f6a0-418a-11e1-a621-0002a5d5c51b
}
libhw {
library offload
uuid 23318080-50bb-11e3-9101-0002a5d5c51b
}
}
equalizer {
# library bundle
# uuid ce772f20-847d-11df-bb17-0002a5d5c51b
library cm
uuid 58bc9000-0d7f-462e-90d2-035eddd8b434
library proxy
uuid 295b42c0-50bb-11e3-a6ed-0002a5d5c51b
libsw {
library soundalive
uuid c117b70-f97f-11e0-be50-0002a5d5c51b
}
libhw {
library offload
uuid 2f2afe20-50bb-11e3-bc97-0002a5d5c51b
}
}
volume {
library bundle
@ -93,30 +141,61 @@ effects {
visualizer {
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
}
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
}
dha {
library proxy
uuid 37155c20-50bb-11e3-9fac-0002a5d5c51b
libsw {
library mysound
uuid 263a88e0-50b1-11e2-bcfd-0800200c9a66
}
libhw {
library offload
uuid 3ef69260-50bb-11e3-931e-0002a5d5c51b
}
}
loudness_enhancer {
library loudness_enhancer
uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
}
aec {
library audio_pre_processing
library pre_processing
uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
}
ns {
library audio_pre_processing
uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
library pre_processing
uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306
}
}
# Default pre-processing effects. Add to audio_effect.conf "effects" section if
# audio HAL implements support for them.
#
# agc {
# library pre_processing
# uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
# }
# aec {
# library pre_processing
# uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
# }
# ns {
# library pre_processing
# uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b
# }
# Audio preprocessor configurations.
# The pre processor configuration consists in a list of elements each describing
# pre processor settings for a given input source. Valid input source names are:
@ -156,3 +235,8 @@ effects {
#
# TODO: add default audio pre processor configurations after debug and tuning phase
#
pre_processing {
voice_communication {
aec {}
}
}

View File

@ -5,7 +5,7 @@
global_configuration {
attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER
default_output_device AUDIO_DEVICE_OUT_SPEAKER
attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL
attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL
}
# audio hardware module section: contains descriptors for all audio hw modules present on the
@ -26,44 +26,37 @@ audio_hw_modules {
sampling_rates 44100|48000
channel_masks AUDIO_CHANNEL_OUT_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_EXTERNAL_WIFI
flags AUDIO_OUTPUT_FLAG_PRIMARY
}
low_latency {
sampling_rates 44100|48000
fast {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
channel_masks AUDIO_CHANNEL_OUT_STEREO
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_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_EXTERNAL_WIFI
flags AUDIO_OUTPUT_FLAG_FAST
}
multichannel {
sampling_rates 44100|48000
hdmi {
sampling_rates 48000
channel_masks dynamic
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY
flags AUDIO_OUTPUT_FLAG_DIRECT
devices AUDIO_DEVICE_OUT_AUX_DIGITAL
flags AUDIO_OUTPUT_FLAG_MULTI_CH
}
compress_offload {
sampling_rates 8000|11025|16000|22050|32000|44100|48000
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_AAC|AUDIO_FORMAT_AC3|AUDIO_FORMAT_EAC3
devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_EXTERNAL_WIFI
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
}
voip_rx {
sampling_rates 8000|16000
channel_masks AUDIO_CHANNEL_OUT_MONO
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW
devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET|AUDIO_DEVICE_OUT_ALL_SCO
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX
}
}
inputs {
primary {
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
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW
devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET|AUDIO_DEVICE_IN_VOICE_CALL
channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_IN_VOICE_UPLINK|AUDIO_CHANNEL_IN_VOICE_DNLINK
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADPHONE|AUDIO_DEVICE_IN_AUX_DIGITAL|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC
}
}
}
@ -86,10 +79,28 @@ audio_hw_modules {
devices AUDIO_DEVICE_OUT_USB_ACCESSORY
}
usb_device {
sampling_rates 44100
sampling_rates 44100|48000
channel_masks dynamic
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_OUT_USB_DEVICE|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
}
}
}
tms {
outputs {
tms {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
channel_masks AUDIO_CHANNEL_OUT_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_OUT_USB_DEVICE
devices AUDIO_DEVICE_OUT_EXTERNAL_TMS
}
}
inputs {
tms {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_IN_EXTERNAL_TMS
}
}
}

196
audio/mixer_paths.xml Executable file → Normal file
View File

@ -4,27 +4,27 @@
<!-- K LTE SPR ================================================ -->
<!-- These are the initial mixer settings -->
<!-- reset RX part -->
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="ZERO" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="ZERO" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="ZERO" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="ZERO" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="ZERO" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="ZERO" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="ZERO" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia1" value="ZERO" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="ZERO" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="ZERO" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="HDMI Mixer MultiMedia1" value="ZERO" />
<ctl name="HDMI Mixer MultiMedia2" value="ZERO" />
<ctl name="HDMI Mixer MultiMedia1" value="0" />
<ctl name="HDMI Mixer MultiMedia2" value="0" />
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="ZERO" />
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="ZERO" />
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
<ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="ZERO" />
<ctl name="AUX_PCM_RX_Voice Mixer Voip" value="ZERO" />
<ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="0" />
<ctl name="AUX_PCM_RX_Voice Mixer Voip" value="0" />
<ctl name="SLIM RX1 MUX" value="ZERO" />
<ctl name="SLIM RX2 MUX" value="ZERO" />
@ -56,50 +56,50 @@
<ctl name="RX1 MIX1 INP2" value="ZERO" />
<ctl name="RX1 MIX1 INP1" value="ZERO" />
<ctl name="RX1 Digital Volume" value="ZERO" />
<ctl name="RX2 Digital Volume" value="ZERO" />
<ctl name="RX3 Digital Volume" value="ZERO" />
<ctl name="RX4 Digital Volume" value="ZERO" />
<ctl name="RX5 Digital Volume" value="ZERO" />
<ctl name="RX6 Digital Volume" value="ZERO" />
<ctl name="RX7 Digital Volume" value="ZERO" />
<ctl name="RX1 Digital Volume" value="0" />
<ctl name="RX2 Digital Volume" value="0" />
<ctl name="RX3 Digital Volume" value="0" />
<ctl name="RX4 Digital Volume" value="0" />
<ctl name="RX5 Digital Volume" value="0" />
<ctl name="RX6 Digital Volume" value="0" />
<ctl name="RX7 Digital Volume" value="0" />
<ctl name="HPHL DAC Switch" value="ZERO" />
<ctl name="HPHL Volume" value="ZERO" />
<ctl name="HPHR Volume" value="ZERO" />
<ctl name="HPHL DAC Switch" value="0" />
<ctl name="HPHL Volume" value="0" />
<ctl name="HPHR Volume" value="0" />
<ctl name="LINEOUT1 Volume" value="ZERO" />
<ctl name="LINEOUT2 Volume" value="ZERO" />
<ctl name="LINEOUT3 Volume" value="ZERO" />
<ctl name="LINEOUT4 Volume" value="ZERO" />
<ctl name="LINEOUT1 Volume" value="0" />
<ctl name="LINEOUT2 Volume" value="0" />
<ctl name="LINEOUT3 Volume" value="0" />
<ctl name="LINEOUT4 Volume" value="0" />
<ctl name="SPK DRV Volume" value="ZERO" />
<ctl name="SPK DRV Volume" value="0" />
<ctl name="EAR PA Gain" value="POS_0_DB" />
<ctl name="DAC1 Switch" value="ZERO" />
<ctl name="DAC1 Switch" value="0" />
<ctl name="COMP0 Switch" value="ZERO" />
<ctl name="COMP1 Switch" value="ZERO" />
<ctl name="COMP2 Switch" value="ZERO" />
<ctl name="COMP0 Switch" value="0" />
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="CLASS_H_DSM MUX" value="ZERO" />
<!-- reset TX part -->
<ctl name="MultiMedia5 Mixer SLIM_0_TX" value="ZERO" />
<ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="ZERO" />
<ctl name="MultiMedia1 Mixer MI2S_TX" value="ZERO" />
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="ZERO" />
<ctl name="MultiMedia1 Mixer SLIM_4_TX" value="ZERO" />
<ctl name="MultiMedia1 Mixer AUX_PCM_UL_TX" value="ZERO" />
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="ZERO" />
<ctl name="MultiMedia1 Mixer VOC_REC_DL" value="ZERO" />
<ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
<ctl name="MultiMedia1 Mixer MI2S_TX" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
<ctl name="MultiMedia1 Mixer AUX_PCM_UL_TX" value="0" />
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
<ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="ZERO" />
<ctl name="Voice_Tx Mixer AUX_PCM_TX_Voice" value="ZERO" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<ctl name="Voice_Tx Mixer AUX_PCM_TX_Voice" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="ZERO" />
<ctl name="Voip_Tx Mixer AUX_PCM_TX_Voip" value="ZERO" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="Voip_Tx Mixer AUX_PCM_TX_Voip" value="0" />
<ctl name="SLIM TX10 MUX" value="ZERO" />
<ctl name="SLIM TX9 MUX" value="ZERO" />
@ -127,40 +127,38 @@
<ctl name="SLIM RX1 MUX" value="AIF1_PB" />
<ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="AIF1_CAP Mixer SLIM TX7" value="ZERO" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="ZERO" />
<ctl name="AIF1_CAP Mixer SLIM TX9" value="ZERO" />
<ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX9" value="0" />
<ctl name="ADC1 Volume" value="ZERO" />
<ctl name="ADC2 Volume" value="ZERO" />
<ctl name="ADC3 Volume" value="ZERO" />
<ctl name="ADC4 Volume" value="ZERO" />
<ctl name="ADC5 Volume" value="ZERO" />
<ctl name="ADC6 Volume" value="ZERO" />
<ctl name="ADC1 Volume" value="0" />
<ctl name="ADC2 Volume" value="0" />
<ctl name="ADC3 Volume" value="0" />
<ctl name="ADC4 Volume" value="0" />
<ctl name="ADC5 Volume" value="0" />
<ctl name="ADC6 Volume" value="0" />
<ctl name="DEC1 Volume" value="ZERO" />
<ctl name="DEC2 Volume" value="ZERO" />
<ctl name="DEC3 Volume" value="ZERO" />
<ctl name="DEC4 Volume" value="ZERO" />
<ctl name="DEC5 Volume" value="ZERO" />
<ctl name="DEC6 Volume" value="ZERO" />
<ctl name="DEC7 Volume" value="ZERO" />
<ctl name="DEC8 Volume" value="ZERO" />
<ctl name="DEC9 Volume" value="ZERO" />
<ctl name="DEC10 Volume" value="ZERO" />
<ctl name="DEC1 Volume" value="0" />
<ctl name="DEC2 Volume" value="0" />
<ctl name="DEC3 Volume" value="0" />
<ctl name="DEC4 Volume" value="0" />
<ctl name="DEC5 Volume" value="0" />
<ctl name="DEC6 Volume" value="0" />
<ctl name="DEC7 Volume" value="0" />
<ctl name="DEC8 Volume" value="0" />
<ctl name="DEC9 Volume" value="0" />
<ctl name="DEC10 Volume" value="0" />
<ctl name="TX3 HPF cut off" value="MIN_3DB_4Hz" />
<ctl name="TX4 HPF cut off" value="MIN_3DB_4Hz" />
<ctl name="TX5 HPF cut off" value="MIN_3DB_4Hz" />
<ctl name="ES705 TX1 Enable" value="ZERO" />
<ctl name="ES705 RX1 Enable" value="ZERO" />
<ctl name="ES705 RX2 Enable" value="ZERO" />
<ctl name="ES325 RX1 Enable" value="ZERO" />
<ctl name="ES325 RX2 Enable" value="ZERO" />
<ctl name="ES705 TX1 Enable" value="0" />
<ctl name="ES705 RX1 Enable" value="0" />
<ctl name="ES705 RX2 Enable" value="0" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="ES705 Voice Wakeup Enable" value="ZERO" />
<ctl name="ES705 Voice LPM Enable" value="ZERO" />
<ctl name="ES705 Voice Wakeup Enable" value="0" />
<ctl name="ES705 Voice LPM Enable" value="0" />
<ctl name="Internal Route Config" value="5" />
<ctl name="TTY Mode" value="OFF" />
@ -480,8 +478,8 @@
<path name="speaker-and-headphones">
<path name="spk-ear" />
<ctl name="HPHL Volume" value="ZERO" />
<ctl name="HPHR Volume" value="ZERO" />
<ctl name="HPHL Volume" value="0" />
<ctl name="HPHR Volume" value="0" />
<ctl name="RX1 Digital Volume" value="81" />
<ctl name="RX2 Digital Volume" value="81" />
<ctl name="RX7 Digital Volume" value="80" />
@ -709,25 +707,24 @@
<!-- Voice call Scenario -->
<!-- RX part -->
<path name="voice-call-handset">
<ctl name="ES705 RX1 Enable" value="1" />
<path name="rcv" />
<ctl name="EAR PA Gain" value="POS_6_DB" />
<ctl name="RX1 Digital Volume" value="84" />
<ctl name="ES325 RX1 Enable" value="1" />
</path>
<path name="voice-call-handset-extra-vol">
<ctl name="ES705 RX1 Enable" value="1" />
<path name="rcv" />
<ctl name="EAR PA Gain" value="POS_6_DB" />
<ctl name="RX1 Digital Volume" value="84" />
<ctl name="ES325 RX1 Enable" value="1" />
<ctl name="VEQ Enable" value="ZERO" />
</path>
<path name="voice-call-handset-hac">
<path name="rcv" />
<ctl name="EAR PA Gain" value="POS_6_DB" />
<ctl name="RX1 Digital Volume" value="84" />
<ctl name="ES325 RX1 Enable" value="1" />
<ctl name="ES705 RX1 Enable" value="1" />
</path>
<path name="voice-call-speaker">
@ -752,7 +749,7 @@
</path>
<path name="voice-call-dock">
<ctl name="ES325 RX1 Enable" value="1" />
<ctl name="ES705 RX1 Enable" value="1" />
<path name="lineout" />
<ctl name="SLIM_0_RX Channels" value="Two" />
<ctl name="LINEOUT1 Volume" value="19" />
@ -760,7 +757,7 @@
</path>
<path name="voice-call-handset-emergency">
<ctl name="ES325 RX1 Enable" value="1" />
<ctl name="ES705 RX1 Enable" value="1" />
<path name="rcv" />
<ctl name="EAR PA Gain" value="POS_6_DB" />
<ctl name="RX1 Digital Volume" value="84" />
@ -774,8 +771,12 @@
</path>
<!-- TX part -->
<path name="voice-call-main-mic">
<path name="main-mic" />
<ctl name="DEC2 Volume" value="95" />
<ctl name="ES705 TX1 Enable" value="1" />
<path name="main-sub-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="DEC4 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="4" />
</path>
<path name="voice-call-sub-mic">
@ -800,8 +801,11 @@
</path>
<path name="voice-call-NS-mic-handset">
<path name="main-mic" />
<ctl name="DEC2 Volume" value="95" />
<ctl name="ES705 TX1 Enable" value="1" />
<path name="main-sub-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="DEC4 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="2" />
</path>
@ -816,7 +820,7 @@
<path name="main-sub-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="DEC4 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="Two" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="4" />
</path>
@ -835,7 +839,7 @@
<ctl name="RX1 MIX1 INP1" value="RX1" />
<ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
<ctl name="EAR PA Gain" value="POS_6_DB" />
<ctl name="RX1 Digital Volume" value="ZERO" />
<ctl name="RX1 Digital Volume" value="0" />
</path>
<path name="voice-call-forward-mic">
@ -843,7 +847,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM TX7 MUX" value="DEC6" />
<ctl name="DEC6 MUX" value="ADC1" />
<ctl name="DEC6 Volume" value="ZERO" />
<ctl name="DEC6 Volume" value="0" />
</path>
<!-- end of call forward Scenario -->
@ -897,7 +901,7 @@
<!-- TX part -->
<path name="video-call-main-mic">
<ctl name="ES705 TX1 Enable" value="1" />
<path name="main-mic" />
<path name="main-sub-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="DEC4 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="One" />
@ -915,7 +919,7 @@
<path name="main-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
</path>
<path name="video-call-headset-mic">
@ -924,7 +928,7 @@
<ctl name="ADC2 Volume" value="12" />
<ctl name="DEC5 Volume" value="84" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
</path>
<path name="video-call-NS-mic-handset">
@ -1016,7 +1020,7 @@
<path name="main-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
</path>
<path name="VoLTE-voice-headset-mic">
@ -1029,7 +1033,7 @@
<ctl name="RX2 MIX2 INP1" value="IIR1" />
<ctl name="IIR1 INP1 Volume" value="60" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
</path>
<path name="VoLTE-voice-NS-mic-handset">
@ -1115,7 +1119,7 @@
<path name="main-mic" />
<ctl name="DEC2 Volume" value="96" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
</path>
<path name="VoLTE-video-headset-mic">
@ -1124,7 +1128,7 @@
<ctl name="ADC2 Volume" value="12" />
<ctl name="DEC5 Volume" value="84" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
</path>
<path name="VoLTE-video-NS-mic-handset">
@ -1207,7 +1211,7 @@
<ctl name="ADC2 Volume" value="12" />
<ctl name="DEC5 Volume" value="84" />
<ctl name="ES705-AP Tx Channels" value="One" />
<ctl name="Internal Route Config" value="ZERO" />
<ctl name="Internal Route Config" value="0" />
<ctl name="TTY Mode" value="FULL" />
</path>
<!-- end of TTY Scenario -->

View File

@ -1,115 +0,0 @@
/*
* Copyright 2013, The CyanogenMod Project
* Shareef Ali
* Hashcode
*
* 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.
*/
#include "Custom-Platform_Api.h"
#include <stdlib.h>
#include <dlfcn.h>
#include <cutils/log.h>
#include <audio_hw.h>
#include <platform_api.h>
#include "platform.h"
#include "voice_extn.h"
#include "audio_extn.h"
snd_device_t custom_platform_get_input_snd_device(void *platform, audio_devices_t out_device)
{
struct platform_data *my_data = (struct platform_data *)platform;
struct audio_device *adev = my_data->adev;
audio_source_t source = (adev->active_input == NULL) ?
AUDIO_SOURCE_DEFAULT : adev->active_input->source;
audio_mode_t mode = adev->mode;
audio_channel_mask_t channel_mask = (adev->active_input == NULL) ?
AUDIO_CHANNEL_IN_MONO : adev->active_input->channel_mask;
snd_device_t snd_device = -2;
int channel_count = popcount(channel_mask);
if ((out_device != AUDIO_DEVICE_NONE) && ((mode == AUDIO_MODE_IN_CALL) ||
voice_extn_compress_voip_is_active(adev))) {
if (adev->voice.tty_mode == TTY_MODE_OFF) {
if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||
out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
if (!(out_device & AUDIO_DEVICE_OUT_EARPIECE &&
audio_extn_should_use_handset_anc(channel_count))) {
if (my_data->fluence_type == FLUENCE_NONE ||
my_data->fluence_in_voice_call == false) {
snd_device = SND_DEVICE_IN_HANDSET_STEREO_DMIC;
}
}
} else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {
if (!(my_data->fluence_type != FLUENCE_NONE &&
my_data->fluence_in_voice_call &&
my_data->fluence_in_spkr_mode)) {
snd_device = SND_DEVICE_IN_SPEAKER_STEREO_DMIC;
}
}
}
}
return snd_device;
}
void custom_init_data(){
change_acdb_data(SND_DEVICE_OUT_SPEAKER, 15);
change_acdb_data(SND_DEVICE_OUT_SPEAKER_REVERSE, 15);
change_acdb_data(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, 15);
change_acdb_data(SND_DEVICE_OUT_VOICE_SPEAKER, 15);
change_acdb_data(SND_DEVICE_IN_VOICE_DMIC, 4);
change_acdb_data(SND_DEVICE_IN_HANDSET_DMIC, 4);
change_acdb_data(SND_DEVICE_IN_VOICE_SPEAKER_DMIC, 11);
change_acdb_data(SND_DEVICE_IN_SPEAKER_DMIC, 11);
change_acdb_data(SND_DEVICE_IN_VOICE_REC_MIC, 53);
change_acdb_data(SND_DEVICE_IN_CAMCORDER_MIC, 56);
change_acdb_data(SND_DEVICE_OUT_USB_HEADSET, 98);
change_acdb_data(SND_DEVICE_OUT_BT_SCO, 48);
change_acdb_data(SND_DEVICE_OUT_BT_SCO_WB, 50);
change_acdb_data(SND_DEVICE_IN_BT_SCO_MIC, 49);
change_acdb_data(SND_DEVICE_IN_BT_SCO_MIC_WB, 51);
change_table_data(SND_DEVICE_OUT_HEADPHONES, "headset");
change_table_data(SND_DEVICE_OUT_VOICE_HANDSET, "voice-call-handset");
change_table_data(SND_DEVICE_OUT_VOICE_SPEAKER, "voice-call-speaker");
change_table_data(SND_DEVICE_OUT_VOICE_HEADPHONES, "voice-call-headset");
change_table_data(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES, "TTY-full");
change_table_data(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES, "TTY-headset");
change_table_data(SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET, "TTY-handset");
change_table_data(SND_DEVICE_IN_HANDSET_MIC, "rec-main-mic");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC_NS, "voice-call-NS-mic-handset");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC_AEC, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_MIC, "rec-sub-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC_NS, "voice-call-NS-mic-speaker");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC_AEC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_HEADSET_MIC, "rec-headset-mic");
change_table_data(SND_DEVICE_IN_VOICE_SPEAKER_MIC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_VOICE_HEADSET_MIC, "voice-call-headset-mic");
change_table_data(SND_DEVICE_IN_CAMCORDER_MIC, "rec-stereo-mic");
change_table_data(SND_DEVICE_IN_VOICE_DMIC, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_VOICE_SPEAKER_DMIC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC, "TTY-full-mic");
change_table_data(SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC, "TTY-vco-mic");
change_table_data(SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC, "TTY-headset-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_MIC, "vr-main-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_MIC_NS, "svoice-NS-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_DMIC_STEREO, "vr-sub-mic");
change_table_data(SND_DEVICE_IN_HANDSET_STEREO_DMIC, "rec-stereo-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_STEREO_DMIC, "rec-stereo-mic");
}

View File

@ -34,6 +34,10 @@ vendor/lib/libaudcal.so
vendor/lib/libcsd-client.so
vendor/lib/libacdbrtac.so
vendor/lib/libadiertac.so
lib/libmysound.so
lib/libaudiosa.so
lib/soundfx/libaudioeffectoffload.so
lib/soundfx/libaudiosa_sec.so
etc/Bluetooth_cal.acdb
etc/General_cal.acdb
etc/Handset_cal.acdb
@ -133,18 +137,10 @@ vendor/lib/libOmxWmaDec.so
bin/mm-qcamera-daemon
cameradata/datapattern_420sp.yuv
cameradata/datapattern_front_420sp.yuv
<<<<<<< HEAD
etc/C16QL_s5k2p2xx_module_info.xml
etc/F16QS_imx240_module_info.xml
etc/F16QL_s5k2p2xx_module_info.xml
lib/hw/camera.msm8974.so
=======
etc/C13QL_s5k3l2xx_module_info.xml
etc/C13QS_imx135_module_info.xml
etc/D13QL_s5k3l2xx_module_info.xml
etc/D13QS_imx135_module_info.xml
lib/hw/camera.msm8974.so:lib/hw/camera.vendor.msm8974.so
>>>>>>> 1048fcb... HLTE: Use camera wrapper.
lib/libTsAe.so
lib/libTsAf.so
lib/libTs_J_Accm.so
@ -239,6 +235,7 @@ lib/libvdis.so
vendor/lib/libthermalclient.so
vendor/lib/libmmcamera_imx240.so
vendor/lib/libmmcamera_faceproc.so
vendor/lib/libmmcamera_imglib_faceproc_adspstub.so
vendor/lib/libsensor1.so
vendor/lib/libmmcamera2_stats_modules.so
vendor/lib/libmmcamera_image_stab.so