commit 643cefec408ef61c5dd9a5a21faf4ea2e9c22f37
author qctecmdr <qctecmdr@localhost> Sat Sep 14 05:38:54 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 14 05:38:54 2019 -0700
tree fe0ff31f07a1c345aaa6efa216d01b4908b319e1
parent 97e8f8f6c7f698eeffd2360b135a1e01eb5b1e60
parent b6d7626a70436a6d0b12973cd06e512f305bffb4

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

configs/msm8998/msm8998.mk

diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index 9e3c63b..fad7f5a 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -257,6 +257,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
 persist.vendor.bt.aac_frm_ctl.enabled=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=true \

configs/sdm660/sdm660.mk

diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk
index b3cb143..601819e 100644
--- a/configs/sdm660/sdm660.mk
+++ b/configs/sdm660/sdm660.mk
@@ -268,6 +268,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
 persist.vendor.bt.aac_frm_ctl.enabled=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=true \

hal/audio_extn/utils.c

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 5bdc881..a788996 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -1173,7 +1173,10 @@
             }
             sample_rate = usecase->stream.in->app_type_cfg.sample_rate;
         } else if (usecase->id == USECASE_AUDIO_SPKR_CALIB_TX) {
-            sample_rate = SAMPLE_RATE_8000;
+            if ((property_get("vendor.audio.spkr_prot.tx.sampling_rate", value, NULL) > 0))
+                sample_rate = atoi(value);
+            else
+                sample_rate = SAMPLE_RATE_8000;
         }
     } else if (usecase->type == TRANSCODE_LOOPBACK_RX) {
         sample_rate = usecase->stream.inout->out_config.sample_rate;