From 50346315f2b38dc0dc18affbcde9576ba51917f7 Mon Sep 17 00:00:00 2001
From: Poomarin Phloyphisut <poomarin@google.com>
Date: Fri, 5 Jan 2024 03:07:47 +0000
Subject: [PATCH] [HDMI Audio] Add mixer paths for HDMI path.

Test: Local test.
Bug: 309696512
Change-Id: If6a3b46a28c661dd0cc0737b1b44ad9aa562fe65
---
 audio/caiman/aidl_config/mixer_paths_aidl.xml | 28 +++++++++++++++++++
 audio/komodo/aidl_config/mixer_paths_aidl.xml | 28 +++++++++++++++++++
 audio/tokay/aidl_config/mixer_paths_aidl.xml  | 28 +++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index 04717860..8067a9df 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -425,6 +425,10 @@
     <path name="primary-playback-0 -> usb" />
   </path>
 
+  <path name="primary-playback-0 -> hdmi-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -493,6 +497,10 @@
     <path name="raw-playback-0 -> usb" />
   </path>
 
+  <path name="raw-playback-0 -> hdmi-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -561,6 +569,10 @@
     <path name="deep-buffer-playback-0 -> usb" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> hdmi-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -634,6 +646,10 @@
     <path name="compress-offload-playback-0 -> usb" />
   </path>
 
+  <path name="compress-offload-playback-0 -> hdmi-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -702,6 +718,10 @@
     <path name="mmap-playback-0 -> usb" />
   </path>
 
+  <path name="mmap-playback-0 -> hdmi-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
   <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
@@ -782,6 +802,10 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
+  <path name="voip-playback-0 -> hdmi-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -901,6 +925,10 @@
     <path name="haptic-playback-0 -> usb" />
   </path>
 
+  <path name="haptic-playback-0 -> hdmi-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index 04717860..8067a9df 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -425,6 +425,10 @@
     <path name="primary-playback-0 -> usb" />
   </path>
 
+  <path name="primary-playback-0 -> hdmi-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -493,6 +497,10 @@
     <path name="raw-playback-0 -> usb" />
   </path>
 
+  <path name="raw-playback-0 -> hdmi-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -561,6 +569,10 @@
     <path name="deep-buffer-playback-0 -> usb" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> hdmi-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -634,6 +646,10 @@
     <path name="compress-offload-playback-0 -> usb" />
   </path>
 
+  <path name="compress-offload-playback-0 -> hdmi-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -702,6 +718,10 @@
     <path name="mmap-playback-0 -> usb" />
   </path>
 
+  <path name="mmap-playback-0 -> hdmi-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
   <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
@@ -782,6 +802,10 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
+  <path name="voip-playback-0 -> hdmi-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -901,6 +925,10 @@
     <path name="haptic-playback-0 -> usb" />
   </path>
 
+  <path name="haptic-playback-0 -> hdmi-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index 04717860..8067a9df 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -425,6 +425,10 @@
     <path name="primary-playback-0 -> usb" />
   </path>
 
+  <path name="primary-playback-0 -> hdmi-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -493,6 +497,10 @@
     <path name="raw-playback-0 -> usb" />
   </path>
 
+  <path name="raw-playback-0 -> hdmi-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -561,6 +569,10 @@
     <path name="deep-buffer-playback-0 -> usb" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> hdmi-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -634,6 +646,10 @@
     <path name="compress-offload-playback-0 -> usb" />
   </path>
 
+  <path name="compress-offload-playback-0 -> hdmi-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -702,6 +718,10 @@
     <path name="mmap-playback-0 -> usb" />
   </path>
 
+  <path name="mmap-playback-0 -> hdmi-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
   <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
@@ -782,6 +802,10 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
+  <path name="voip-playback-0 -> hdmi-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -901,6 +925,10 @@
     <path name="haptic-playback-0 -> usb" />
   </path>
 
+  <path name="haptic-playback-0 -> hdmi-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />