From f1a154e3169661291eb812f6255cc667dd558c70 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Mon, 26 Jun 2023 10:43:27 +0800
Subject: [PATCH] audio: update playback tuning

- Fixed cracking piano issue
- Improve vocal muddiness issue
- Updated stereo balance
- Maintain as much of previous timbre as possible
- Reworked volume curve to match previous tuning
- Added improved BAACL tuning
- Added thermal throttle (2nd linklaw) tuning for 580mW
  bottom speaker limit @ 46.5degC

Bug: 288460371
Test: tested by hardware team
 - Basic MPS functionality / glitch checks
 - Acoustic Objective measurements (MTV and GTW).
 - Perceptual testing (PTE)
 - UX MTV 30 users
 - Thermal (vmon/imon): Pass
 - Battery (vmon/imon): Pass
 - Battery (Monsoon internal): Pass

Change-Id: Ie03c3124535a7c5ebb86540475827829f8dfc0f7
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/shiba/config/audio_policy_volumes.xml |  48 ++++++++++----------
 audio/shiba/tuning/waves/waves_preset.mps   | Bin 184822 -> 185126 bytes
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/audio/shiba/config/audio_policy_volumes.xml b/audio/shiba/config/audio_policy_volumes.xml
index efb61d2..b087a21 100644
--- a/audio/shiba/config/audio_policy_volumes.xml
+++ b/audio/shiba/config/audio_policy_volumes.xml
@@ -85,31 +85,31 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5761</point>
+        <point>1,-5927</point>
         <point>4,-5927</point>
-        <point>8,-5624</point>
-        <point>12,-5356</point>
-        <point>16,-5029</point>
-        <point>20,-4656</point>
-        <point>24,-4323</point>
-        <point>28,-3947</point>
-        <point>32,-3729</point>
-        <point>36,-3491</point>
-        <point>40,-3249</point>
-        <point>44,-3041</point>
-        <point>48,-2795</point>
-        <point>52,-2561</point>
-        <point>56,-2309</point>
-        <point>60,-2121</point>
-        <point>64,-1905</point>
-        <point>68,-1689</point>
-        <point>72,-1525</point>
-        <point>76,-1333</point>
-        <point>80,-1128</point>
-        <point>84,-957</point>
-        <point>88,-668</point>
-        <point>92,-602</point>
-        <point>96,-241</point>
+        <point>8,-5574</point>
+        <point>12,-5281</point>
+        <point>16,-4952</point>
+        <point>20,-4562</point>
+        <point>24,-4213</point>
+        <point>28,-3838</point>
+        <point>32,-3600</point>
+        <point>36,-3385</point>
+        <point>40,-3116</point>
+        <point>44,-2927</point>
+        <point>48,-2665</point>
+        <point>52,-2436</point>
+        <point>56,-2181</point>
+        <point>60,-1985</point>
+        <point>64,-1743</point>
+        <point>68,-1553</point>
+        <point>72,-1427</point>
+        <point>76,-1166</point>
+        <point>80,-1045</point>
+        <point>84,-895</point>
+        <point>88,-644</point>
+        <point>92,-486</point>
+        <point>96,-209</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
diff --git a/audio/shiba/tuning/waves/waves_preset.mps b/audio/shiba/tuning/waves/waves_preset.mps
index 8ded11d1cf51eac82b0e5f09e712be377a6cc9f4..1b72f50bda27276ad7893913695ac71df6f7d0f9 100644
GIT binary patch
delta 11065
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
AY5)KL

delta 11913
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
a;cGCe;}vP};EqSWUwd9R)t(O>9rPayTmT^e