From 895e3d3808e943c3280eb3cbcc801dfa25fa4f38 Mon Sep 17 00:00:00 2001
From: Joey Poomarin Phloyphisut <poomarin@google.com>
Date: Tue, 13 Jul 2021 09:17:59 +0000
Subject: [PATCH 1/2] audio_usb: Add unsupported pcm format for USB accessory
 on Raviole.

This patch need ag/15270810 to work.

Test: N/A
Bug: 193477495
Change-Id: Ied9317fed60f1fae5a0de76ed12aec723c20a0c2
---
 audio/oriole/config/audio_platform_configuration.xml   | 2 +-
 audio/raven/config/audio_platform_configuration.xml    | 2 +-
 audio/slider/config/audio_platform_configuration.xml   | 2 +-
 audio/whitefin/config/audio_platform_configuration.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index ef9dd79..ba3e0a9 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -269,7 +269,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index ef9dd79..ba3e0a9 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -269,7 +269,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml
index f379b99..68acee6 100644
--- a/audio/slider/config/audio_platform_configuration.xml
+++ b/audio/slider/config/audio_platform_configuration.xml
@@ -206,7 +206,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml
index f379b99..68acee6 100644
--- a/audio/whitefin/config/audio_platform_configuration.xml
+++ b/audio/whitefin/config/audio_platform_configuration.xml
@@ -206,7 +206,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
     </device_handle>
 
     <external_module>

From 96b58c1c6f5d38455892bc6d69f92a820843acce Mon Sep 17 00:00:00 2001
From: Joey Poomarin Phloyphisut <poomarin@google.com>
Date: Wed, 14 Jul 2021 09:08:58 +0000
Subject: [PATCH 2/2] audio_usb: Updating mixer_paths.xml to use V2 command to
 send config to AoC to support USB behind HUB.

This V2 command is from this patch:
https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/1962494

Bug: 181296179
Test: Local build
Change-Id: Ia95886ed22519f4da70e2a4880f7fb0eb9900660
---
 audio/oriole/config/mixer_paths.xml   | 23 +++++++++++++----------
 audio/raven/config/mixer_paths.xml    | 23 +++++++++++++----------
 audio/slider/config/mixer_paths.xml   | 22 +++++++++++++---------
 audio/whitefin/config/mixer_paths.xml | 23 +++++++++++++----------
 4 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 68097ef..b45c48d 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -217,16 +217,19 @@
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
     <ctl name="MIC Record Soft Gain (dB)" value="0"/>
 
-    <!-- USB setting -->
-    <ctl name="USB Dev ID" value="1"/>
-    <ctl name="USB Playback EP ID" value="1"/>
-    <ctl name="USB Playback SR" value="48000"/>
-    <ctl name="USB Playback CH" value="2"/>
-    <ctl name="USB Playback BW" value="24"/>
-    <ctl name="USB Capture EP ID" value="1"/>
-    <ctl name="USB Capture SR" value="48000"/>
-    <ctl name="USB Capture CH" value="1"/>
-    <ctl name="USB Capture BW" value="16"/>
+    <!-- USB setting v2 -->
+    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Dev ID v2" value="2"/>
+    <ctl name="USB Playback EP ID v2" value="1"/>
+    <ctl name="USB Playback FORMAT v2" value="0"/>
+    <ctl name="USB Playback SR v2" value="48000"/>
+    <ctl name="USB Playback CH v2" value="2"/>
+    <ctl name="USB Playback BW v2" value="24"/>
+    <ctl name="USB Capture EP ID v2" value="1"/>
+    <ctl name="USB Capture FORMAT v2" value="0"/>
+    <ctl name="USB Capture SR v2" value="48000"/>
+    <ctl name="USB Capture CH v2" value="1"/>
+    <ctl name="USB Capture BW v2" value="16"/>
 
     <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
     <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 68097ef..b45c48d 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -217,16 +217,19 @@
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
     <ctl name="MIC Record Soft Gain (dB)" value="0"/>
 
-    <!-- USB setting -->
-    <ctl name="USB Dev ID" value="1"/>
-    <ctl name="USB Playback EP ID" value="1"/>
-    <ctl name="USB Playback SR" value="48000"/>
-    <ctl name="USB Playback CH" value="2"/>
-    <ctl name="USB Playback BW" value="24"/>
-    <ctl name="USB Capture EP ID" value="1"/>
-    <ctl name="USB Capture SR" value="48000"/>
-    <ctl name="USB Capture CH" value="1"/>
-    <ctl name="USB Capture BW" value="16"/>
+    <!-- USB setting v2 -->
+    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Dev ID v2" value="2"/>
+    <ctl name="USB Playback EP ID v2" value="1"/>
+    <ctl name="USB Playback FORMAT v2" value="0"/>
+    <ctl name="USB Playback SR v2" value="48000"/>
+    <ctl name="USB Playback CH v2" value="2"/>
+    <ctl name="USB Playback BW v2" value="24"/>
+    <ctl name="USB Capture EP ID v2" value="1"/>
+    <ctl name="USB Capture FORMAT v2" value="0"/>
+    <ctl name="USB Capture SR v2" value="48000"/>
+    <ctl name="USB Capture CH v2" value="1"/>
+    <ctl name="USB Capture BW v2" value="16"/>
 
     <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
     <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 3e50e61..7fb6ac5 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -177,15 +177,19 @@
     <ctl name="SINK_IDS" id="0" value="-1"/>
     <ctl name="SINK_IDS" id="1" value="-1"/>
 
-    <ctl name="USB Dev ID" value="1"/>
-    <ctl name="USB Playback EP ID" value="1"/>
-    <ctl name="USB Playback SR" value="48000"/>
-    <ctl name="USB Playback CH" value="2"/>
-    <ctl name="USB Playback BW" value="24"/>
-    <ctl name="USB Capture EP ID" value="1"/>
-    <ctl name="USB Capture SR" value="48000"/>
-    <ctl name="USB Capture CH" value="1"/>
-    <ctl name="USB Capture BW" value="16"/>
+    <!-- USB setting v2 -->
+    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Dev ID v2" value="2"/>
+    <ctl name="USB Playback EP ID v2" value="1"/>
+    <ctl name="USB Playback FORMAT v2" value="0"/>
+    <ctl name="USB Playback SR v2" value="48000"/>
+    <ctl name="USB Playback CH v2" value="2"/>
+    <ctl name="USB Playback BW v2" value="24"/>
+    <ctl name="USB Capture EP ID v2" value="1"/>
+    <ctl name="USB Capture FORMAT v2" value="0"/>
+    <ctl name="USB Capture SR v2" value="48000"/>
+    <ctl name="USB Capture CH v2" value="1"/>
+    <ctl name="USB Capture BW v2" value="16"/>
 
     <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
     <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 42e25a2..7612825 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -203,16 +203,19 @@
 
     <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
 
-    <!-- USB setting -->
-    <ctl name="USB Dev ID" value="1"/>
-    <ctl name="USB Playback EP ID" value="1"/>
-    <ctl name="USB Playback SR" value="48000"/>
-    <ctl name="USB Playback CH" value="2"/>
-    <ctl name="USB Playback BW" value="24"/>
-    <ctl name="USB Capture EP ID" value="1"/>
-    <ctl name="USB Capture SR" value="48000"/>
-    <ctl name="USB Capture CH" value="1"/>
-    <ctl name="USB Capture BW" value="16"/>
+    <!-- USB setting v2 -->
+    <ctl name="USB Bus ID v2" value="2"/>
+    <ctl name="USB Dev ID v2" value="2"/>
+    <ctl name="USB Playback EP ID v2" value="1"/>
+    <ctl name="USB Playback FORMAT v2" value="0"/>
+    <ctl name="USB Playback SR v2" value="48000"/>
+    <ctl name="USB Playback CH v2" value="2"/>
+    <ctl name="USB Playback BW v2" value="24"/>
+    <ctl name="USB Capture EP ID v2" value="1"/>
+    <ctl name="USB Capture FORMAT v2" value="0"/>
+    <ctl name="USB Capture SR v2" value="48000"/>
+    <ctl name="USB Capture CH v2" value="1"/>
+    <ctl name="USB Capture BW v2" value="16"/>
 
     <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
     <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>