dasha 2.2.3 → 2.2.6

package/lib/manifest.js

@@ -49,22 +49,22 @@ class Manifest {
   }
 
   getAudioTracks(languages) {
-    const isAudioAdaptationSet = (adaptationSet) =>
+    const filterAudio = (adaptationSet) =>
       (adaptationSet.contentType === CONTENT_TYPE.audio ||
-        adaptationSet.mimeType?.includes('audio')) &&
+        adaptationSet.mimeType?.includes('audio') ||
+        adaptationSet.representations.some((r) => r.mimeType?.includes('audio'))) &&
       !adaptationSet.maxWidth;
+    const filterLanguages = (adaptationSet) =>
+      languages?.length ? 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,
@@ -94,7 +94,9 @@ class Manifest {
       .filter(isSubtitleAdaptationSet);
 
     const representations = adaptationSets.map((a) => a.representations).flat(2);
-    const matches = representations.filter((r) => languages?.some((lang) => r.lang.includes(lang)));
+    const matches = representations.filter((r) =>
+      languages?.length ? languages?.some((lang) => r.lang.includes(lang)) : true
+    );
     const selectedRepresentations = matches?.length ? matches : representations;
 
     const tracks = [];

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dasha",
-  "version": "2.2.3",
+  "version": "2.2.6",
   "author": "Vitaliy Gashkov <vitnore@gmail.com>",
-  "description": "Simple MPEG-DASH MPD parser",
+  "description": "Parser of MPD-manifests for MPEG DASH",
   "license": "Apache-2.0",
   "keywords": [
     "mpeg",
@@ -22,8 +22,8 @@
     "url": "git+https://github.com/vitnore/dasha.git"
   },
   "funding": {
-    "type": "patreon",
-    "url": "https://www.patreon.com/vitnore"
+    "type": "individual",
+    "url": "https://boosty.to/vitnore"
   },
   "scripts": {
     "test": "jest",