audio: update tuning tables (20210826)

Release Notes (R4):
- Retune top volumes for more balanced sound, less harsh
- Heavy emphasis on vocals, both depth and clarity
- DTMF volume curve reduced to better align w/ O6, F2, C2, B9
- SYSTEM volume curve reduced to better align touch sounds
- SYSTEM volume curve copied into AUDIBLE volume curve

Release notes (O6):
- Camera shutter (system sound) decreased volume curve to better align w/ R4/B9 and F2/C2
- Slight adjustment at min vol point for DTMF
- SYSTEM volume curve reduced to mitigate loud camera shutter
- SYSTEM volume curve copied into AUDIBLE volume curve

Bug:190960105
Test: High level tuning validation (b/190960105#comment15)

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Icf0c9e921017b5e06ec950452a78a9d89acf86f2
(cherry picked from commit 7516c91bc37a326ac83a3c1aa7ad3e4bd0905e45)

3 files changed, 25 insertions, 17 deletions

diff --git a/audio/oriole/config/audio_policy_volumes.xml b/audio/oriole/config/audio_policy_volumes.xml
index db576624..a58e2371 100644
--- a/audio/oriole/config/audio_policy_volumes.xml
+++ b/audio/oriole/config/audio_policy_volumes.xml
@@ -52,10 +52,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
+        <point>1,-4500</point>
+        <point>33,-3000</point>
+        <point>66,-2000</point>
+        <point>100,-800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -143,8 +143,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4500</point>
+        <point>33,-3000</point>
+        <point>66,-2000</point>
+        <point>100,-800</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -158,7 +162,7 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4200</point>
+        <point>1,-4000</point>
         <point>33,-3000</point>
         <point>66,-1800</point>
         <point>100,-600</point>
diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml
index db576624..cd0e3a40 100644
--- a/audio/raven/config/audio_policy_volumes.xml
+++ b/audio/raven/config/audio_policy_volumes.xml
@@ -52,10 +52,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
+        <point>1,-4700</point>
+        <point>33,-3800</point>
+        <point>66,-2800</point>
+        <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -143,8 +143,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4700</point>
+        <point>33,-3800</point>
+        <point>66,-2800</point>
+        <point>100,-1800</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -158,10 +162,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4200</point>
-        <point>33,-3000</point>
-        <point>66,-1800</point>
-        <point>100,-600</point>
+        <point>1,-5700</point>
+        <point>33,-4000</point>
+        <point>66,-3000</point>
+        <point>100,-1900</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/raven/tuning/waves/waves_preset.mps b/audio/raven/tuning/waves/waves_preset.mps
index c244cb60..bd08ee30 100644
--- a/audio/raven/tuning/waves/waves_preset.mps
+++ b/audio/raven/tuning/waves/waves_preset.mps