dasha 2.2.0 → 2.2.3

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
@@ -29,7 +29,9 @@ class Manifest {
       .flat(1)
       .filter(isVideoAdaptationSet);
     const representations = adaptationSets.map((a) => a.representations).flat(2);
-    const matches = representations.filter((r) => r.height === height);
+    const matchesInHeight = representations.filter((r) => r.height === height);
+    const matchesInId = representations.filter((r) => r.id.includes(height));
+    const matches = matchesInHeight?.length ? matchesInHeight : matchesInId;
     const representation = this.findBestRepresentation(matches.length ? matches : representations);
     const adaptationSet = adaptationSets.find((a) => a.representations.includes(representation));
     return {
@@ -42,14 +44,14 @@ class Manifest {
       size: Math.ceil((representation.bandwidth / 8e6) * this.mediaPresentationDuration), // MB
       width: representation.width,
       height: representation.height,
-      quality: getQualityLabel(representation.height),
+      quality: getQualityLabel(representation.width),
     };
   }
 
   getAudioTracks(languages) {
     const isAudioAdaptationSet = (adaptationSet) =>
       (adaptationSet.contentType === CONTENT_TYPE.audio ||
-        adaptationSet.mimeType === 'audio/mp4') &&
+        adaptationSet.mimeType?.includes('audio')) &&
       !adaptationSet.maxWidth;
     const adaptationSets = this.periods
       .map((p) => p.adaptationSets)
@@ -84,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/lib/utils.js

@@ -34,14 +34,15 @@ const parseDuration = (durationString) => {
   return isFinite(d) ? d : null;
 };
 
-const getQualityLabel = (videoHeight) => {
-  const height = typeof videoHeight === 'number' ? videoHeight : parseInt(videoHeight);
-  if (isNaN(height)) return;
+const getQualityLabel = (videoWidth) => {
+  const width = typeof videoWidth === 'number' ? videoWidth : parseInt(videoWidth);
+  if (isNaN(width)) return;
   let label = 'SD';
-  if (height >= 720) label = 'HD';
-  if (height >= 1080) label = 'Full HD';
-  if (height >= 2160) label = '4K';
-  if (height >= 4320) label = '8K';
+  if (width >= 1280) label = 'HD';
+  if (width >= 1920) label = 'Full HD';
+  if (width >= 3840) label = 'UHD';
+  if (width >= 4096) label = '4K';
+  if (width >= 7680) label = '8K';
   return label;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "author": "Vitaliy Gashkov <vitnore@gmail.com>",
   "description": "Simple MPEG-DASH MPD parser",
   "license": "Apache-2.0",
@@ -34,13 +34,13 @@
     "format:check": "prettier --loglevel warn --check \"**/*.{ts,js,json,yaml}\""
   },
   "devDependencies": {
-    "@types/node": "^17.0.17",
-    "eslint": "^8.9.0",
-    "eslint-config-prettier": "^8.3.0",
+    "@types/node": "^17.0.23",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.5.1",
-    "prettier": "^2.5.1",
-    "typescript": "^4.5.5"
+    "prettier": "^2.6.1",
+    "typescript": "^4.6.3"
   }
 }