dasha 2.2.2 → 2.2.5

package/lib/manifest.js

@@ -21,7 +21,7 @@ class Manifest {
   getVideoTrack(height) {
     const isVideoAdaptationSet = (adaptationSet) =>
       adaptationSet.contentType === CONTENT_TYPE.video ||
-      adaptationSet.mimeType === 'video/mp4' ||
+      adaptationSet.mimeType?.includes('video') ||
       adaptationSet.maxWidth ||
       adaptationSet.maxHeight;
     const adaptationSets = this.periods
@@ -49,22 +49,22 @@ class Manifest {
   }
 
   getAudioTracks(languages) {
-    const isAudioAdaptationSet = (adaptationSet) =>
+    const filterAudio = (adaptationSet) =>
       (adaptationSet.contentType === CONTENT_TYPE.audio ||
-        adaptationSet.mimeType === 'audio/mp4') &&
+        adaptationSet.mimeType?.includes('audio') ||
+        adaptationSet.representations.some((r) => r.mimeType?.includes('audio'))) &&
       !adaptationSet.maxWidth;
+    const filterLanguages = (adaptationSet) =>
+      languages ? languages.some((lang) => adaptationSet.lang.includes(lang)) : true;
     const adaptationSets = this.periods
       .map((p) => p.adaptationSets)
       .flat(1)
-      .filter(isAudioAdaptationSet);
-
-    const representations = adaptationSets.map((a) => a.representations).flat(2);
-    const matches = representations.filter((r) => languages?.some((lang) => r.lang.includes(lang)));
-    const selectedRepresentations = matches?.length ? matches : representations;
+      .filter(filterAudio)
+      .filter(filterLanguages);
 
     const tracks = [];
-    for (const representation of selectedRepresentations) {
-      const adaptationSet = adaptationSets.find((a) => a.representations.includes(representation));
+    for (const adaptationSet of adaptationSets) {
+      const representation = this.findBestRepresentation(adaptationSet.representations);
       const track = {
         id: tracks.length,
         type: CONTENT_TYPE.audio,
@@ -86,7 +86,7 @@ class Manifest {
   getSubtitleTracks(languages) {
     const isSubtitleAdaptationSet = (adaptationSet) =>
       (adaptationSet.contentType === CONTENT_TYPE.text ||
-        adaptationSet.mimeType.includes('text')) &&
+        adaptationSet.mimeType?.includes('text')) &&
       !adaptationSet.maxWidth;
     const adaptationSets = this.periods
       .map((p) => p.adaptationSets)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "2.2.2",
+  "version": "2.2.5",
   "author": "Vitaliy Gashkov <vitnore@gmail.com>",
   "description": "Simple MPEG-DASH MPD parser",
   "license": "Apache-2.0",