commit 3b3d532d983834482f931c47b0a215457cee6e9d
author qctecmdr <qctecmdr@localhost> Mon Aug 24 20:23:22 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 24 20:23:22 2020 -0700
tree 2074710b1c7483cc00a1c80b99d1af0d6ba3be2e
parent d0d4a14a578367c45a34494d35702416dacd7ea5
parent ff5767450a9a13d93eb342ca69b482d97b47e5fc

Merge "configs:  Add 48khz sampling rate to spkr prot tx"

configs/msm8937/audio_platform_info_intcodec.xml

diff --git a/configs/msm8937/audio_platform_info_intcodec.xml b/configs/msm8937/audio_platform_info_intcodec.xml
index bc37572..9415975 100644
--- a/configs/msm8937/audio_platform_info_intcodec.xml
+++ b/configs/msm8937/audio_platform_info_intcodec.xml
@@ -49,6 +49,7 @@
         <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>
         <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />
         <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />
+        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="26"/>
     </pcm_ids>
     <config_params>
         <param key="spkr_1_tz_name" value="wsa881x.0f"/>

configs/msm8937/msm8937.mk

diff --git a/configs/msm8937/msm8937.mk b/configs/msm8937/msm8937.mk
index 681c22f..6d0d756 100644
--- a/configs/msm8937/msm8937.mk
+++ b/configs/msm8937/msm8937.mk
@@ -244,6 +244,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
 vendor.audio.volume.headset.gain.depcal=true
 
+#Set speaker protection cal tx path sampling rate to 48k
+PRODUCT_PROPERTY_OVERRIDES += \
+vendor.audio.spkr_prot.tx.sampling_rate=48000
+
 #add dynamic feature flags here
 PRODUCT_PROPERTY_OVERRIDES += \
 vendor.audio.feature.a2dp_offload.enable=false \

configs/msm8953/audio_platform_info_intcodec.xml

diff --git a/configs/msm8953/audio_platform_info_intcodec.xml b/configs/msm8953/audio_platform_info_intcodec.xml
index a071157..339456e 100644
--- a/configs/msm8953/audio_platform_info_intcodec.xml
+++ b/configs/msm8953/audio_platform_info_intcodec.xml
@@ -49,6 +49,7 @@
         <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>
         <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />
         <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />
+        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="26"/>
     </pcm_ids>
     <config_params>
         <param key="spkr_1_tz_name" value="wsa881x.0f"/>

configs/msm8953/msm8953.mk

diff --git a/configs/msm8953/msm8953.mk b/configs/msm8953/msm8953.mk
index 644ed8c..4365abf 100644
--- a/configs/msm8953/msm8953.mk
+++ b/configs/msm8953/msm8953.mk
@@ -244,6 +244,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
 persist.vendor.audio.hw.binder.size_kbyte=1024
 
+#Set speaker protection cal tx path sampling rate to 48k
+PRODUCT_PROPERTY_OVERRIDES += \
+vendor.audio.spkr_prot.tx.sampling_rate=48000
+
 # add dynamic feature flags here
 PRODUCT_PROPERTY_OVERRIDES += \
 vendor.audio.feature.snd_mon.enable=true \