alsa: mark surround71 also as device type hdmi

Portisch · Portisch · commit 30aa0bed0b0a · 2024-11-08T12:22:17.000+01:00
On t7 tdm-c is used for hbr audio passthrough.
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -772,7 +772,7 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg)
           if(stream)
           {
             msg->Reply(CActiveAEDataProtocol::ACC, &stream, sizeof(CActiveAEStream*));
-            LoadSettings();
+            LoadSettings(&streamMsg->format);
             Configure();
             if (!m_extError)
             {
@@ -2640,13 +2640,37 @@ void CActiveAE::Deamplify(CSoundPacket &dstSample)
 // Configuration
 //-----------------------------------------------------------------------------
 
-void CActiveAE::LoadSettings()
+void CActiveAE::LoadSettings(AEAudioFormat *format)
 {
   const std::shared_ptr<CSettings> settings = CServiceBroker::GetSettingsComponent()->GetSettings();
 
   m_settings.device = settings->GetString(CSettings::SETTING_AUDIOOUTPUT_AUDIODEVICE);
   m_settings.passthroughdevice = settings->GetString(CSettings::SETTING_AUDIOOUTPUT_PASSTHROUGHDEVICE);
 
+  switch (aml_get_cpufamily_id())
+  {
+    case AML_T7:
+      {
+        // find on NEWSTREAM the matching passthrough device by device type
+        if (format != NULL)
+        {
+          std::string device(m_settings.passthroughdevice);
+          if (SupportsFormat(*format, &device))
+          {
+            if (device != m_settings.passthroughdevice)
+            {
+              CLog::LogF(LOGINFO, "Change temporary passthrough output device because of Amlogic SoC '{}', stream type: {:d}",
+                 aml_get_cpufamily_name(), format->m_streamInfo.m_type);
+              m_settings.passthroughdevice = device;
+            }
+          }
+        }
+        break;
+      }
+    default:
+      break;
+  }
+
   m_settings.config = settings->GetInt(CSettings::SETTING_AUDIOOUTPUT_CONFIG);
   m_settings.channels = (m_sink.GetDeviceType(m_settings.device) == AE_DEVTYPE_IEC958) ? AE_CH_LAYOUT_2_0 : settings->GetInt(CSettings::SETTING_AUDIOOUTPUT_CHANNELS);
   m_settings.samplerate = settings->GetInt(CSettings::SETTING_AUDIOOUTPUT_SAMPLERATE);
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
@@ -309,7 +309,7 @@ class CActiveAE : public IAE, public IDispResource, private CThread
   void DrainSink();
   void UnconfigureSink();
   void Dispose();
-  void LoadSettings();
+  void LoadSettings(AEAudioFormat *format = NULL);
   void ValidateOutputDevices(bool saveChanges);
   bool NeedReconfigureBuffers();
   bool NeedReconfigureSink();
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESettings.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESettings.cpp
@@ -176,6 +176,11 @@ void CActiveAESettings::SettingOptionsAudioDevicesFillerGeneral(
   {
     for (AEDeviceList::const_iterator sink = sinkList.begin(); sink != sinkList.end(); ++sink)
     {
+      // filter L-PCM device when passthrough on Amlogic T7
+      if (passthrough && aml_get_cpufamily_id() == AML_T7 &&
+          StringUtils::StartsWith(sink->second, "ALSA:surround71"))
+        continue;
+
       if (sink == sinkList.begin())
         firstDevice = sink->second;
 
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -751,6 +751,10 @@ std::string CActiveAESink::ValidateOuputDevice(const std::string& device, bool p
         if (!passthrough && d.m_onlyPassthrough)
           continue;
 
+        // filter L-PCM device when passthrough on Amlogic T7
+        if (passthrough && (d.m_deviceName.substr(0, d.m_deviceName.find(':')) == "surround71"))
+          continue;
+
         if (d.m_deviceName == dev.name)
           return d.ToDeviceString(sink.m_sinkName);
       }
@@ -773,6 +777,10 @@ std::string CActiveAESink::ValidateOuputDevice(const std::string& device, bool p
         if (!passthrough && d.m_onlyPassthrough)
           continue;
 
+        // filter L-PCM device when passthrough on Amlogic T7
+        if (passthrough && (d.m_deviceName.substr(0, d.m_deviceName.find(':')) == "surround71"))
+          continue;
+
         if (d.GetFriendlyName() == dev.friendlyName)
           return d.ToDeviceString(sink.m_sinkName);
       }
@@ -797,6 +805,10 @@ std::string CActiveAESink::ValidateOuputDevice(const std::string& device, bool p
         if (!passthrough && d.m_onlyPassthrough)
           continue;
 
+        // filter L-PCM device when passthrough on Amlogic T7
+        if (passthrough && (d.m_deviceName.substr(0, d.m_deviceName.find(':')) == "surround71"))
+          continue;
+
         if (firstDevice.empty())
           firstDevice = d.ToDeviceString(sink.m_sinkName);
 
@@ -826,6 +838,10 @@ std::string CActiveAESink::ValidateOuputDevice(const std::string& device, bool p
       if (!passthrough && d.m_onlyPassthrough)
         continue;
 
+      // filter L-PCM device when passthrough on Amlogic T7
+      if (passthrough && (d.m_deviceName.substr(0, d.m_deviceName.find(':')) == "surround71"))
+        continue;
+
       if (firstDevice.empty())
         firstDevice = d.ToDeviceString(sink.m_sinkName);
 
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
@@ -16,6 +16,8 @@
 #include "threads/SystemClock.h"
 #include "threads/Thread.h"
 #include "utils/ActorProtocol.h"
+#include "utils/AMLUtils.h"
+#include "utils/StringUtils.h"
 
 #include <memory>
 #include <utility>
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -1607,9 +1607,10 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
 
 AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name)
 {
-  if (name.substr(0, 4) == "hdmi")
+  if (name.substr(0, name.find(':')) == "hdmi" ||
+     (aml_get_cpufamily_id() == AML_T7 && name.substr(0, name.find(':')) == "surround71"))
     return AE_DEVTYPE_HDMI;
-  else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif")
+  else if (name.substr(0, name.find(':')) == "iec958" || name.substr(0, name.find(':')) == "spdif")
     return AE_DEVTYPE_IEC958;
 
   return AE_DEVTYPE_PCM;
@@ -1870,25 +1871,54 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev
       info.m_displayNameExtra = "S/PDIF";
     else if (info.m_deviceType != AE_DEVTYPE_HDMI)
     {
-      if (device.substr(0, 10) == "surround71")
+      if (device.substr(0, device.find(':')) == "surround71")
         info.m_displayNameExtra = "HDMI Multi Ch PCM";
       else
         info.m_displayNameExtra = "PCM";
     }
+    else if (aml_get_cpufamily_id() == AML_T7 && info.m_deviceType == AE_DEVTYPE_HDMI)
+    {
+      if (device.substr(0, device.find(':')) == "surround71")
+        info.m_displayNameExtra = "HDMI Multi Ch PCM";
+    }
   }
 
+  // we don't trust ELD information and push back our supported formats explicitly
   if (info.m_deviceType == AE_DEVTYPE_HDMI)
   {
-    // we don't trust ELD information and push back our supported formats explicitly
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_AC3);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_MA);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_CORE);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_1024);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_2048);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_512);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_EAC3);
-    info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_TRUEHD);
+    switch (aml_get_cpufamily_id())
+    {
+      case AML_T7:
+        {
+          if (device.substr(0, device.find(':')) == "surround71")
+          {
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_MA);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_TRUEHD);
+          }
+          else
+          {
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_AC3);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_CORE);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_1024);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_2048);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_512);
+            info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_EAC3);
+          }
+          break;
+        }
+      default:
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_AC3);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_MA);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_CORE);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_1024);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_2048);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_512);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_EAC3);
+        info.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_TRUEHD);
+        break;
+    }
 
     // indicate that we can do AE_FMT_RAW
     info.m_dataFormats.push_back(AE_FMT_RAW);

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,11 @@ void CActiveAESettings::SettingOptionsAudioDevicesFillerGeneral(`
`176`	`176`	`{`
`177`	`177`	`for (AEDeviceList::const_iterator sink = sinkList.begin(); sink != sinkList.end(); ++sink)`
`178`	`178`	`{`
	`179`	`+ // filter L-PCM device when passthrough on Amlogic T7`
	`180`	`+ if (passthrough && aml_get_cpufamily_id() == AML_T7 &&`
	`181`	`+ StringUtils::StartsWith(sink->second, "ALSA:surround71"))`
	`182`	`+ continue;`
	`183`	`+`
`179`	`184`	`if (sink == sinkList.begin())`
`180`	`185`	`firstDevice = sink->second;`
`181`	`186`