[PropertiesUtils] Add stream_audio_cfg/stream_subtitles_cfg

Author: CastagnaIT

inputstream.adaptive/addon.xml.in

@@ -10,7 +10,7 @@
     name="adaptive"
     extension=""
     tags="true"
-    listitemprops="license_type|license_key|license_data|license_flags|manifest_type|server_certificate|manifest_update_parameter|manifest_params|manifest_headers|stream_params|stream_headers|original_audio_language|play_timeshift_buffer|pre_init_data|stream_selection_type|chooser_bandwidth_max|chooser_resolution_max|chooser_resolution_secure_max|live_delay"
+    listitemprops="license_type|license_key|license_data|license_flags|manifest_type|server_certificate|manifest_update_parameter|manifest_params|manifest_headers|stream_params|stream_headers|original_audio_language|play_timeshift_buffer|pre_init_data|stream_selection_type|chooser_bandwidth_max|chooser_resolution_max|chooser_resolution_secure_max|live_delay|stream_audio_cfg|stream_subtitles_cfg"
     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
   <extension point="xbmc.addon.metadata">
     <platform>@PLATFORM@</platform>

src/Session.cpp

@@ -791,12 +791,27 @@ void CSession::AddStream(PLAYLIST::CAdaptationSet* adp,
       stream.m_info.SetStreamType(INPUTSTREAM_TYPE_AUDIO);
       if (adp->IsImpaired())
         flags |= INPUTSTREAM_FLAG_VISUAL_IMPAIRED;
-      if (adp->IsDefault())
-        flags |= INPUTSTREAM_FLAG_DEFAULT;
-      if (adp->IsOriginal() || (!m_kodiProps.m_audioLanguageOrig.empty() &&
-                                adp->GetLanguage() == m_kodiProps.m_audioLanguageOrig))
+
+      if (!m_kodiProps.m_audioLangOriginal.empty()) // Override, ignore manifest configuration
+      {
+        if (STRING::CompareNoCase(adp->GetLanguage(), m_kodiProps.m_audioLangOriginal))
+          flags |= INPUTSTREAM_FLAG_ORIGINAL;
+      }
+      else
+      {
+        if (adp->IsOriginal())
+          flags |= INPUTSTREAM_FLAG_ORIGINAL;
+      }
+
+      if (!m_kodiProps.m_audioLangDefault.empty()) // Override, ignore manifest configuration
+      {
+        if (STRING::CompareNoCase(adp->GetLanguage(), m_kodiProps.m_audioLangDefault))
+          flags |= INPUTSTREAM_FLAG_DEFAULT;
+      }
+      else
       {
-        flags |= INPUTSTREAM_FLAG_ORIGINAL;
+        if (adp->IsDefault())
+          flags |= INPUTSTREAM_FLAG_DEFAULT;
       }
       break;
     }
@@ -807,8 +822,17 @@ void CSession::AddStream(PLAYLIST::CAdaptationSet* adp,
         flags |= INPUTSTREAM_FLAG_HEARING_IMPAIRED;
       if (adp->IsForced())
         flags |= INPUTSTREAM_FLAG_FORCED;
-      if (adp->IsDefault())
-        flags |= INPUTSTREAM_FLAG_DEFAULT;
+
+      if (!m_kodiProps.m_subtitleLangDefault.empty()) // Override, ignore manifest configuration
+      {
+        if (STRING::CompareNoCase(adp->GetLanguage(), m_kodiProps.m_subtitleLangDefault))
+          flags |= INPUTSTREAM_FLAG_DEFAULT;
+      }
+      else
+      {
+        if (adp->IsDefault())
+          flags |= INPUTSTREAM_FLAG_DEFAULT;
+      }
       break;
     }
     default:

src/utils/PropertiesUtils.cpp

@@ -34,7 +34,10 @@ constexpr std::string_view PROP_MANIFEST_HEADERS = "inputstream.adaptive.manifes
 constexpr std::string_view PROP_STREAM_PARAMS = "inputstream.adaptive.stream_params";
 constexpr std::string_view PROP_STREAM_HEADERS = "inputstream.adaptive.stream_headers";
 
-constexpr std::string_view PROP_AUDIO_LANG_ORIG = "inputstream.adaptive.original_audio_language";
+constexpr std::string_view PROP_AUDIO_LANG_ORIG = "inputstream.adaptive.original_audio_language"; //! @todo: deprecated, to be removed on next Kodi release
+constexpr std::string_view PROP_STREAM_AUDIO_CFG = "inputstream.adaptive.stream_audio_cfg";
+constexpr std::string_view PROP_STREAM_SUBTITLES_CFG = "inputstream.adaptive.stream_subtitles_cfg";
+
 constexpr std::string_view PROP_PLAY_TIMESHIFT_BUFFER = "inputstream.adaptive.play_timeshift_buffer";
 constexpr std::string_view PROP_LIVE_DELAY = "inputstream.adaptive.live_delay";
 constexpr std::string_view PROP_PRE_INIT_DATA = "inputstream.adaptive.pre_init_data";
@@ -113,9 +116,29 @@ KodiProperties UTILS::PROPERTIES::ParseKodiProperties(
     {
       ParseHeaderString(props.m_streamHeaders, prop.second);
     }
-    else if (prop.first == PROP_AUDIO_LANG_ORIG)
+    else if (prop.first == PROP_AUDIO_LANG_ORIG) //! @todo: deprecated, to be removed on next Kodi release
+    {
+      LOG::Log(LOGWARNING,
+               "Warning \"inputstream.adaptive.original_audio_language\" property is deprecated "
+               "has been replaced by \"inputstream.adaptive.stream_audio_cfg\". "
+               "Please read Wiki \"Integration\" page to learn more about the new properties.");
+      props.m_audioLangOriginal = prop.second;
+    }
+    else if (prop.first == PROP_STREAM_AUDIO_CFG)
     {
-      props.m_audioLanguageOrig = prop.second;
+      auto values = STRING::ToMap(prop.second, '=', ';');
+
+      if (STRING::KeyExists(values, "default_flag_langcode"))
+        props.m_audioLangDefault = STRING::Trim(values["default_flag_langcode"]);
+      if (STRING::KeyExists(values, "original_flag_langcode"))
+        props.m_audioLangOriginal = STRING::Trim(values["original_flag_langcode"]);
+    }
+    else if (prop.first == PROP_STREAM_SUBTITLES_CFG)
+    {
+      auto values = STRING::ToMap(prop.second, '=', ';');
+
+      if (STRING::KeyExists(values, "default_flag_langcode"))
+        props.m_subtitleLangDefault = STRING::Trim(values["default_flag_langcode"]);
     }
     else if (prop.first == PROP_PLAY_TIMESHIFT_BUFFER)
     {

src/utils/PropertiesUtils.h

@@ -53,7 +53,14 @@ struct KodiProperties
   std::string m_streamParams;
   // HTTP headers used to download streams
   std::map<std::string, std::string> m_streamHeaders;
-  std::string m_audioLanguageOrig;
+
+  // Force audio streams with the specified language code to have the kodi stream "default" flag
+  std::string m_audioLangDefault;
+  // Force audio streams with the specified language code to have the kodi stream "original" flag
+  std::string m_audioLangOriginal;
+  // Force subtitle streams with the specified language code to have the kodi stream "default" flag
+  std::string m_subtitleLangDefault;
+
   bool m_playTimeshiftBuffer{false};
   // Set a custom delay from live edge in seconds
   uint64_t m_liveDelay{0};