From a692a92f6fbd4ab8d28dd1c430b769aebc68382f Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Wed, 2 Mar 2022 04:32:54 +0000
Subject: [PATCH] Revert "audio: voip downlink to stereo"

Revert submission 16996078-voip_speaker_separation-master-table-tm-dev

Reason for revert: <AoC is reverted by b/222138584>
Reverted Changes:
I85c654319:audio: voip downlink to stereo
Iac83ae74c:audio: iS900 table release of Fortemedia

Change-Id: Ib741e38913ab39af916f3dbb60bd08159c0d6cf2
---
 audio/cheetah/config/audio_platform_configuration.xml     | 4 ++--
 audio/cheetah/config/mixer_paths.xml                      | 4 ----
 audio/cloudripper/config/audio_platform_configuration.xml | 4 ++--
 audio/cloudripper/config/mixer_paths.xml                  | 4 ----
 audio/panther/config/audio_platform_configuration.xml     | 4 ++--
 audio/panther/config/mixer_paths.xml                      | 4 ----
 audio/ravenclaw/config/audio_platform_configuration.xml   | 4 ++--
 audio/ravenclaw/config/mixer_paths.xml                    | 4 ----
 8 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index 0b204f6..b7f4265 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
         <!-- dev1: audio dev2: haptic -->
         <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
         <!-- for VOIP output, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
+        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
         <!-- for input -->
         <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
         <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -286,7 +286,7 @@
     <external_module>
         <module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
+        <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index a4fcad8..43e9034 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -634,10 +634,6 @@
         <ctl name="AMP PCM Gain" value="17"/>
     </path>
 
-    <path name="voice-dual-speaker">
-        <path name="speaker" />
-    </path>
-
     <path name="speaker-safe">
         <ctl name="R Boost Peak Current Limit" value="3.50A"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
diff --git a/audio/cloudripper/config/audio_platform_configuration.xml b/audio/cloudripper/config/audio_platform_configuration.xml
index 8ef3573..0356bb9 100644
--- a/audio/cloudripper/config/audio_platform_configuration.xml
+++ b/audio/cloudripper/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
         <!-- dev1: audio dev2: haptic -->
         <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
         <!-- for VOIP output, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
+        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
         <!-- for input -->
         <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
         <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -282,7 +282,7 @@
 
     <external_module>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
+        <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml
index 2a1e039..9fef955 100644
--- a/audio/cloudripper/config/mixer_paths.xml
+++ b/audio/cloudripper/config/mixer_paths.xml
@@ -640,10 +640,6 @@
         <ctl name="R AMP Enable Switch" value="1"/>
     </path>
 
-    <path name="voice-dual-speaker">
-        <path name="speaker" />
-    </path>
-
     <path name="speaker-safe">
         <ctl name="R AMP Enable Switch" value="1"/>
     </path>
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index 0b204f6..b7f4265 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
         <!-- dev1: audio dev2: haptic -->
         <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
         <!-- for VOIP output, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
+        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
         <!-- for input -->
         <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
         <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -286,7 +286,7 @@
     <external_module>
         <module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
+        <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index a4fcad8..43e9034 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -634,10 +634,6 @@
         <ctl name="AMP PCM Gain" value="17"/>
     </path>
 
-    <path name="voice-dual-speaker">
-        <path name="speaker" />
-    </path>
-
     <path name="speaker-safe">
         <ctl name="R Boost Peak Current Limit" value="3.50A"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
diff --git a/audio/ravenclaw/config/audio_platform_configuration.xml b/audio/ravenclaw/config/audio_platform_configuration.xml
index f57c505..5d2fbc8 100644
--- a/audio/ravenclaw/config/audio_platform_configuration.xml
+++ b/audio/ravenclaw/config/audio_platform_configuration.xml
@@ -187,7 +187,7 @@
         <!-- dev1: audio dev2: haptic -->
         <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
         <!-- for VOIP output, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
+        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
         <!-- for input -->
         <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
         <usecase id="UC_HOSTLESS_UL" dev1="15"/>
@@ -283,7 +283,7 @@
     <external_module>
         <module libname="audio_spk_35l41.so"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
+        <module libname="audio_fortemedia_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/ravenclaw/config/mixer_paths.xml b/audio/ravenclaw/config/mixer_paths.xml
index 141f8c9..2d3db43 100644
--- a/audio/ravenclaw/config/mixer_paths.xml
+++ b/audio/ravenclaw/config/mixer_paths.xml
@@ -623,10 +623,6 @@
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
-    <path name="voice-dual-speaker">
-        <path name="speaker" />
-    </path>
-
     <path name="speaker-safe">
         <ctl name="R Boost Peak Current Limit" value="3.50A"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>