Merge pull request xbmc#24740 from fritsch/pwhdmi

AESinkPipewire: Properly identify HDMI devices
chewitt · Mar 1, 2024 · d1f2c53 · d1f2c53
2 parents 99e0546 + c5e9708
commit d1f2c53
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/AESinkPipewire.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/AESinkPipewire.cpp
@@ -348,10 +348,25 @@ void CAESinkPipewire::EnumerateDevicesEx(AEDeviceInfoList& list, bool force)
                                   streamTypes.end());
     }
 
-    if (device.m_channels.Count() == 2 && !device.m_streamTypes.empty())
+    // If DTS-HD-MA or TrueHD are configured 8 channels are needed
+    bool hasHBRFormat = std::any_of(device.m_streamTypes.cbegin(), device.m_streamTypes.cend(),
+                                    [](const auto& streamType)
+                                    {
+                                      return streamType == CAEStreamInfo::STREAM_TYPE_TRUEHD ||
+                                             streamType == CAEStreamInfo::STREAM_TYPE_DTSHD_MA;
+                                    });
+
+    if (!device.m_streamTypes.empty())
     {
-      device.m_deviceType = AE_DEVTYPE_IEC958;
       device.m_dataFormats.emplace_back(AE_FMT_RAW);
+      if (!hasHBRFormat && device.m_channels.Count() == 2)
+      {
+        device.m_deviceType = AE_DEVTYPE_IEC958;
+      }
+      else
+      {
+        device.m_deviceType = AE_DEVTYPE_HDMI;
+      }
     }
 
     list.emplace_back(device);