From 3a300b35c96284a151beb3f453288168d54b1183 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 24 Mar 2021 09:42:28 +0800
Subject: [PATCH] audio: add "LVM Enable" and "Decoder Reference Enable"

Turn on "LVM Enable" when the offload playback path is applied.

Bug: 180984363
Bug: 165719427
Test: make -j128
Test: test LVM effects and visualizer on offload playback on oriole
Change-Id: I5e64575ce39fe0e8d9f54913ccab9cc47da8763e
---
 audio/oriole/config/mixer_paths.xml   | 17 ++++++++++++++---
 audio/raven/config/mixer_paths.xml    | 17 ++++++++++++++---
 audio/slider/config/mixer_paths.xml   | 17 ++++++++++++++---
 audio/whitefin/config/mixer_paths.xml | 17 ++++++++++++++---
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 0c2ffda..6197d2d 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -253,6 +253,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -400,25 +404,31 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
     <path name="compress-offload-playbackP">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -434,6 +444,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 93a5934..656523b 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -253,6 +253,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -400,25 +404,31 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
     <path name="compress-offload-playbackP">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -434,6 +444,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index d2c10f4..58d68cf 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -217,6 +217,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -364,25 +368,31 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
     <path name="compress-offload-playbackP">
-        <ctl name="PCM Playback Volume" value="250"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -398,6 +408,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 86c8a85..e7899b2 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -254,6 +254,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -401,25 +405,31 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
     <path name="compress-offload-playbackP">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -435,6 +445,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">