dasha 2.3.1 → 2.3.2

package/lib/manifest.js

@@ -2,7 +2,7 @@
 
 const { parseXml } = require('./xml');
 const { processManifest } = require('./processor');
-const { getQualityLabel, getHeightByWidth } = require('./utils');
+const { getQualityLabel, getHeightByWidth, getClosest } = require('./utils');
 const { CONTENT_TYPE, KEY_SYSTEMS } = require('./constants');
 
 const isUrl = (value) => {
@@ -34,11 +34,31 @@ class Manifest {
       .flat(1)
       .filter(isVideoAdaptationSet);
     const representations = adaptationSets.map((a) => a.representations).flat(2);
-    const matchesInHeight = representations.filter((r) => getHeightByWidth(r.width) === height);
-    const matchesInId = representations.filter((r) => r.id.includes(height));
-    const matches = matchesInHeight?.length ? matchesInHeight : matchesInId;
-    const representation = this.findBestRepresentation(matches.length ? matches : representations);
+
+    let suitableRepresentations = [];
+    if (height) {
+      const resolutions = representations.map((r) => ({
+        height: getHeightByWidth(r.width),
+        width: r.width,
+      }));
+      const heights = resolutions.map((r) => r.height);
+      const matchedHeight = height ? getClosest(height, heights) : Math.max(...heights);
+      const matchedResolution = resolutions.find((r) => r.height === matchedHeight);
+      const matchesInHeight = representations.filter((r) => matchedResolution.width === r.width);
+      const matchesInId = representations.filter((r) => r.id.includes(height.toString()));
+      suitableRepresentations = matchesInHeight?.length ? matchesInHeight : matchesInId;
+    }
+
+    const representation = this.findBestRepresentation(
+      suitableRepresentations.length ? suitableRepresentations : representations
+    );
     const adaptationSet = adaptationSets.find((a) => a.representations.includes(representation));
+    let codec = 'x264';
+    if (representation.codecs.includes('hvc') || representation.codecs.includes('hev'))
+      codec = 'x265';
+    let bitDepth = '8bit';
+    if (representation.codecs.includes('.2.4.')) bitDepth = '10bit';
+    if (representation.codecs.includes('.4.16.')) bitDepth = '12bit';
     return {
       id: 0,
       type: CONTENT_TYPE.video,
@@ -50,6 +70,10 @@ class Manifest {
       width: representation.width,
       height: representation.height,
       qualityLabel: getQualityLabel(representation.width),
+      hevc: representation.codecs.includes('hvc') || representation.codecs.includes('hev'),
+      codec,
+      codecs: representation.codecs,
+      bitDepth,
     };
   }
 
@@ -70,6 +94,7 @@ class Manifest {
     const tracks = [];
     for (const adaptationSet of adaptationSets) {
       const representation = this.findBestRepresentation(adaptationSet.representations);
+      let codec = '';
       const track = {
         id: tracks.length,
         type: CONTENT_TYPE.audio,
@@ -80,7 +105,8 @@ class Manifest {
         segments: this.getSegments(adaptationSet, representation),
         bitrate: Math.round(representation.bandwidth / 1000), // Kbps
         size: Math.ceil((representation.bandwidth / 8e6) * this.mediaPresentationDuration), // MB
-        audioSampleRate: representation.audioSamplingRate / 1000,
+        audioSamplingRate: representation.audioSamplingRate / 1000,
+        codecs: representation.codecs,
       };
       tracks.push(track);
     }

package/lib/utils.js

@@ -49,6 +49,9 @@ const getHeightByWidth = (videoWidth) => {
   return height;
 };
 
+const getClosest = (value, array) =>
+  array.reduce((prev, curr) => (Math.abs(curr - value) < Math.abs(prev - value) ? curr : prev));
+
 const getQualityLabel = (videoWidth) => getHeightByWidth(videoWidth) + 'p';
 
-module.exports = { parseDuration, getHeightByWidth, getQualityLabel };
+module.exports = { parseDuration, getHeightByWidth, getQualityLabel, getClosest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "author": "Vitaly Gashkov <vitalygashkov@bk.ru>",
   "description": "MPD-manifest parser for MPEG DASH",
   "license": "Apache-2.0",