dasha 3.1.4 → 3.1.5

package/lib/dash.js

@@ -259,15 +259,33 @@ const parseSegmentsFromTemplate = (
 };
 
 const parseSegmentsFromList = (segmentList, baseUrl) => {
-  const segmentUrls = segmentList.get('SegmentURL');
+  const segmentUrls = segmentList.getAll('SegmentURL');
   const segments = [];
   for (const segmentUrl of segmentUrls) {
     let mediaUrl = segmentUrl.get('media');
-    if (!mediaUrl) mediaUrl = baseUrl;
-    else if (!mediaUrl.startsWith('https://'))
+    if (!mediaUrl) {
+      mediaUrl = baseUrl;
+    } else if (!mediaUrl.startsWith('https://')) {
       mediaUrl = new URL(mediaUrl, baseUrl).toString();
+    }
     segments.push({ url: mediaUrl, range: segmentUrl.get('mediaRange') });
   }
+  const initialization = segmentList.get('Initialization');
+  if (initialization) {
+    let mediaUrl = initialization.get('sourceURL');
+    if (!mediaUrl) {
+      mediaUrl = baseUrl;
+    } else if (!mediaUrl.startsWith('https://')) {
+      mediaUrl = new URL(mediaUrl, baseUrl).toString();
+    }
+    if (mediaUrl) {
+      segments.unshift({
+        url: mediaUrl,
+        range: initialization.get('range'),
+        init: true,
+      });
+    }
+  }
   return segments;
 };
 
@@ -314,8 +332,12 @@ const parseContentProtection = (contentProtections) => {
   for (const contentProtection of contentProtections) {
     const id = contentProtection.get('schemeIdUri')?.toLowerCase();
     const value = contentProtection.get('value');
-    const pssh = contentProtection.get('cenc:pssh')?.get();
-    const defaultKeyId = contentProtection.get('cenc:default_KID');
+    const pssh =
+      contentProtection.get('cenc:pssh')?.get() ||
+      contentProtection.get('pssh')?.get();
+    const defaultKeyId =
+      contentProtection.get('cenc:default_KID') ||
+      contentProtection.get('kid')?.get();
     const data = { id, value, pssh, defaultKeyId };
     protection[protectionSchemas[id]] = data;
   }

package/lib/track.js

@@ -66,11 +66,11 @@ const createAudioLanguageFilter = (audios) => {
     }
     const results = [];
     const filteredLanguages = [
-      ...new Set(filtered.map((track) => track.language)),
+      ...new Set(filtered.map((track) => `${track.language}:${track.label}`)),
     ];
     for (const language of filteredLanguages) {
       const tracks = filtered
-        .filter((track) => track.language === language)
+        .filter((track) => `${track.language}:${track.label}` === language)
         .slice(0, maxTracksPerLanguage);
       results.push(...tracks);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Streaming manifest parser",
   "files": [
     "dasha.js",