Merge pull request #1731 from CastagnaIT/lang_code_und

[AdaptiveTree] On parsers use "und" language code for unknown cases
xbmc · Nov 23, 2024 · 9bf03c5 · 9bf03c5
2 parents 28828e2 + 1ca1609
commit 9bf03c5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/src/Session.cpp b/src/Session.cpp
@@ -673,7 +673,13 @@ void SESSION::CSession::AddStream(PLAYLIST::CAdaptationSet* adp,
 
   stream.m_info.SetFlags(flags);
   stream.m_info.SetPhysicalIndex(uniqueId);
-  stream.m_info.SetLanguage(adp->GetLanguage());
+
+  std::string langCode = adp->GetLanguage();
+  if (langCode.empty() && stream.m_info.GetStreamType() != INPUTSTREAM_TYPE_VIDEO)
+    langCode = LANG_CODE::UNDETERMINED;
+
+  stream.m_info.SetLanguage(langCode);
+
   stream.m_info.ClearExtraData();
   stream.m_info.SetFeatures(0);
 

diff --git a/src/parser/DASHTree.cpp b/src/parser/DASHTree.cpp
@@ -507,7 +507,10 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
   }
 
   adpSet->SetGroup(XML::GetAttrib(nodeAdp, "group"));
+
+  // Language code format IETF RFC 5646 (BCP-47)
   adpSet->SetLanguage(XML::GetAttrib(nodeAdp, "lang"));
+
   adpSet->SetName(XML::GetAttrib(nodeAdp, "name"));
   adpSet->SetResWidth(XML::GetAttribInt(nodeAdp, "width"));
   adpSet->SetResHeight(XML::GetAttribInt(nodeAdp, "height"));

diff --git a/src/parser/HLSTree.cpp b/src/parser/HLSTree.cpp
@@ -1401,7 +1401,7 @@ bool adaptive::CHLSTree::ParseRenditon(const Rendition& r,
     return false;
 
   adpSet->SetStreamType(streamType);
-  adpSet->SetLanguage(r.m_language.empty() ? "unk" : r.m_language);
+  adpSet->SetLanguage(r.m_language);
   adpSet->SetName(r.m_name);
   adpSet->SetIsDefault(r.m_isDefault);
   adpSet->SetIsForced(r.m_isForced);
@@ -1479,7 +1479,7 @@ bool adaptive::CHLSTree::ParseMultivariantPlaylist(const std::string& data)
       rend.m_type = attribs["TYPE"];
       rend.m_groupId = attribs["GROUP-ID"];
       rend.m_name = attribs["NAME"];
-      rend.m_language = attribs["LANGUAGE"];
+      rend.m_language = attribs["LANGUAGE"]; // Language code format IETF RFC 5646 (BCP-47)
       if (streamType == StreamType::AUDIO)
       {
         rend.m_channels = STRING::ToUint32(attribs["CHANNELS"], 2);
@@ -1699,7 +1699,7 @@ bool adaptive::CHLSTree::ParseMultivariantPlaylist(const std::string& data)
       // Initialize a rendition with generic info
       Rendition r;
       r.m_channels = 2;
-      r.m_language = "unk";
+      r.m_language = LANG_CODE::UNDETERMINED;
       r.m_type = "AUDIO";
 
       if (!var.m_groupIdAudio.empty())
@@ -1820,7 +1820,7 @@ void adaptive::CHLSTree::AddIncludedAudioStream(std::unique_ptr<PLAYLIST::CPerio
   auto newAdpSet = CAdaptationSet::MakeUniquePtr(period.get());
   newAdpSet->SetStreamType(StreamType::AUDIO);
   newAdpSet->SetContainerType(ContainerType::MP4);
-  newAdpSet->SetLanguage("unk"); // Unknown
+  newAdpSet->SetLanguage(LANG_CODE::UNDETERMINED);
 
   auto repr = CRepresentation::MakeUniquePtr(newAdpSet.get());
   repr->SetTimescale(TIMESCALE);

diff --git a/src/parser/SmoothTree.cpp b/src/parser/SmoothTree.cpp
@@ -196,6 +196,7 @@ void adaptive::CSmoothTree::ParseTagStreamIndex(pugi::xml_node nodeSI,
                                STRING::ToHexadecimal(protParser.GetKID()));
   }
 
+  // Language code format ISO 639-2
   adpSet->SetLanguage(XML::GetAttrib(nodeSI, "Language"));
 
   // Default frequency 10000000 (10Khz)

diff --git a/src/utils/Utils.h b/src/utils/Utils.h
@@ -50,6 +50,11 @@ uint64_t GetTimestampMs();
  */
 std::vector<uint8_t> ZeroPadding(const std::vector<uint8_t>& data, const size_t padSize);
 
+namespace LANG_CODE
+{
+constexpr const char* UNDETERMINED = "und"; // Kodi language code for unknown language
+}
+
 namespace CODEC
 {
 constexpr const char* NAME_UNKNOWN = "unk"; // Kodi codec name for unknown codec