From 895d1dfce74f905ac43c9524f362980abcc309e0 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Wed, 3 Jan 2024 14:03:38 +0800
Subject: [PATCH] audio: enable speaker power data and spk compensation

Bug: 300604249
Test: manual test - playback/ make voice call in spk mode.

Change-Id: I72799afd0a63a336b76cd70eb12ecd5a03a54bb5
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/caiman/aidl_config/audio_platform_configuration.xml | 7 ++++++-
 audio/caiman/config/audio_platform_configuration.xml      | 2 +-
 audio/komodo/aidl_config/audio_platform_configuration.xml | 7 ++++++-
 audio/komodo/config/audio_platform_configuration.xml      | 2 +-
 audio/tokay/aidl_config/audio_platform_configuration.xml  | 7 ++++++-
 audio/tokay/config/audio_platform_configuration.xml       | 2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml
index e30ed142..1e2979f8 100644
--- a/audio/caiman/aidl_config/audio_platform_configuration.xml
+++ b/audio/caiman/aidl_config/audio_platform_configuration.xml
@@ -25,6 +25,7 @@
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
       <argument name="ThrottlingSeverity" value="LIGHT" />
+      <argument name="SpeakerPowerPollWaitMs" value="5000" />
     </feature>
     <feature name="RuntimeTuningDump" />
   </features>
@@ -55,7 +56,7 @@
     <tuner type="playback" name="waves">
       <argument name="Sink" value="SPK" />
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
-      <argument name="Extensions" value="StereoSpatializerIndicator" />
+      <argument name="Extensions" value="StereoSpatializerIndicator,SpeakerPowerLinkLaw" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
       <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
@@ -66,6 +67,10 @@
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
+    <tuner type="compensation" name="TelephonySpeakerCompensation">
+      <scenario condition="ScreenRotation:0,90,180,270"
+                output="LeftChannel:compens_spk_l.conf RightChannel:compens_spk_r.conf" />
+    </tuner>
   </tuners>
 
   <latencies>
diff --git a/audio/caiman/config/audio_platform_configuration.xml b/audio/caiman/config/audio_platform_configuration.xml
index a08da6bb..eb44ed98 100644
--- a/audio/caiman/config/audio_platform_configuration.xml
+++ b/audio/caiman/config/audio_platform_configuration.xml
@@ -249,7 +249,7 @@
 
     <features>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
-        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT"/>
+        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT,SpeakerPowerPollWaitMs:5000"/>
     </features>
 
     <cfg_attr>
diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml
index e30ed142..1e2979f8 100644
--- a/audio/komodo/aidl_config/audio_platform_configuration.xml
+++ b/audio/komodo/aidl_config/audio_platform_configuration.xml
@@ -25,6 +25,7 @@
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
       <argument name="ThrottlingSeverity" value="LIGHT" />
+      <argument name="SpeakerPowerPollWaitMs" value="5000" />
     </feature>
     <feature name="RuntimeTuningDump" />
   </features>
@@ -55,7 +56,7 @@
     <tuner type="playback" name="waves">
       <argument name="Sink" value="SPK" />
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
-      <argument name="Extensions" value="StereoSpatializerIndicator" />
+      <argument name="Extensions" value="StereoSpatializerIndicator,SpeakerPowerLinkLaw" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
       <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
@@ -66,6 +67,10 @@
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
+    <tuner type="compensation" name="TelephonySpeakerCompensation">
+      <scenario condition="ScreenRotation:0,90,180,270"
+                output="LeftChannel:compens_spk_l.conf RightChannel:compens_spk_r.conf" />
+    </tuner>
   </tuners>
 
   <latencies>
diff --git a/audio/komodo/config/audio_platform_configuration.xml b/audio/komodo/config/audio_platform_configuration.xml
index a08da6bb..eb44ed98 100644
--- a/audio/komodo/config/audio_platform_configuration.xml
+++ b/audio/komodo/config/audio_platform_configuration.xml
@@ -249,7 +249,7 @@
 
     <features>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
-        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT"/>
+        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT,SpeakerPowerPollWaitMs:5000"/>
     </features>
 
     <cfg_attr>
diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml
index e30ed142..1e2979f8 100644
--- a/audio/tokay/aidl_config/audio_platform_configuration.xml
+++ b/audio/tokay/aidl_config/audio_platform_configuration.xml
@@ -25,6 +25,7 @@
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
       <argument name="ThrottlingSeverity" value="LIGHT" />
+      <argument name="SpeakerPowerPollWaitMs" value="5000" />
     </feature>
     <feature name="RuntimeTuningDump" />
   </features>
@@ -55,7 +56,7 @@
     <tuner type="playback" name="waves">
       <argument name="Sink" value="SPK" />
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
-      <argument name="Extensions" value="StereoSpatializerIndicator" />
+      <argument name="Extensions" value="StereoSpatializerIndicator,SpeakerPowerLinkLaw" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
       <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
@@ -66,6 +67,10 @@
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
+    <tuner type="compensation" name="TelephonySpeakerCompensation">
+      <scenario condition="ScreenRotation:0,90,180,270"
+                output="LeftChannel:compens_spk_l.conf RightChannel:compens_spk_r.conf" />
+    </tuner>
   </tuners>
 
   <latencies>
diff --git a/audio/tokay/config/audio_platform_configuration.xml b/audio/tokay/config/audio_platform_configuration.xml
index a08da6bb..eb44ed98 100644
--- a/audio/tokay/config/audio_platform_configuration.xml
+++ b/audio/tokay/config/audio_platform_configuration.xml
@@ -249,7 +249,7 @@
 
     <features>
         <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
-        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT"/>
+        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT,SpeakerPowerPollWaitMs:5000"/>
     </features>
 
     <cfg_attr>