From 9cc8cd7b8ce90e814299273dbe5985a0e4a38896 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Mon, 1 Jun 2020 20:37:05 +0800
Subject: [PATCH] audio: update audio table

change list:
mixer_paths_bolero_snd:
1. add voip bt sco/sco-wb/sco-swb echo reference
2. fix indent in mixer table

audio_policy_volume:
1. Update bramble speaker music volume curve

Hardware verification:
- Verified each volume step of speaker music playback, overall function are normal.

Test: build pass, voip/voice call with bt
Bug: 159192396
Bug: 159196224
Signed-off-by: vincenttew <vincenttew@google.com>
Change-Id: Iab4ffff8072b41673d676eee673f6404945b1c87
---
 audio/mixer_paths_bolero_snd.xml | 43 +++++++++++++++++++++++++-------
 audio_policy_volumes.xml         |  7 +++---
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/audio/mixer_paths_bolero_snd.xml b/audio/mixer_paths_bolero_snd.xml
index 8630a82..0f88cf7 100644
--- a/audio/mixer_paths_bolero_snd.xml
+++ b/audio/mixer_paths_bolero_snd.xml
@@ -598,15 +598,28 @@
         <path name="echo-reference headphones" />
     </path>
 
-     <path name="echo-reference usb-headset">
-         <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
-         <ctl name="EC Reference Channels" value="Two"/>
-     </path>
+    <path name="echo-reference usb-headset">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
 
-     <path name="echo-reference usb-headphones">
-         <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
-         <ctl name="EC Reference Channels" value="Two"/>
-     </path>
+    <path name="echo-reference usb-headphones">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX" />
+        <ctl name="EC Reference Channels" value="Two"/>
+    </path>
+
+    <path name="echo-reference bt-sco">
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+        <ctl name="EC Reference Channels" value="One"/>
+    </path>
+
+    <path name="echo-reference bt-sco-wb">
+        <path name="echo-reference bt-sco" />
+    </path>
+
+    <path name="echo-reference bt-sco-swb">
+        <path name="echo-reference bt-sco" />
+    </path>
 
     <path name="echo-reference display-port">
         <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
@@ -648,7 +661,19 @@
 
     <path name="echo-reference-voip usb-headphones">
         <path name="echo-reference usb-headphones" />
-     </path>
+    </path>
+
+    <path name="echo-reference-voip bt-sco">
+        <path name="echo-reference bt-sco" />
+    </path>
+
+    <path name="echo-reference-voip bt-sco-wb">
+        <path name="echo-reference bt-sco" />
+    </path>
+
+    <path name="echo-reference-voip bt-sco-swb">
+        <path name="echo-reference bt-sco" />
+    </path>
 
     <path name="echo-reference-voip headphones-44.1">
         <path name="echo-reference headphones-44.1" />
diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml
index d6e2008..4819e6d 100644
--- a/audio_policy_volumes.xml
+++ b/audio_policy_volumes.xml
@@ -73,9 +73,10 @@ volume index from 0 to 100.
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-6000</point>
-        <point>19,-4400</point>
-        <point>71,-2000</point>
-        <point>91,-900</point>
+        <point>28,-3600</point>
+        <point>72,-1400</point>
+        <point>80,-1000</point>
+        <point>88,-700</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"