From 52bc1939d265fd3904970394ecc52e739141f32f Mon Sep 17 00:00:00 2001
From: Patty Huang <plhuang@google.com>
Date: Fri, 7 Apr 2023 15:50:39 +0800
Subject: [PATCH 1/2] Enable 32k for some audio configurations with offload
 path

Bug: 272597112
Test: check the offload supported config
Change-Id: I644c3429c1ebad892a77ccfcbf45deb2d8278cf2
---
 bluetooth/le_audio_codec_capabilities.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml
index a836273..89d0de6 100644
--- a/bluetooth/le_audio_codec_capabilities.xml
+++ b/bluetooth/le_audio_codec_capabilities.xml
@@ -44,6 +44,8 @@
     <scenario encode="OneChanStereo_16_2" decode="OneChanMono_16_2"/>
     <scenario encode="TwoChanStereo_16_2" decode="OneChanMono_16_2"/>
     <scenario encode="OneChanMono_16_2" decode="OneChanMono_16_2"/>
+    <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
+    <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
   </scenarioList>
   <configurationList>
     <configuration name="OneChanMono_16_1" codecConfiguration="LC3_16k_1" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
@@ -56,6 +58,8 @@
     <configuration name="TwoChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
     <configuration name="OneChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
     <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
+    <configuration name="TwoChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
+    <configuration name="OneChanMono_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
     <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
     <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
   </configurationList>
@@ -63,6 +67,7 @@
     <codecConfiguration name="LC3_16k_1" codec="LC3" samplingFrequency="16000" frameDurationUs="7500" octetsPerCodecFrame="30"/>
     <codecConfiguration name="LC3_16k_2" codec="LC3" samplingFrequency="16000" frameDurationUs="10000" octetsPerCodecFrame="40"/>
     <codecConfiguration name="LC3_24k_2" codec="LC3" samplingFrequency="24000" frameDurationUs="10000" octetsPerCodecFrame="60"/>
+    <codecConfiguration name="LC3_32k_2" codec="LC3" samplingFrequency="32000" frameDurationUs="10000" octetsPerCodecFrame="80"/>
     <codecConfiguration name="LC3_48k_4" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="120"/>
   </codecConfigurationList>
   <strategyConfigurationList>

From 955862ddf2210288cb547ed12199e0a0566734d5 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Fri, 21 Apr 2023 10:14:00 +0800
Subject: [PATCH 2/2] audio: update aidl platform config

- Add spatial_capture_conditions since this conditions will be different
  by each project.

Bug: 267548143
Test: manual test

Change-Id: I05e6124dad0afed267ec1caa2f469312589a7d73
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 .../aidl_config/audio_platform_configuration_aidl.xml       | 6 ++++++
 .../aidl_config/audio_platform_configuration_aidl.xml       | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
index bc050e3..912b4aa 100644
--- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
@@ -61,6 +61,12 @@
     <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
   </device_builder>
 
+  <!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" -->
+  <!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. -->
+  <spatial_capture_conditions>
+    <conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" />
+  </spatial_capture_conditions>
+
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
     <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
index bc050e3..912b4aa 100644
--- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
@@ -61,6 +61,12 @@
     <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
   </device_builder>
 
+  <!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" -->
+  <!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. -->
+  <spatial_capture_conditions>
+    <conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" />
+  </spatial_capture_conditions>
+
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
     <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />