Promotion of audio-userspace.lnx.2.1-00032.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1062342 I58b37131ee832cbd9097bd59fcb7af1997171d30 configs: msmcobalt: add sidetone and adaptive ANC mixer
1065036 Ib952c6de11c8e977275e7e5ee59eafd47a190cec policy_hal: Add DSD format for duration check during off
1065476 I5519d31f8b6287a93b506bb7916d54027b063037 configs: msmcobalt: cleanup platform xml for gcs
1065036 Iceb64c5c92d392c9429882d31f2ef7db96a0a4cd config : Add 352.8Khz SR in Direct PCM profile for e2e s
1043932 I1f5a8d7748848cd5981b86017e6a4466d6b27be7 hal: Add support for generic effect framework
1066651 I10026d3d9147e45d3ed2b93160922bc3bb4bc2d0 audiopolicy: Avoid spurious routing in APM::stopSource
1067835 configs: msmcobalt: update AANC handset tuning mixer con
1067696 I03a9176db3f13711345be8e29b97426baa510f21 configs: msmcobalt: add audio sphere entry in effect con
Change-Id: Iaea30f73e5a1e517da015e11000dda94951c91a8
CRs-Fixed: 1066651, 1043932, 1065476, 1065036, 1067835, 1067696, 1062342
diff --git a/configs/msm8996/msm8996.mk b/configs/msm8996/msm8996.mk
index 71705cb..4f29b53 100644
--- a/configs/msm8996/msm8996.mk
+++ b/configs/msm8996/msm8996.mk
@@ -50,6 +50,7 @@
#DOLBY_DDP := true
AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
##AUDIO_FEATURE_FLAGS
#Audio Specific device overlays
diff --git a/configs/msmcobalt/aanc_tuning_mixer.txt b/configs/msmcobalt/aanc_tuning_mixer.txt
index 35743ff..5639bd2 100644
--- a/configs/msmcobalt/aanc_tuning_mixer.txt
+++ b/configs/msmcobalt/aanc_tuning_mixer.txt
@@ -8,10 +8,10 @@
AIF1_CAP Mixer SLIM TX8:1
SLIM TX7 MUX:DEC7
ADC MUX7:DMIC
-DMIC MUX7:DMIC3
+DMIC MUX7:DMIC4
SLIM TX8 MUX:DEC8
ADC MUX8:DMIC
-DMIC MUX8:DMIC2
+DMIC MUX8:DMIC0
SLIM_0_TX Channels:Two
MultiMedia1 Mixer SLIM_0_TX:1
@@ -35,13 +35,13 @@
SLIM TX7 MUX:DEC7
ADC MUX7:ANC_FB_TUNE1
ADC MUX10:DMIC
-DMIC MUX10:DMIC2
+DMIC MUX10:DMIC0
SLIM TX8 MUX:DEC8
ADC MUX8:ANC_FB_TUNE2
ADC MUX12:DMIC
-DMIC MUX12:DMIC2
-ANC0 FB MUX:ANC_IN_EAR
-ANC EAR Enable Switch:1
+DMIC MUX12:DMIC0
+ANC0 FB MUX:ANC_IN_EAR_SPKR
+ANC OUT EAR SPKR Enable Switch:1
SLIM_0_TX Channels:Two
MultiMedia1 Mixer SLIM_0_TX:1
@@ -56,7 +56,7 @@
DMIC MUX10:ZERO
DMIC MUX12:ZERO
ANC0 FB MUX:ZERO
-ANC EAR Enable Switch:0
+ANC OUT EAR SPKR Enable Switch:0
#ANC_TEST_E_PATH_MIC_STEREO Capture
@@ -70,13 +70,13 @@
SLIM TX7 MUX:DEC7
ADC MUX7:ANC_FB_TUNE1
ADC MUX10:DMIC
-DMIC MUX10:DMIC3
+DMIC MUX10:DMIC4
SLIM TX8 MUX:DEC8
ADC MUX8:ANC_FB_TUNE2
ADC MUX12:DMIC
-DMIC MUX12:DMIC3
-ANC0 FB MUX:ANC_IN_EAR
-ANC EAR Enable Switch:1
+DMIC MUX12:DMIC4
+ANC0 FB MUX:ANC_IN_EAR_SPKR
+ANC OUT EAR SPKR Enable Switch:1
SLIM_0_TX Channels:Two
MultiMedia1 Mixer SLIM_0_TX:1
@@ -91,7 +91,7 @@
DMIC MUX10:ZERO
DMIC MUX12:ZERO
ANC0 FB MUX:ZERO
-ANC EAR Enable Switch:0
+ANC OUT EAR SPKR Enable Switch:0
#ANC_TEST_S_PATH_HANDSET_SPKR_ANC_MONO
@@ -103,19 +103,23 @@
ANC Function:ON
SLIM RX0 MUX:AIF_MIX1_PB
SLIM_0_RX Channels:One
-RX INT0_1 MIX1 INP0:RX0
-RX INT0 DEM MUX:CLSH_DSM_OUT
-RX0 Digital Volume:87
+RX INT7_1 MIX1 INP0:RX0
+SpkrLeft SWR DAC_Port Switch:1
ANC Slot:7
-EAR PA Gain:G_6_DB
+ANC OUT EAR SPKR Enable Switch:1
+ANC SPKR PA Enable Switch:1
+SpkrLeft WSA PA Gain:G_6_DB
SLIMBUS_0_RX Audio Mixer MultiMedia1:1
disable
SLIMBUS_0_RX Audio Mixer MultiMedia1:0
+SpkrLeft WSA PA Gain:G_0_DB
+ANC SPKR PA Enable Switch:0
+ANC OUT EAR SPKR Enable Switch:0
+SpkrLeft SWR DAC_Port Switch:0
ANC Slot:0
SLIM RX0 MUX:ZERO
-RX INT0_1 MIX1 INP0:ZERO
-RX0 Digital Volume:0
+RX INT7_1 MIX1 INP0:ZERO
ANC Function:OFF
#ANC_TEST_E_PATH_HANDSET_SPKR_ANC_MONO
@@ -127,17 +131,21 @@
ANC Function:ON
SLIM RX0 MUX:AIF_MIX1_PB
SLIM_0_RX Channels:One
-RX INT0_1 MIX1 INP0:RX0
-RX INT0 DEM MUX:CLSH_DSM_OUT
-RX0 Digital Volume:87
+RX INT7_1 MIX1 INP0:RX0
+SpkrLeft SWR DAC_Port Switch:1
ANC Slot:8
-EAR PA Gain:G_6_DB
+ANC OUT EAR SPKR Enable Switch:1
+ANC SPKR PA Enable Switch:1
+SpkrLeft WSA PA Gain:G_6_DB
SLIMBUS_0_RX Audio Mixer MultiMedia1:1
disable
SLIMBUS_0_RX Audio Mixer MultiMedia1:0
+SpkrLeft WSA PA Gain:G_0_DB
+ANC SPKR PA Enable Switch:0
+ANC OUT EAR SPKR Enable Switch:0
+SpkrLeft SWR DAC_Port Switch:0
ANC Slot:0
SLIM RX0 MUX:ZERO
-RX INT0_1 MIX1 INP0:ZERO
-RX0 Digital Volume:0
+RX INT7_1 MIX1 INP0:ZERO
ANC Function:OFF
diff --git a/configs/msmcobalt/aanc_tuning_mixer_tavil.txt b/configs/msmcobalt/aanc_tuning_mixer_tavil.txt
new file mode 100644
index 0000000..78156d3
--- /dev/null
+++ b/configs/msmcobalt/aanc_tuning_mixer_tavil.txt
@@ -0,0 +1,151 @@
+#ANC_TEST_P_PATH_MIC_STEREO Capture
+acdb_dev_id:85
+!Capture
+Txdevice:0
+
+enable
+AIF1_CAP Mixer SLIM TX7:1
+AIF1_CAP Mixer SLIM TX8:1
+CDC_IF TX7 MUX:DEC7
+ADC MUX7:DMIC
+DMIC MUX7:DMIC4
+CDC_IF TX8 MUX:DEC8
+ADC MUX8:DMIC
+DMIC MUX8:DMIC0
+SLIM_0_TX Channels:Two
+MultiMedia1 Mixer SLIM_0_TX:1
+
+disable
+MultiMedia1 Mixer SLIM_0_TX:0
+AIF1_CAP Mixer SLIM TX7:0
+AIF1_CAP Mixer SLIM TX8:0
+CDC_IF TX7 MUX:ZERO
+CDC_IF TX8 MUX:ZERO
+DMIC MUX7:ZERO
+DMIC MUX8:ZERO
+
+#ANC_TEST_S_PATH_MIC_STEREO Capture
+acdb_dev_id:88
+!Capture
+Txdevice:0
+
+enable
+AIF1_CAP Mixer SLIM TX7:1
+AIF1_CAP Mixer SLIM TX8:1
+CDC_IF TX7 MUX:DEC7
+ADC MUX7:ANC_FB_TUNE1
+ADC MUX10:DMIC
+DMIC MUX10:DMIC0
+CDC_IF TX8 MUX:DEC8
+ADC MUX8:ANC_FB_TUNE2
+ADC MUX12:DMIC
+DMIC MUX12:DMIC0
+ANC0 FB MUX:ANC_IN_EAR_SPKR
+ANC OUT EAR SPKR Enable Switch:1
+SLIM_0_TX Channels:Two
+MultiMedia1 Mixer SLIM_0_TX:1
+
+disable
+MultiMedia1 Mixer SLIM_0_TX:0
+AIF1_CAP Mixer SLIM TX7:0
+AIF1_CAP Mixer SLIM TX8:0
+CDC_IF TX7 MUX:ZERO
+CDC_IF TX8 MUX:ZERO
+ADC MUX7:DMIC
+ADC MUX8:DMIC
+DMIC MUX10:ZERO
+DMIC MUX12:ZERO
+ANC0 FB MUX:ZERO
+ANC OUT EAR SPKR Enable Switch:0
+
+
+#ANC_TEST_E_PATH_MIC_STEREO Capture
+acdb_dev_id:91
+!Capture
+Txdevice:0
+
+enable
+AIF1_CAP Mixer SLIM TX7:1
+AIF1_CAP Mixer SLIM TX8:1
+CDC_IF TX7 MUX:DEC7
+ADC MUX7:ANC_FB_TUNE1
+ADC MUX10:DMIC
+DMIC MUX10:DMIC4
+CDC_IF TX8 MUX:DEC8
+ADC MUX8:ANC_FB_TUNE2
+ADC MUX12:DMIC
+DMIC MUX12:DMIC4
+ANC0 FB MUX:ANC_IN_EAR_SPKR
+ANC OUT EAR SPKR Enable Switch:1
+SLIM_0_TX Channels:Two
+MultiMedia1 Mixer SLIM_0_TX:1
+
+disable
+MultiMedia1 Mixer SLIM_0_TX:0
+AIF1_CAP Mixer SLIM TX7:0
+AIF1_CAP Mixer SLIM TX8:0
+CDC_IF TX7 MUX:ZERO
+CDC_IF TX8 MUX:ZERO
+ADC MUX7:DMIC
+ADC MUX8:DMIC
+DMIC MUX10:ZERO
+DMIC MUX12:ZERO
+ANC0 FB MUX:ZERO
+ANC OUT EAR SPKR Enable Switch:0
+
+
+#ANC_TEST_S_PATH_HANDSET_SPKR_ANC_MONO
+acdb_dev_id:86
+!Playback
+Rxdevice:0
+
+enable
+ANC Function:ON
+SLIM RX0 MUX:AIF1_PB
+SLIM_0_RX Channels:One
+RX INT7_1 MIX1 INP0:RX0
+SpkrLeft SWR DAC_Port Switch:1
+ANC Slot:7
+ANC OUT EAR SPKR Enable Switch:1
+ANC SPKR PA Enable Switch:1
+SpkrLeft WSA PA Gain:G_6_DB
+SLIMBUS_0_RX Audio Mixer MultiMedia1:1
+
+disable
+SLIMBUS_0_RX Audio Mixer MultiMedia1:0
+SpkrLeft WSA PA Gain:G_0_DB
+ANC SPKR PA Enable Switch:0
+ANC OUT EAR SPKR Enable Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+ANC Slot:0
+SLIM RX0 MUX:ZERO
+RX INT7_1 MIX1 INP0:ZERO
+ANC Function:OFF
+
+#ANC_TEST_E_PATH_HANDSET_SPKR_ANC_MONO
+acdb_dev_id:89
+!Playback
+Rxdevice:0
+
+enable
+ANC Function:ON
+SLIM RX0 MUX:AIF1_PB
+SLIM_0_RX Channels:One
+RX INT7_1 MIX1 INP0:RX0
+SpkrLeft SWR DAC_Port Switch:1
+ANC Slot:8
+ANC OUT EAR SPKR Enable Switch:1
+ANC SPKR PA Enable Switch:1
+SpkrLeft WSA PA Gain:G_6_DB
+SLIMBUS_0_RX Audio Mixer MultiMedia1:1
+
+disable
+SLIMBUS_0_RX Audio Mixer MultiMedia1:0
+SpkrLeft WSA PA Gain:G_0_DB
+ANC SPKR PA Enable Switch:0
+ANC OUT EAR SPKR Enable Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+ANC Slot:0
+SLIM RX0 MUX:ZERO
+RX INT7_1 MIX1 INP0:ZERO
+ANC Function:OFF
diff --git a/configs/msmcobalt/audio_effects.conf b/configs/msmcobalt/audio_effects.conf
index 5738cf9..d643592 100644
--- a/configs/msmcobalt/audio_effects.conf
+++ b/configs/msmcobalt/audio_effects.conf
@@ -48,6 +48,9 @@
volume_listener {
path /system/lib/soundfx/libvolumelistener.so
}
+ audiosphere {
+ path /system/lib/soundfx/libasphere.so
+ }
}
# Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -252,6 +255,10 @@
library volume_listener
uuid 0b776dde-0590-11e5-81ba-0025b32654a0
}
+ audiosphere {
+ library audiosphere
+ uuid 184e62ab-2d19-4364-9d1b-c0a40733866c
+ }
}
# additional effect from vendor
diff --git a/configs/msmcobalt/audio_output_policy.conf b/configs/msmcobalt/audio_output_policy.conf
index 1bbaad2..e60c664 100644
--- a/configs/msmcobalt/audio_output_policy.conf
+++ b/configs/msmcobalt/audio_output_policy.conf
@@ -42,7 +42,7 @@
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
+ sampling_rates 44100|48000|96000|176400|192000|352800
bit_width 24
app_type 69940
}
diff --git a/configs/msmcobalt/audio_policy.conf b/configs/msmcobalt/audio_policy.conf
index 166b9b6..70ab311 100644
--- a/configs/msmcobalt/audio_policy.conf
+++ b/configs/msmcobalt/audio_policy.conf
@@ -58,7 +58,7 @@
flags AUDIO_OUTPUT_FLAG_DIRECT
}
direct_pcm {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000
+ sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000|352800
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
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_USB_DEVICE|AUDIO_DEVICE_OUT_BLUETOOTH_A2DP|AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES|AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER
diff --git a/configs/msmcobalt/audio_policy_configuration.xml b/configs/msmcobalt/audio_policy_configuration.xml
index 451c85e..157cf82 100644
--- a/configs/msmcobalt/audio_policy_configuration.xml
+++ b/configs/msmcobalt/audio_policy_configuration.xml
@@ -87,10 +87,10 @@
samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"
channelMasks="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"/>
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+ samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800"
channelMasks="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"/>
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
- samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+ samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800"
channelMasks="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"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
diff --git a/configs/msmcobalt/mixer_paths_tavil.xml b/configs/msmcobalt/mixer_paths_tavil.xml
index 1f21f09..2ac549a 100644
--- a/configs/msmcobalt/mixer_paths_tavil.xml
+++ b/configs/msmcobalt/mixer_paths_tavil.xml
@@ -45,28 +45,6 @@
<ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
<ctl name="Voip Dtx Mode" value="0" />
<ctl name="TTY Mode" value="OFF" />
- <ctl name="DEC0 Volume" value="84" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="DEC5 Volume" value="84" />
- <ctl name="DEC6 Volume" value="84" />
- <ctl name="DEC7 Volume" value="84" />
- <ctl name="DEC8 Volume" value="84" />
- <ctl name="ADC1 Volume" value="12" />
- <ctl name="ADC2 Volume" value="12" />
- <ctl name="CDC_IF TX5 MUX" value="ZERO" />
- <ctl name="CDC_IF TX6 MUX" value="ZERO" />
- <ctl name="CDC_IF TX7 MUX" value="ZERO" />
- <ctl name="CDC_IF TX8 MUX" value="ZERO" />
- <ctl name="ADC MUX5" value="AMIC" />
- <ctl name="ADC MUX6" value="AMIC" />
- <ctl name="ADC MUX7" value="AMIC" />
- <ctl name="ADC MUX8" value="AMIC" />
- <ctl name="DMIC MUX5" value="ZERO" />
- <ctl name="DMIC MUX6" value="ZERO" />
- <ctl name="DMIC MUX7" value="ZERO" />
- <ctl name="DMIC MUX8" value="ZERO" />
- <ctl name="AMIC MUX0" value="ZERO" />
- <ctl name="AMIC MUX6" value="ZERO" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
@@ -204,8 +182,9 @@
<ctl name="SLIM_2_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
+ <ctl name="AIF1_CAP Mixer SLIM TX9" value="0"/>
<ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX5" value="0"/>
<ctl name="AIF1_CAP Mixer SLIM TX4" value="0" />
@@ -215,6 +194,13 @@
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="HDMI Mixer MultiMedia4" value="0" />
+ <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
+ <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="ZERO" />
+ <ctl name="VI_FEED_TX Channels" value="Two" />
+ <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
+ <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
+ <ctl name="SLIM_4_TX Format" value="UNPACKED" />
+ <ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
<!-- HFP start -->
<ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />
@@ -326,7 +312,7 @@
<!-- split a2dp -->
<ctl name="BT SampleRate" value="KHZ_8" />
<ctl name="AFE Input Channels" value="Zero" />
- <ctl name="SLIM7_RX ADM Channels" value="0" />
+ <ctl name="SLIM7_RX ADM Channels" value="Zero" />
<!-- split a2dp end-->
<!-- ADSP testfwk -->
@@ -337,6 +323,95 @@
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
<!-- Codec controls -->
+ <!-- WSA controls -->
+ <ctl name="SpkrLeft COMP Switch" value="0" />
+ <ctl name="SpkrRight COMP Switch" value="0" />
+ <ctl name="SpkrLeft BOOST Switch" value="0" />
+ <ctl name="SpkrRight BOOST Switch" value="0" />
+ <ctl name="SpkrLeft VISENSE Switch" value="0" />
+ <ctl name="SpkrRight VISENSE Switch" value="0" />
+ <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
+ <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
+ <ctl name="SpkrLeft WSA PA Gain" value="G_0_DB" />
+
+ <!-- Volume controls -->
+ <ctl name="LINEOUT1 Volume" value="13" />
+ <ctl name="LINEOUT2 Volume" value="13" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
+ <ctl name="EAR PA Gain" value="G_6_DB" />
+ <ctl name="EAR SPKR PA Gain" value="G_DEFAULT" />
+
+ <ctl name="RX0 Digital Volume" value="84" />
+ <ctl name="RX1 Digital Volume" value="84" />
+ <ctl name="RX2 Digital Volume" value="84" />
+ <ctl name="RX3 Digital Volume" value="84" />
+ <ctl name="RX4 Digital Volume" value="84" />
+ <ctl name="RX5 Digital Volume" value="84" />
+ <ctl name="RX6 Digital Volume" value="84" />
+ <ctl name="RX7 Digital Volume" value="84" />
+ <ctl name="ADC1 Volume" value="12" />
+ <ctl name="ADC2 Volume" value="12" />
+ <ctl name="ADC3 Volume" value="12" />
+ <ctl name="ADC4 Volume" value="12" />
+ <ctl name="DEC0 Volume" value="84" />
+ <ctl name="DEC1 Volume" value="84" />
+ <ctl name="DEC2 Volume" value="84" />
+ <ctl name="DEC3 Volume" value="84" />
+ <ctl name="DEC4 Volume" value="84" />
+ <ctl name="DEC5 Volume" value="84" />
+ <ctl name="DEC6 Volume" value="84" />
+ <ctl name="DEC7 Volume" value="84" />
+ <ctl name="DEC8 Volume" value="84" />
+
+ <!-- Compander controls -->
+ <ctl name="COMP1 Switch" value="1" />
+ <ctl name="COMP2 Switch" value="1" />
+ <ctl name="COMP7 Switch" value="0" />
+ <ctl name="COMP8 Switch" value="0" />
+
+ <!-- ADC, DMIC and AMIC controls -->
+ <ctl name="ADC MUX0" value="AMIC" />
+ <ctl name="ADC MUX1" value="AMIC" />
+ <ctl name="ADC MUX2" value="AMIC" />
+ <ctl name="ADC MUX3" value="AMIC" />
+ <ctl name="ADC MUX4" value="AMIC" />
+ <ctl name="ADC MUX5" value="AMIC" />
+ <ctl name="ADC MUX6" value="AMIC" />
+ <ctl name="ADC MUX7" value="AMIC" />
+ <ctl name="ADC MUX8" value="AMIC" />
+ <ctl name="ADC MUX10" value="AMIC" />
+ <ctl name="ADC MUX11" value="AMIC" />
+ <ctl name="ADC MUX12" value="AMIC" />
+ <ctl name="ADC MUX13" value="AMIC" />
+ <ctl name="DMIC MUX0" value="ZERO" />
+ <ctl name="DMIC MUX1" value="ZERO" />
+ <ctl name="DMIC MUX2" value="ZERO" />
+ <ctl name="DMIC MUX3" value="ZERO" />
+ <ctl name="DMIC MUX4" value="ZERO" />
+ <ctl name="DMIC MUX5" value="ZERO" />
+ <ctl name="DMIC MUX6" value="ZERO" />
+ <ctl name="DMIC MUX7" value="ZERO" />
+ <ctl name="DMIC MUX8" value="ZERO" />
+ <ctl name="DMIC MUX10" value="ZERO" />
+ <ctl name="DMIC MUX11" value="ZERO" />
+ <ctl name="DMIC MUX12" value="ZERO" />
+ <ctl name="DMIC MUX13" value="ZERO" />
+ <ctl name="AMIC MUX0" value="ZERO" />
+ <ctl name="AMIC MUX1" value="ZERO" />
+ <ctl name="AMIC MUX2" value="ZERO" />
+ <ctl name="AMIC MUX3" value="ZERO" />
+ <ctl name="AMIC MUX4" value="ZERO" />
+ <ctl name="AMIC MUX5" value="ZERO" />
+ <ctl name="AMIC MUX6" value="ZERO" />
+ <ctl name="AMIC MUX7" value="ZERO" />
+ <ctl name="AMIC MUX8" value="ZERO" />
+ <ctl name="AMIC MUX10" value="ZERO" />
+ <ctl name="AMIC MUX11" value="ZERO" />
+ <ctl name="AMIC MUX12" value="ZERO" />
+ <ctl name="AMIC MUX13" value="ZERO" />
+
+ <!-- CDC_IF and SLIM controls -->
<ctl name="SLIM RX0 MUX" value="ZERO" />
<ctl name="SLIM RX1 MUX" value="ZERO" />
<ctl name="SLIM RX2 MUX" value="ZERO" />
@@ -353,66 +428,104 @@
<ctl name="CDC_IF RX5 MUX" value="SLIM RX5" />
<ctl name="CDC_IF RX6 MUX" value="SLIM RX6" />
<ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
+ <ctl name="CDC_IF TX0 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX1 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX2 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX3 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX4 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX5 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX6 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX7 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX8 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX9 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX10 MUX" value="ZERO" />
+ <ctl name="CDC_IF TX13 MUX" value="ZERO" />
+
+ <!-- Interpolator chain controls -->
+ <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
+ <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
+ <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
<ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
+ <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
+ <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
<ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="ZERO" />
+ <ctl name="RX INT2_1 MIX1 INP2" value="ZERO" />
+ <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
+ <ctl name="RX INT7_1 MIX1 INP1" value="ZERO" />
+ <ctl name="RX INT7_1 MIX1 INP2" value="ZERO" />
+ <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
+ <ctl name="RX INT8_1 MIX1 INP1" value="ZERO" />
+ <ctl name="RX INT8_1 MIX1 INP2" value="ZERO" />
+ <ctl name="RX INT0_2 MUX" value="ZERO" />
<ctl name="RX INT1_2 MUX" value="ZERO" />
<ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name="RX INT7_1 MIX1 INP0" value="ZERO" />
- <ctl name="RX INT8_1 MIX1 INP0" value="ZERO" />
- <ctl name="COMP1 Switch" value="1" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
-
+ <ctl name="RX INT7_2 MUX" value="ZERO" />
+ <ctl name="RX INT8_2 MUX" value="ZERO" />
<ctl name="RX INT1_1 NATIVE MUX" value="OFF" />
<ctl name="RX INT2_1 NATIVE MUX" value="OFF" />
<ctl name="RX INT1_2 NATIVE MUX" value="OFF" />
<ctl name="RX INT2_2 NATIVE MUX" value="OFF" />
-
<ctl name="ASRC0 MUX" value="ZERO" />
- <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
<ctl name="ASRC1 MUX" value="ZERO" />
+ <ctl name="RX INT1 SEC MIX HPHL Switch" value="0" />
<ctl name="RX INT2 SEC MIX HPHR Switch" value="0" />
- <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
- <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="ZERO" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
- <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
- <ctl name="SLIM_4_TX Format" value="UNPACKED" />
-
<ctl name="DSD_L IF MUX" value="ZERO" />
<ctl name="DSD_R IF MUX" value="ZERO" />
<ctl name="RX INT1 MIX3 DSD HPHL Switch" value="0" />
<ctl name="RX INT2 MIX3 DSD HPHR Switch" value="0" />
+ <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="CDC_IF TX0 MUX" value="ZERO" />
- <ctl name="CDC_IF TX2 MUX" value="ZERO" />
- <ctl name="ADC MUX0" value="ZERO" />
- <ctl name="ADC MUX2" value="ZERO" />
- <ctl name="DMIC MUX0" value="ZERO" />
- <ctl name="DMIC MUX2" value="ZERO" />
-
- <ctl name="RX7 Digital Volume" value="84" />
- <ctl name="RX8 Digital Volume" value="84" />
<!-- IIR/voice anc -->
- <!-- IIR/voice anc end -->
- <!-- anc handset -->
- <!-- anc handset end -->
- <!-- anc headset end -->
- <!-- aanc handset mic -->
- <!-- aanc handset mic end -->
- <!-- ssr qmic -->
- <!-- ssr qmic end-->
+ <ctl name="IIR0 Band1" id ="0" value="268435456" />
+ <ctl name="IIR0 Band1" id ="1" value="0" />
+ <ctl name="IIR0 Band1" id ="2" value="0" />
+ <ctl name="IIR0 Band1" id ="3" value="0" />
+ <ctl name="IIR0 Band1" id ="4" value="0" />
+ <ctl name="IIR0 Band2" id ="0" value="268435456" />
+ <ctl name="IIR0 Band2" id ="1" value="0" />
+ <ctl name="IIR0 Band2" id ="2" value="0" />
+ <ctl name="IIR0 Band2" id ="3" value="0" />
+ <ctl name="IIR0 Band2" id ="4" value="0" />
+ <ctl name="IIR0 Band3" id ="0" value="268435456" />
+ <ctl name="IIR0 Band3" id ="1" value="0" />
+ <ctl name="IIR0 Band3" id ="2" value="0" />
+ <ctl name="IIR0 Band3" id ="3" value="0" />
+ <ctl name="IIR0 Band3" id ="4" value="0" />
+ <ctl name="IIR0 Band4" id ="0" value="268435456" />
+ <ctl name="IIR0 Band4" id ="1" value="0" />
+ <ctl name="IIR0 Band4" id ="2" value="0" />
+ <ctl name="IIR0 Band4" id ="3" value="0" />
+ <ctl name="IIR0 Band4" id ="4" value="0" />
+ <ctl name="IIR0 Band5" id ="0" value="268435456" />
+ <ctl name="IIR0 Band5" id ="1" value="0" />
+ <ctl name="IIR0 Band5" id ="2" value="0" />
+ <ctl name="IIR0 Band5" id ="3" value="0" />
+ <ctl name="IIR0 Band5" id ="4" value="0" />
+ <ctl name="IIR0 Enable Band1" value="0" />
+ <ctl name="IIR0 Enable Band2" value="0" />
+ <ctl name="IIR0 Enable Band3" value="0" />
+ <ctl name="IIR0 Enable Band4" value="0" />
+ <ctl name="IIR0 Enable Band5" value="0" />
+ <ctl name="IIR0 INP0 Volume" value="54" />
+ <ctl name="IIR0 INP0 MUX" value="ZERO" />
+ <ctl name="IIR0 INP1 MUX" value="ZERO" />
+ <ctl name="IIR0 INP2 MUX" value="ZERO" />
+ <ctl name="IIR1 INP0 MUX" value="ZERO" />
+ <ctl name="IIR1 INP1 MUX" value="ZERO" />
+ <ctl name="IIR1 INP2 MUX" value="ZERO" />
+
+ <!-- anc related -->
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ANC Function" value="OFF" />
+ <ctl name="ANC0 FB MUX" value="ZERO" />
+ <ctl name="ANC1 FB MUX" value="ZERO" />
+ <ctl name="ANC OUT EAR Enable Switch" value="0" />
+ <ctl name="ANC OUT EAR SPKR Enable Switch" value="0" />
+ <ctl name="ANC SPKR PA Enable Switch" value="0" />
+
<!-- vbat related data -->
<!-- vbat related data end -->
@@ -430,6 +543,7 @@
</path>
<path name="echo-reference">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
</path>
<path name="echo-reference headphones">
@@ -1520,6 +1634,7 @@
<ctl name="CDC_IF TX6 MUX" value="DEC6" />
<ctl name="ADC MUX6" value="AMIC" />
<ctl name="AMIC MUX6" value="ADC1" />
+ <ctl name="IIR0 INP0 MUX" value="DEC6" />
</path>
<path name="amic2">
@@ -1528,6 +1643,7 @@
<ctl name="CDC_IF TX0 MUX" value="DEC0" />
<ctl name="ADC MUX0" value="AMIC" />
<ctl name="AMIC MUX0" value="ADC2" />
+ <ctl name="IIR0 INP0 MUX" value="DEC0" />
</path>
<!-- For Tavil, DMIC numbered from 0 to 5 -->
@@ -1537,6 +1653,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC0" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic2">
@@ -1545,6 +1662,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC1" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic3">
@@ -1553,6 +1671,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC2" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic4">
@@ -1561,6 +1680,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC3" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic5">
@@ -1569,6 +1689,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC4" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic6">
@@ -1577,6 +1698,7 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC5" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="speaker">
@@ -1599,9 +1721,6 @@
<ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
- <path name="speaker-fluid">
- </path>
-
<path name="speaker-mono">
<ctl name="SLIM RX0 MUX" value="AIF1_PB" />
<ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
@@ -1614,6 +1733,10 @@
<ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
</path>
+ <path name="speaker-fluid">
+ <path name="speaker-mono" />
+ </path>
+
<path name="speaker-liquid">
<path name="speaker" />
</path>
@@ -1627,14 +1750,24 @@
</path>
<path name="sidetone-iir">
- </path>
+ <ctl name="IIR0 Enable Band1" value="1" />
+ <ctl name="IIR0 Enable Band2" value="1" />
+ <ctl name="IIR0 Enable Band3" value="1" />
+ <ctl name="IIR0 Enable Band4" value="1" />
+ <ctl name="IIR0 Enable Band5" value="1" />
+ </path>
<path name="sidetone-headphones">
<path name="sidetone-iir" />
+ <ctl name="IIR0 INP0 Volume" value="54" />
+ <ctl name="RX INT1 MIX2 INP" value="SRC0" />
+ <ctl name="RX INT2 MIX2 INP" value="SRC0" />
</path>
<path name="sidetone-handset">
<path name="sidetone-iir" />
+ <ctl name="IIR0 INP0 Volume" value="54" />
+ <ctl name="RX INT7 MIX2 INP" value="SRC0" />
</path>
<path name="speaker-mic">
@@ -1685,9 +1818,8 @@
<ctl name="COMP7 Switch" value="1" />
<ctl name="SpkrLeft COMP Switch" value="1" />
<ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
<ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="RX7 Digital Volume" value="76" />
+ <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
</path>
<path name="handset-mic">
@@ -1721,6 +1853,16 @@
</path>
<path name="anc-handset">
+ <ctl name="ANC Function" value="ON" />
+ <ctl name="ANC Slot" value="6" />
+ <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
+ <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
+ <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
+ <ctl name="ANC OUT EAR SPKR Enable Switch" value="1" />
+ <ctl name="ANC SPKR PA Enable Switch" value="1" />
+ <ctl name="SpkrLeft WSA PA Gain" value="G_6_DB" />
</path>
<path name="headphones">
@@ -1837,6 +1979,7 @@
</path>
<path name="anc-headphones">
+ <path name="headphones" />
</path>
<path name="speaker-and-anc-headphones">
@@ -1854,9 +1997,11 @@
</path>
<path name="voice-anc-headphones">
+ <path name="voice-headphones" />
</path>
<path name="voice-anc-fb-headphones">
+ <path name="voice-headphones" />
</path>
<path name="speaker-and-anc-headphones-liquid">
@@ -1915,6 +2060,24 @@
</path>
<path name="aanc-handset-mic">
+ <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Three" />
+ <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
+ <ctl name="CDC_IF TX6 MUX" value="DEC6" />
+ <ctl name="ADC MUX6" value="DMIC" />
+ <ctl name="DMIC MUX6" value="DMIC2" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC4" />
+ <ctl name="CDC_IF TX9 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC0" />
+ <ctl name="IIR0 INP0 MUX" value="DEC6" />
+ <ctl name="ADC MUX10" value="DMIC" />
+ <ctl name="DMIC MUX10" value="DMIC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<!-- Dual MIC devices -->
@@ -1944,10 +2107,12 @@
<path name="dmic-endfire">
<path name="handset-dmic-endfire" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="dmic-endfire-liquid">
<path name="handset-dmic-endfire" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="handset-stereo-dmic-ef">
@@ -2016,6 +2181,7 @@
<path name="dmic-broadside">
<path name="speaker-dmic-broadside" />
+ <ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
<path name="voice-speaker-dmic-broadside">
@@ -2065,6 +2231,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
</path>
<path name="voice-tty-full-headphones">
diff --git a/configs/msmcobalt/msmcobalt.mk b/configs/msmcobalt/msmcobalt.mk
index 80913c4..e3b05ef 100644
--- a/configs/msmcobalt/msmcobalt.mk
+++ b/configs/msmcobalt/msmcobalt.mk
@@ -52,6 +52,7 @@
AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
##AUDIO_FEATURE_FLAGS
@@ -77,6 +78,7 @@
hardware/qcom/audio/configs/msmcobalt/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
hardware/qcom/audio/configs/msmcobalt/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
+ hardware/qcom/audio/configs/msmcobalt/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
hardware/qcom/audio/configs/msmcobalt/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
hardware/qcom/audio/configs/msmcobalt/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
hardware/qcom/audio/configs/msmcobalt/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
diff --git a/configs/msmcobalt/sound_trigger_platform_info.xml b/configs/msmcobalt/sound_trigger_platform_info.xml
index 7ce74aa..6c9f55e 100644
--- a/configs/msmcobalt/sound_trigger_platform_info.xml
+++ b/configs/msmcobalt/sound_trigger_platform_info.xml
@@ -27,19 +27,17 @@
<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<sound_trigger_platform_info>
<param version="0x0101" /> <!-- this must be the first param -->
-
<common_config>
- <param max_cpe_sessions="2" />
+ <param max_cpe_sessions="1" />
+ <param max_wdsp_sessions="2" />
<param max_ape_sessions="8" />
<param enable_failure_detection="false" />
</common_config>
-
<acdb_ids>
- <param DEVICE_HANDSET_APE_ACDB_ID="100" />
- <param DEVICE_HANDSET_CPE_ACDB_ID="128" />
- <param DEVICE_HANDSET_CPE_ECPP_ACDB_ID="128" />
+ <param DEVICE_HANDSET_MIC_APE="100" />
+ <param DEVICE_HANDSET_MIC_CPE="128" />
+ <param DEVICE_HANDSET_MIC_ECPP_CPE="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. -->
@@ -53,26 +51,23 @@
<param max_ape_phrases="10" />
<param max_ape_users="10" />
<param sample_rate="16000" />
-
- <gcs_uid>
+ <gcs_usecase>
<param uid="0x1" />
- <param did="0x4" />
- <param load_sound_model_ids="0x00012C0D, 0x0, 0x00012C14" />
- <param confidence_levels_ids="0x00012C0D, 0x0, 0x00012C28" />
- <param operation_mode_ids="0x00012C0D, 0x0, 0x00012C28" />
- <param detection_event_ids="0x00012C0D, 0x0, 0x00012C29" />
- <param capture_event_ids="0x00020013, 0x0,0x00020015" />
- </gcs_uid>
- <gcs_uid>
+ <!-- module_id, instance_id, param_id -->
+ <param load_sound_model_ids="0x00012C0D, 0x2, 0x00012C14" />
+ <param confidence_levels_ids="0x00012C0D, 0x2, 0x00012C28" />
+ <param detection_event_ids="0x00012C0D, 0x2, 0x00012C29" />
+ <param read_cmd_ids="0x00020013, 0x2, 0x00020015" />
+ <param read_rsp_ids="0x00020013, 0x2, 0x00020016" />
+ </gcs_usecase>
+ <gcs_usecase>
<param uid="0x2" />
- <param did="0x4" />
- <param load_sound_model_ids="0x00012C0D, 0x1, 0x00012C14" />
- <param confidence_levels_ids="0x00012C0D, 0x1, 0x00012C28" />
- <param operation_mode_ids="0x00012C0D, 0x1 0x00012C28" />
- <param detection_event_ids="0x00012C0D, 0x1, 0x00012C29" />
- <param capture_event_ids="0x00020013, 0x1,0x00020015" />
- </gcs_uid>
-
+ <param load_sound_model_ids="0x00012C0D, 0x3, 0x00012C14" />
+ <param confidence_levels_ids="0x00012C0D, 0x3, 0x00012C28" />
+ <param detection_event_ids="0x00012C0D, 0x3, 0x00012C29" />
+ <param read_cmd_ids="0x00020013, 0x3, 0x00020015" />
+ <param read_rsp_ids="0x00020013, 0x3, 0x00020016" />
+ </gcs_usecase>
<!-- Module and param ids with which the algorithm is integrated
in non-graphite firmware (note these must come after gcs params) -->
<param load_sound_model_ids="0x00012C0D, 0x00012C14" />
@@ -87,5 +82,4 @@
<param capture_keyword="PCM_packet, RT, 2000" />
<param client_capture_read_delay="2000" />
</sound_model_config>
-
</sound_trigger_platform_info>
diff --git a/hal/Android.mk b/hal/Android.mk
index 812ed99..f457c7b 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -314,6 +314,11 @@
LOCAL_CFLAGS += -DDISPLAY_PORT_ENABLED
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_GEF_SUPPORT)),true)
+ LOCAL_CFLAGS += -DAUDIO_GENERIC_EFFECT_FRAMEWORK_ENABLED
+ LOCAL_SRC_FILES += audio_extn/gef.c
+endif
+
LOCAL_CFLAGS += -Wall -Werror
LOCAL_COPY_HEADERS_TO := mm-audio
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index ce2cb46..92fb592 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -596,6 +596,41 @@
struct str_parms *parms);
#endif
+#ifndef AUDIO_GENERIC_EFFECT_FRAMEWORK_ENABLED
+
+#define audio_extn_gef_init(adev) (0)
+#define audio_extn_gef_deinit() (0)
+#define audio_extn_gef_notify_device_config(devices, cmask, acdb_id) (0)
+#define audio_extn_gef_send_audio_cal(dev, acdb_dev_id, acdb_device_type,\
+ app_type, topology_id, sample_rate, module_id, param_id, data, length, persist) (0)
+#define audio_extn_gef_get_audio_cal(adev, acdb_dev_id, acdb_device_type,\
+ app_type, topology_id, sample_rate, module_id, param_id, data, length, persist) (0)
+#define audio_extn_gef_store_audio_cal(adev, acdb_dev_id, acdb_device_type,\
+ app_type, topology_id, sample_rate, module_id, param_id, data, length) (0)
+#define audio_extn_gef_retrieve_audio_cal(adev, acdb_dev_id, acdb_device_type,\
+ app_type, topology_id, sample_rate, module_id, param_id, data, length) (0)
+
+#else
+
+void audio_extn_gef_init(struct audio_device *adev);
+void audio_extn_gef_deinit();
+
+void audio_extn_gef_notify_device_config(audio_devices_t audio_device,
+ audio_channel_mask_t channel_mask, int acdb_id);
+int audio_extn_gef_send_audio_cal(void* adev, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int length, bool persist);
+int audio_extn_gef_get_audio_cal(void* adev, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int* length, bool persist);
+int audio_extn_gef_store_audio_cal(void* adev, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int length);
+int audio_extn_gef_retrieve_audio_cal(void* adev, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int* length);
+
+#endif /* AUDIO_GENERIC_EFFECT_FRAMEWORK_ENABLED */
typedef void (* snd_mon_cb)(void * stream, struct str_parms * parms);
#ifndef SND_MONITOR_ENABLED
diff --git a/hal/audio_extn/gef.c b/hal/audio_extn/gef.c
new file mode 100644
index 0000000..d0ccd8c
--- /dev/null
+++ b/hal/audio_extn/gef.c
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 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
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define LOG_TAG "audio_hw_generic_effect"
+//#define LOG_NDEBUG 0
+#define LOG_NDDEBUG 0
+
+#include <errno.h>
+#include <math.h>
+#include <cutils/log.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include "audio_hw.h"
+#include "platform.h"
+#include "platform_api.h"
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <math.h>
+#include <cutils/properties.h>
+#include "audio_extn.h"
+#include "audio_hw.h"
+
+#ifdef AUDIO_GENERIC_EFFECT_FRAMEWORK_ENABLED
+
+#define GEF_LIBRARY "/system/vendor/lib/libqtigef.so"
+
+typedef void* (*gef_init_t)(void*);
+typedef void (*gef_device_config_cb_t)(void*, audio_devices_t,
+ audio_channel_mask_t, int);
+
+typedef struct {
+ void* handle;
+ void* gef_ptr;
+ gef_init_t init;
+ gef_device_config_cb_t device_config_cb;
+} gef_data;
+
+static gef_data gef_hal_handle;
+
+typedef enum {
+ ASM = 0,
+ ADM
+} gef_calibration_type;
+
+typedef enum {
+ AUDIO_DEVICE_CAL_TYPE = 0,
+ AUDIO_STREAM_CAL_TYPE,
+} acdb_device_type;
+
+
+static acdb_device_type make_acdb_device_type_from_gef_cal_type
+ (gef_calibration_type gef_cal_type)
+{
+ int acdb_device_type = 0;
+
+ switch (gef_cal_type) {
+ case ASM:
+ acdb_device_type = AUDIO_STREAM_CAL_TYPE;
+ break;
+ case ADM:
+ acdb_device_type = AUDIO_DEVICE_CAL_TYPE;
+ break;
+ default:
+ acdb_device_type = -1;
+ break;
+ }
+
+ return ((int)acdb_device_type);
+}
+
+void audio_extn_gef_init(struct audio_device *adev)
+{
+ int ret = 0;
+ const char* error = NULL;
+
+ ALOGV("%s: Enter with error", __func__);
+
+ memset(&gef_hal_handle, 0, sizeof(gef_data));
+
+ ret = access(GEF_LIBRARY, R_OK);
+ if (ret == 0) {
+ //: check error for dlopen
+ gef_hal_handle.handle = dlopen(GEF_LIBRARY, RTLD_LAZY);
+ if (gef_hal_handle.handle == NULL) {
+ ALOGE("%s: DLOPEN failed for %s with error %s",
+ __func__, GEF_LIBRARY, dlerror());
+ goto ERROR_RETURN;
+ } else {
+ ALOGV("%s: DLOPEN successful for %s", __func__, GEF_LIBRARY);
+
+ //call dlerror to clear the error
+ dlerror();
+ gef_hal_handle.init =
+ (gef_init_t)dlsym(gef_hal_handle.handle, "gef_init");
+ error = dlerror();
+
+ if(error != NULL) {
+ ALOGE("%s: dlsym of %s failed with error %s",
+ __func__, "gef_init", error);
+ goto ERROR_RETURN;
+ }
+
+ //call dlerror to clear the error
+ error = dlerror();
+ gef_hal_handle.device_config_cb =
+ (gef_device_config_cb_t)dlsym(gef_hal_handle.handle,
+ "gef_device_config_cb");
+ error = dlerror();
+
+ if(error != NULL) {
+ ALOGE("%s: dlsym of %s failed with error %s",
+ __func__, "gef_device_config_cb", error);
+ goto ERROR_RETURN;
+ }
+
+ gef_hal_handle.gef_ptr = gef_hal_handle.init((void*)adev);
+ }
+ } else {
+ ALOGE("%s: %s access failed", __func__, GEF_LIBRARY);
+ }
+
+ERROR_RETURN:
+ ALOGV("%s: Exit with error %d", __func__, ret);
+ return;
+}
+
+
+//this will be called from GEF to exchange calibration using acdb
+int audio_extn_gef_send_audio_cal(void* dev, int acdb_dev_id,
+ int gef_cal_type, int app_type, int topology_id, int sample_rate,
+ uint32_t module_id, uint32_t param_id, void* data, int length, bool persist)
+{
+ int ret = 0;
+ struct audio_device *adev = (struct audio_device*)dev;
+ int acdb_device_type =
+ make_acdb_device_type_from_gef_cal_type(gef_cal_type);
+
+ ALOGV("%s: Enter", __func__);
+
+ //lock adev
+ pthread_mutex_lock(&adev->lock);
+
+ //send cal
+ ret = platform_send_audio_cal(adev->platform, acdb_dev_id,
+ acdb_device_type, app_type, topology_id, sample_rate,
+ module_id, param_id, data, length, persist);
+
+ pthread_mutex_unlock(&adev->lock);
+
+ ALOGV("%s: Exit with error %d", __func__, ret);
+
+ return ret;
+}
+
+//this will be called from GEF to exchange calibration using acdb
+int audio_extn_gef_get_audio_cal(void* dev, int acdb_dev_id,
+ int gef_cal_type, int app_type, int topology_id, int sample_rate,
+ uint32_t module_id, uint32_t param_id, void* data, int* length, bool persist)
+{
+ int ret = 0;
+ struct audio_device *adev = (struct audio_device*)dev;
+ int acdb_device_type =
+ make_acdb_device_type_from_gef_cal_type(gef_cal_type);
+
+ ALOGV("%s: Enter", __func__);
+
+ //lock adev
+ pthread_mutex_lock(&adev->lock);
+
+ ret = platform_get_audio_cal(adev->platform, acdb_dev_id,
+ acdb_device_type, app_type, topology_id, sample_rate,
+ module_id, param_id, data, length, persist);
+
+ pthread_mutex_unlock(&adev->lock);
+
+ ALOGV("%s: Exit with error %d", __func__, ret);
+
+ return ret;
+}
+
+//this will be called from GEF to store into acdb
+int audio_extn_gef_store_audio_cal(void* dev, int acdb_dev_id,
+ int gef_cal_type, int app_type, int topology_id, int sample_rate,
+ uint32_t module_id, uint32_t param_id, void* data, int length)
+{
+ int ret = 0;
+ struct audio_device *adev = (struct audio_device*)dev;
+ int acdb_device_type =
+ make_acdb_device_type_from_gef_cal_type(gef_cal_type);
+
+ ALOGV("%s: Enter", __func__);
+
+ //lock adev
+ pthread_mutex_lock(&adev->lock);
+
+ ret = platform_store_audio_cal(adev->platform, acdb_dev_id,
+ acdb_device_type, app_type, topology_id, sample_rate,
+ module_id, param_id, data, length);
+
+ pthread_mutex_unlock(&adev->lock);
+
+ ALOGV("%s: Exit with error %d", __func__, ret);
+
+ return ret;
+}
+
+//this will be called from GEF to retrieve calibration using acdb
+int audio_extn_gef_retrieve_audio_cal(void* dev, int acdb_dev_id,
+ int gef_cal_type, int app_type, int topology_id, int sample_rate,
+ uint32_t module_id, uint32_t param_id, void* data, int* length)
+{
+ int ret = 0;
+ struct audio_device *adev = (struct audio_device*)dev;
+ int acdb_device_type =
+ make_acdb_device_type_from_gef_cal_type(gef_cal_type);
+
+ ALOGV("%s: Enter", __func__);
+
+ //lock adev
+ pthread_mutex_lock(&adev->lock);
+
+ ret = platform_retrieve_audio_cal(adev->platform, acdb_dev_id,
+ acdb_device_type, app_type, topology_id, sample_rate,
+ module_id, param_id, data, length);
+
+ pthread_mutex_unlock(&adev->lock);
+
+ ALOGV("%s: Exit with error %d", __func__, ret);
+
+ return ret;
+}
+
+//this will be called from HAL to notify GEF of new device configuration
+void audio_extn_gef_notify_device_config(audio_devices_t audio_device,
+ audio_channel_mask_t channel_mask, int acdb_id)
+{
+ ALOGV("%s: Enter", __func__);
+
+ //call into GEF to share channel mask and device info
+ if (gef_hal_handle.handle && gef_hal_handle.device_config_cb) {
+ gef_hal_handle.device_config_cb(gef_hal_handle.gef_ptr, audio_device, channel_mask,
+ acdb_id);
+ }
+
+ ALOGV("%s: Exit", __func__);
+
+ return;
+}
+
+void audio_extn_gef_deinit()
+{
+ ALOGV("%s: Enter", __func__);
+
+ if (gef_hal_handle.handle) {
+ dlclose(gef_hal_handle.handle);
+ }
+
+ memset(&gef_hal_handle, 0, sizeof(gef_data));
+
+ ALOGV("%s: Exit", __func__);
+}
+
+#endif
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 3077f89..df78f83 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1450,6 +1450,12 @@
usecase->stream.out->channel_mask,
&usecase->stream.out->app_type_cfg);
ALOGI("%s Selected apptype: %d", __func__, usecase->stream.out->app_type_cfg.app_type);
+
+ /* Notify device change info to effect clients registered */
+ audio_extn_gef_notify_device_config(
+ usecase->stream.out->devices,
+ usecase->stream.out->channel_mask,
+ platform_get_snd_device_acdb_id(usecase->out_snd_device));
}
enable_audio_route(adev, usecase);
@@ -4570,6 +4576,7 @@
audio_extn_listen_deinit(adev);
audio_extn_utils_release_streams_output_cfg_list(&adev->streams_output_cfg_list);
audio_route_free(adev->audio_route);
+ audio_extn_gef_deinit();
free(adev->snd_dev_ref_cnt);
platform_deinit(adev->platform);
if (adev->adm_deinit)
@@ -4698,6 +4705,7 @@
}
audio_extn_listen_init(adev, adev->snd_card);
audio_extn_sound_trigger_init(adev);
+ audio_extn_gef_init(adev);
if (access(OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH, R_OK) == 0) {
adev->offload_effects_lib = dlopen(OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH, RTLD_NOW);
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 2540184..25f862e 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -5639,3 +5639,43 @@
{
return false;
}
+
+int platform_send_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id __unused,
+ uint32_t param_id __unused, void* data __unused,
+ int length __unused, bool persist __unused)
+{
+ return -ENOSYS;
+}
+
+int platform_get_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id __unused,
+ uint32_t param_id __unused, void* data __unused,
+ int* length __unused, bool persist __unused)
+{
+ return -ENOSYS;
+}
+
+int platform_store_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id __unused,
+ uint32_t param_id __unused, void* data __unused,
+ int length __unused)
+{
+ return -ENOSYS;
+}
+
+int platform_retrieve_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id __unused,
+ uint32_t param_id __unused, void* data __unused,
+ int* length __unused)
+{
+ return -ENOSYS;
+}
diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index f3c4d28..c1e8e7f 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1237,7 +1237,48 @@
bool platform_check_backends_match(snd_device_t snd_device1 __unused,
snd_device_t snd_device2 __unused)
{
- return true;
+ return -ENOSYS;
+}
+
+int platform_send_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id,
+ uint32_t param_id, void* data __unused,
+ int length __unused, bool persist __unused)
+{
+ return -ENOSYS;
+}
+
+int platform_get_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id,
+ uint32_t param_id, void* data __unused,
+ int* length __unused, bool persist __unused)
+{
+ return -ENOSYS;
+}
+
+int platform_store_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id,
+ uint32_t param_id, void* data __unused,
+ int length __unused)
+{
+ return -ENOSYS;
+}
+
+
+int platform_retrieve_audio_cal(void* platform __unused,
+ int acdb_dev_id __unused, int acdb_device_type __unused,
+ int app_type __unused, int topology_id __unused,
+ int sample_rate __unused, uint32_t module_id,
+ uint32_t param_id, void* data __unused,
+ int* length __unused)
+{
+ return -ENOSYS;
}
int platform_set_sidetone(struct audio_device *adev,
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 91e7235..2dd1d13 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5625,3 +5625,153 @@
}
return 0;
}
+
+static void make_cal_cfg(acdb_audio_cal_cfg_t* cal, int acdb_dev_id,
+ int acdb_device_type, int app_type, int topology_id,
+ int sample_rate, uint32_t module_id, uint32_t param_id, bool persist)
+{
+ int persist_send_flags = 1;
+
+ if (!cal) {
+ return;
+ }
+
+ if (persist)
+ persist_send_flags |= 0x2;
+
+ memset(cal, 0, sizeof(acdb_audio_cal_cfg_t));
+
+ cal->persist = persist;
+ cal->app_type = app_type;
+ cal->acdb_dev_id = acdb_dev_id;
+ cal->sampling_rate = sample_rate;
+ cal->topo_id = topology_id;
+ //if module and param id is set to 0, the whole blob will be stored
+ //or sent to the DSP
+ cal->module_id = module_id;
+ cal->param_id = param_id;
+ cal->cal_type = acdb_device_type;
+ cal->persist = persist;
+
+}
+
+int platform_send_audio_cal(void* platform, int acdb_dev_id,
+ int acdb_device_type, int app_type, int topology_id, int sample_rate,
+ uint32_t module_id, uint32_t param_id, void* data, int length, bool persist)
+{
+ int ret = 0;
+ struct platform_data *my_data = (struct platform_data *)platform;
+ acdb_audio_cal_cfg_t cal;
+ memset(&cal, 0, sizeof(acdb_audio_cal_cfg_t));
+
+ if (!my_data) {
+ ret = -EINVAL;
+ goto ERROR_RETURN;
+ }
+
+ make_cal_cfg(&cal, acdb_dev_id, acdb_device_type, app_type, topology_id,
+ sample_rate, module_id, param_id, true);
+
+ if (my_data->acdb_set_audio_cal) {
+ // persist audio cal in local cache
+ if (persist) {
+ ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);
+ }
+ // send audio cal to dsp
+ if (ret == 0) {
+ cal.persist = false;
+ ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);
+ if (persist && (ret != 0)) {
+ ALOGV("[%s] audio cal stored with success, ignore set cal failure", __func__);
+ ret = 0;
+ }
+ }
+ }
+
+ERROR_RETURN:
+ return ret;
+}
+
+int platform_get_audio_cal(void* platform, int acdb_dev_id,
+ int acdb_device_type, int app_type, int topology_id,
+ int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int* length, bool persist)
+{
+ int ret = 0;
+ struct platform_data *my_data = (struct platform_data *)platform;
+ acdb_audio_cal_cfg_t cal;
+ memset(&cal, 0, sizeof(acdb_audio_cal_cfg_t));
+
+ if (!my_data) {
+ ret = -EINVAL;
+ goto ERROR_RETURN;
+ }
+
+ make_cal_cfg(&cal, acdb_dev_id, acdb_device_type, app_type, topology_id,
+ sample_rate, module_id, param_id, false);
+
+ if (my_data->acdb_get_audio_cal) {
+ // get cal from dsp
+ ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);
+ // get cached cal if prevoius attempt fails and persist flag is set
+ if ((ret != 0) && persist) {
+ cal.persist = true;
+ ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);
+ }
+ }
+
+ERROR_RETURN:
+ return ret;
+}
+
+int platform_store_audio_cal(void* platform, int acdb_dev_id,
+ int acdb_device_type, int app_type, int topology_id,
+ int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int length)
+{
+ int ret = 0;
+ struct platform_data *my_data = (struct platform_data *)platform;
+ acdb_audio_cal_cfg_t cal;
+ memset(&cal, 0, sizeof(acdb_audio_cal_cfg_t));
+
+ if (!my_data) {
+ ret = -EINVAL;
+ goto ERROR_RETURN;
+ }
+
+ make_cal_cfg(&cal, acdb_dev_id, acdb_device_type, app_type, topology_id,
+ sample_rate, module_id, param_id, true);
+
+ if (my_data->acdb_set_audio_cal) {
+ ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);
+ }
+
+ERROR_RETURN:
+ return ret;
+}
+
+int platform_retrieve_audio_cal(void* platform, int acdb_dev_id,
+ int acdb_device_type, int app_type, int topology_id,
+ int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int* length)
+{
+ int ret = 0;
+ struct platform_data *my_data = (struct platform_data *)platform;
+ acdb_audio_cal_cfg_t cal;
+ memset(&cal, 0, sizeof(acdb_audio_cal_cfg_t));
+
+ if (!my_data) {
+ ret = -EINVAL;
+ goto ERROR_RETURN;
+ }
+
+ make_cal_cfg(&cal, acdb_dev_id, acdb_device_type, app_type, topology_id,
+ sample_rate, module_id, param_id, true);
+
+ if (my_data->acdb_get_audio_cal) {
+ ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);
+ }
+
+ERROR_RETURN:
+ return ret;
+}
diff --git a/hal/platform_api.h b/hal/platform_api.h
index 6ca95db..e5f8f8a 100644
--- a/hal/platform_api.h
+++ b/hal/platform_api.h
@@ -160,4 +160,21 @@
bool platform_check_codec_asrc_support(void *platform);
int platform_get_backend_index(snd_device_t snd_device);
int platform_get_ext_disp_type(void *platform);
+
+int platform_send_audio_cal(void* platform, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int length, bool persist);
+
+int platform_get_audio_cal(void* platform, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int* length, bool persist);
+
+int platform_store_audio_cal(void* platform, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int length);
+
+int platform_retrieve_audio_cal(void* platform, int acdb_dev_id, int acdb_device_type,
+ int app_type, int topology_id, int sample_rate, uint32_t module_id, uint32_t param_id,
+ void* data, int* length);
+
#endif // AUDIO_PLATFORM_API_H
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 015ea25..9b950d9 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -557,6 +557,7 @@
((offloadInfo.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_WMA_PRO) ||
((offloadInfo.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_ALAC) ||
((offloadInfo.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_APE) ||
+ ((offloadInfo.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_DSD) ||
((offloadInfo.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_AAC_ADTS))
return false;
#endif
@@ -1072,6 +1073,7 @@
outputDesc->sharesHwModuleWith(desc) &&
(newDevice != desc->device())) {
audio_devices_t dev = getNewOutputDevice(mOutputs.valueFor(curOutput), false /*fromCache*/);
+ bool force = desc->device() != dev;
uint32_t delayMs;
if (dev == prevDevice) {
delayMs = 0;
@@ -1080,7 +1082,7 @@
}
setOutputDevice(desc,
dev,
- true,
+ force,
delayMs);
}
}