From 0e2af5bf1dfb3ce3021c65afd180e340b6034d5e Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Thu, 20 Jul 2023 09:10:44 +0800
Subject: [PATCH] audio: add HDMI support on ripcurrent

Bug: 264508873
Test: build pass
Change-Id: I91cfd4b7e028927a5036f1772cfc6a5aa725d650
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 audio/ripcurrent/config/audio_platform_configuration.xml    | 1 +
 audio/ripcurrent/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/ripcurrent/config/mixer_paths.xml                     | 6 ++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml
index 1aab4e6..2435e98 100644
--- a/audio/ripcurrent/config/audio_platform_configuration.xml
+++ b/audio/ripcurrent/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=192000,UnsupportedFormat=S24_LE,MaxCapPacketInterval=125,MaxCapSampleRate=192000,MaxCapBitWidth=32,MaxCapChannel=2,EnableHifi192kMultichannel=0"/>
+        <handler libname="audio_hdmi_aoc.so"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/ripcurrent/config/audio_policy_configuration.xml b/audio/ripcurrent/config/audio_policy_configuration.xml
index c53bfe2..2620d7f 100644
--- a/audio/ripcurrent/config/audio_policy_configuration.xml
+++ b/audio/ripcurrent/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/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 6352aac..2fffbfa 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/ripcurrent/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/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index e80ded5..7b32451 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/ripcurrent/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/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml b/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
index 3fdeb3f..ce7f29d 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_le_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>
@@ -204,6 +204,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/ripcurrent/config/mixer_paths.xml b/audio/ripcurrent/config/mixer_paths.xml
index 6bbe394..743e247 100644
--- a/audio/ripcurrent/config/mixer_paths.xml
+++ b/audio/ripcurrent/config/mixer_paths.xml
@@ -700,6 +700,12 @@
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
+    <path name="hdmi">
+    </path>
+
+    <path name="hdmi-post">
+    </path>
+
     <path name="speaker-safe">
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>