From 767cd605d5b11e8c32479d80719c8f9faa7803aa Mon Sep 17 00:00:00 2001
From: Daniel Jacob Chittoor <djchittoor47@gmail.com>
Date: Sat, 11 Sep 2021 14:58:03 +0530
Subject: [PATCH] avicii: audio: Set correct pulse-code modulation format for
 primary output

 * OnePlus had made the corresponding change in the IO policy config
   but however it seems that policy side configuration was left as is
   due to which format routing to device was broken as the IO policy
   specificed a 24bit PCM format for primary audio meanwhile the policy
   config marked 16bit PCM as the format causing backend failures.

 * This will also align to OnePlus's 24 bit width audio enforcement.

Signed-off-by: Daniel Jacob Chittoor <djchittoor47@gmail.com>
Change-Id: Ic5e715311c6d3c46579b93346a9ffd814e022e91
---
 audio/audio_policy_configuration.xml                       | 2 +-
 audio/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 6b6fe12..58c546a 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -89,7 +89,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="deep_buffer" role="source"
diff --git a/audio/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/audio_policy_configuration_a2dp_offload_disabled.xml
index 7612ec0..1dc7185 100644
--- a/audio/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -94,7 +94,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="deep_buffer" role="source"