[AdaptiveTree] Add missing impaired cases to dash/hls

xbmc · Jul 26, 2023 · 11b206b · 11b206b
1 parent b3bfc65
commit 11b206b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/parser/DASHTree.cpp b/src/parser/DASHTree.cpp
@@ -377,6 +377,8 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
         adpSet->SetIsForced(true);
       else if (value == "main")
         adpSet->SetIsDefault(true);
+      else if (value == "caption" || value == "alternate" || value == "commentary")
+        adpSet->SetIsImpaired(true);
     }
   }
 
@@ -389,7 +391,7 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
 
     if (schemeIdUri == "urn:mpeg:dash:role:2011")
     {
-      if (value == "caption")
+      if (STRING::StartsWith(value, "caption")) // caption or captions
         adpSet->SetIsImpaired(true);
     }
   }

diff --git a/src/parser/HLSTree.cpp b/src/parser/HLSTree.cpp
@@ -801,6 +801,17 @@ bool adaptive::CHLSTree::ParseManifest(const std::string& data)
       adpSet->SetIsDefault(attribs["DEFAULT"] == "YES");
       adpSet->SetIsForced(attribs["FORCED"] == "YES");
 
+      if (STRING::KeyExists(attribs, "CHARACTERISTICS"))
+      {
+        std::string ch = attribs["CHARACTERISTICS"];
+        if (STRING::Contains(ch, "public.accessibility.transcribes-spoken-dialog") ||
+            STRING::Contains(ch, "public.accessibility.describes-music-and-sound") ||
+            STRING::Contains(ch, "public.accessibility.describes-video"))
+        {
+          adpSet->SetIsImpaired(true);
+        }
+      }
+
       repr->AddCodecs(group.m_codecs);
       repr->SetTimescale(1000000);