From a0cd8baadee05afe2de33bc20f0b6871ea21b5b6 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 1 Mar 2023 21:50:12 +0800
Subject: [PATCH] audio: add compressed offload to the AIDL
 audio_policy_configuration.xml

Bug: 270552159
Test: n/a
Change-Id: I950774fb0d5ab6571e34e83ebdab53d0dab4dec7
---
 .../audio_policy_configuration.xml            | 19 +++++++++++++++++--
 .../cheetah/aidl_config/mixer_paths_aidl.xml  |  2 +-
 .../audio_policy_configuration.xml            | 19 +++++++++++++++++--
 .../panther/aidl_config/mixer_paths_aidl.xml  |  2 +-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml
index 941c9f0..af824c3 100644
--- a/audio/cheetah/aidl_config/audio_policy_configuration.xml
+++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml
@@ -36,6 +36,21 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="compressed offload" role="source"
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
+                    <profile name="" format="AUDIO_FORMAT_MP3"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                </mixPort>
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
@@ -152,9 +167,9 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic"/>
                 <route type="mix" sink="voip_tx"
diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
index aab517f..260cda6 100644
--- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml
+++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
@@ -310,7 +310,7 @@
   <ctl name="Incall Sink Mute" value="0" />
   <ctl name="Incall Mic Mute" value="0" />
 
-  <!-- Decoder Reference Enable is controlled in aoc_control -->
+  <ctl name="Compress Offload Volume" value="1000" />
   <ctl name="Decoder Reference Enable" value="0" />
   <ctl name="LVM Enable" value="0" />
 
diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml
index 941c9f0..af824c3 100644
--- a/audio/panther/aidl_config/audio_policy_configuration.xml
+++ b/audio/panther/aidl_config/audio_policy_configuration.xml
@@ -36,6 +36,21 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="compressed offload" role="source"
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
+                    <profile name="" format="AUDIO_FORMAT_MP3"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
+                             samplingRates="8000 16000 24000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
+                </mixPort>
                 <mixPort name="haptic" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
@@ -152,9 +167,9 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,Built-In Back Mic"/>
                 <route type="mix" sink="voip_tx"
diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml
index aab517f..260cda6 100644
--- a/audio/panther/aidl_config/mixer_paths_aidl.xml
+++ b/audio/panther/aidl_config/mixer_paths_aidl.xml
@@ -310,7 +310,7 @@
   <ctl name="Incall Sink Mute" value="0" />
   <ctl name="Incall Mic Mute" value="0" />
 
-  <!-- Decoder Reference Enable is controlled in aoc_control -->
+  <ctl name="Compress Offload Volume" value="1000" />
   <ctl name="Decoder Reference Enable" value="0" />
   <ctl name="LVM Enable" value="0" />