From cb133eda9c28308abab3cc77e76cebfacb26382e Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Fri, 15 Dec 2023 14:03:10 +0800
Subject: [PATCH] audio: enable DP audio

Bug: 316278350
Test: builds
Change-Id: I801612ee9aa205f52a326e21294972303e55e38b
Signed-off-by: Robert Lee <lerobert@google.com>
---
 audio/ripcurrentpro/config/audio_platform_configuration.xml | 1 +
 audio/ripcurrentpro/config/audio_policy_configuration.xml   | 4 +++-
 .../audio_policy_configuration_a2dp_offload_disabled.xml    | 4 +++-
 .../audio_policy_configuration_bluetooth_legacy_hal.xml     | 4 +++-
 .../audio_policy_configuration_le_offload_disabled.xml      | 4 +++-
 audio/ripcurrentpro/config/mixer_paths.xml                  | 6 ++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/audio/ripcurrentpro/config/audio_platform_configuration.xml b/audio/ripcurrentpro/config/audio_platform_configuration.xml
index febcf7be..ea295016 100644
--- a/audio/ripcurrentpro/config/audio_platform_configuration.xml
+++ b/audio/ripcurrentpro/config/audio_platform_configuration.xml
@@ -295,6 +295,7 @@
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
         <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
+        <handler libname="audio_hdmi_aoc.so"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/ripcurrentpro/config/audio_policy_configuration.xml b/audio/ripcurrentpro/config/audio_policy_configuration.xml
index c53bfe27..2620d7f4 100644
--- a/audio/ripcurrentpro/config/audio_policy_configuration.xml
+++ b/audio/ripcurrentpro/config/audio_policy_configuration.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -227,6 +227,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrentpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/ripcurrentpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 6352aac4..2fffbfa2 100644
--- a/audio/ripcurrentpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/ripcurrentpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -183,6 +183,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrentpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/ripcurrentpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index e80ded51..7b32451e 100644
--- a/audio/ripcurrentpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/ripcurrentpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -144,7 +144,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -179,6 +179,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrentpro/config/audio_policy_configuration_le_offload_disabled.xml b/audio/ripcurrentpro/config/audio_policy_configuration_le_offload_disabled.xml
index da9db1a0..2c572bd7 100644
--- a/audio/ripcurrentpro/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/ripcurrentpro/config/audio_policy_configuration_le_offload_disabled.xml
@@ -144,7 +144,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -200,6 +200,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrentpro/config/mixer_paths.xml b/audio/ripcurrentpro/config/mixer_paths.xml
index 339f6256..f40f7e7d 100644
--- a/audio/ripcurrentpro/config/mixer_paths.xml
+++ b/audio/ripcurrentpro/config/mixer_paths.xml
@@ -704,6 +704,12 @@
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
+    <path name="hdmi">
+    </path>
+
+    <path name="hdmi-post">
+    </path>
+
     <!-- Tx device -->
     <path name="handset-mic">
         <ctl name="Mic Spatial Module Enable" value="1"/>