shaka-player 4.9.21 → 4.9.23

package/lib/polyfill/abort_controller.js

@@ -58,14 +58,11 @@ shaka.polyfill.AbortController = class {
 
 /**
  * @summary A polyfill for AbortSignal, part of the AbortController API.
- * @implements {AbortSignal}
+ * @extends AbortSignal
  */
-shaka.polyfill.AbortController.AbortSignal =
-class extends shaka.util.FakeEventTarget {
+shaka.polyfill.AbortController.AbortSignal = class {
   /** */
   constructor() {
-    super();
-
     /** @private {boolean} */
     this.aborted_ = false;
 
@@ -74,6 +71,24 @@ class extends shaka.util.FakeEventTarget {
 
     /** @type {?function(!Event)} */
     this.onabort = null;
+
+    /** @private {!shaka.util.FakeEventTarget} */
+    this.eventTarget_ = new shaka.util.FakeEventTarget();
+  }
+
+  /** @override */
+  addEventListener(type, listener, options) {
+    return this.eventTarget_.addEventListener(type, listener, options);
+  }
+
+  /** @override */
+  removeEventListener(type, listener, options) {
+    return this.eventTarget_.removeEventListener(type, listener, options);
+  }
+
+  /** @override */
+  dispatchEvent(event) {
+    return this.eventTarget_.dispatchEvent(event);
   }
 
   /** @override */
@@ -81,12 +96,12 @@ class extends shaka.util.FakeEventTarget {
     return this.aborted_;
   }
 
-  /** @return {*} */
+  /** @override */
   get reason() {
     return this.reason_;
   }
 
-  /** @return {void} */
+  /** @override */
   throwIfAborted() {
     if (this.aborted_) {
       throw this.reason_;
@@ -119,21 +134,14 @@ class extends shaka.util.FakeEventTarget {
     this.dispatchEvent(event);
   }
 
-
-  /**
-   * @param {*=} reason
-   * @return {!AbortSignal}
-   */
+  /** @override */
   static abort(reason) {
     const signal = new shaka.polyfill.AbortController.AbortSignal();
     signal.doAbort_(reason);
     return signal;
   }
 
-  /**
-   * @param {number} timeMs
-   * @return {!AbortSignal}
-   */
+  /** @override */
   static timeout(timeMs) {
     const signal = new shaka.polyfill.AbortController.AbortSignal();
 

package/lib/text/ui_text_displayer.js

@@ -471,8 +471,8 @@ shaka.text.UITextDisplayer = class {
     const linesUnit = shaka.text.CueRegion.units.LINES;
     const percentageUnit = shaka.text.CueRegion.units.PERCENTAGE;
     const pixelUnit = shaka.text.CueRegion.units.PX;
-    const heightUnit = region.heightUnits == percentageUnit ? '%' : 'px';
-    const widthUnit = region.widthUnits == percentageUnit ? '%' : 'px';
+    let heightUnit = region.heightUnits == percentageUnit ? '%' : 'px';
+    let widthUnit = region.widthUnits == percentageUnit ? '%' : 'px';
     const viewportAnchorUnit =
         region.viewportAnchorUnits == percentageUnit ? '%' : 'px';
 
@@ -481,16 +481,19 @@ shaka.text.UITextDisplayer = class {
 
     regionElement.style.position = 'absolute';
 
+    let regionHeight = region.height;
+    let regionWidth = region.width;
+
     if (region.heightUnits === linesUnit) {
-      regionElement.style.height = region.height * lineHeightMultiple + '%';
-    } else {
-      regionElement.style.height = region.height + heightUnit;
+      regionHeight = region.height * lineHeightMultiple;
+      heightUnit = '%';
     }
     if (region.widthUnits === linesUnit) {
-      regionElement.style.width = region.width * lineWidthMultiple + '%';
-    } else {
-      regionElement.style.width = region.width + widthUnit;
+      regionWidth = region.width * lineWidthMultiple;
+      widthUnit = '%';
     }
+    regionElement.style.height = regionHeight + heightUnit;
+    regionElement.style.width = regionWidth + widthUnit;
 
     if (region.viewportAnchorUnits === linesUnit) {
       // from https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-708
@@ -498,15 +501,15 @@ shaka.text.UITextDisplayer = class {
       const windowWidth = this.aspectRatio_ === 4/3 ? 160 : 210;
       let left = region.viewportAnchorX / windowWidth * 100;
       // adjust top and left values based on the region anchor and window size
-      top -= region.regionAnchorY * region.height * lineHeightMultiple / 100;
-      left -= region.regionAnchorX * region.width * lineWidthMultiple / 100;
+      top -= region.regionAnchorY * regionHeight / 100;
+      left -= region.regionAnchorX * regionWidth / 100;
       regionElement.style.top = top + '%';
       regionElement.style.left = left + '%';
     } else {
       regionElement.style.top = region.viewportAnchorY -
-        region.regionAnchorY * region.height / 100 + viewportAnchorUnit;
+        region.regionAnchorY * regionHeight / 100 + viewportAnchorUnit;
       regionElement.style.left = region.viewportAnchorX -
-        region.regionAnchorX * region.width / 100 + viewportAnchorUnit;
+        region.regionAnchorX * regionWidth / 100 + viewportAnchorUnit;
     }
     if (region.heightUnits !== pixelUnit &&
         region.widthUnits !== pixelUnit &&
@@ -839,7 +842,7 @@ shaka.text.UITextDisplayer = class {
       if (cue.position !== null) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
-          style.right = cue.position + '%';
+          style.right = (100 - cue.position) + '%';
           style.width = 'auto';
         } else {
           style.bottom = cue.position + '%';

package/lib/text/vtt_text_parser.js

@@ -160,9 +160,17 @@ shaka.text.VttTextParser = class {
           shaka.util.Error.Code.INVALID_TEXT_HEADER);
     }
 
-    const mpegTime = Number(mpegTimeMatch[1]);
+    let mpegTime = Number(mpegTimeMatch[1]);
     const mpegTimescale = shaka.text.VttTextParser.MPEG_TIMESCALE_;
 
+    const rolloverSeconds =
+        shaka.text.VttTextParser.TS_ROLLOVER_ / mpegTimescale;
+    let segmentStart = time.segmentStart - time.periodStart;
+    while (segmentStart >= rolloverSeconds) {
+      segmentStart -= rolloverSeconds;
+      mpegTime += shaka.text.VttTextParser.TS_ROLLOVER_;
+    }
+
     return time.periodStart + mpegTime / mpegTimescale - cueTime;
   }
 
@@ -1007,6 +1015,13 @@ shaka.text.VttTextParser = class {
  */
 shaka.text.VttTextParser.MPEG_TIMESCALE_ = 90000;
 
+/**
+ * At this value, timestamps roll over in TS content.
+ * @const {number}
+ * @private
+ */
+shaka.text.VttTextParser.TS_ROLLOVER_ = 0x200000000;
+
 /**
  * @const
  * @private {!RegExp}

package/lib/util/platform.js

@@ -749,10 +749,21 @@ shaka.util.Platform = class {
       maxResolution.width = 1920;
       maxResolution.height = 1080;
       try {
+        let winRT = undefined;
+
+        // Try to access to WinRT for WebView, if it's not defined,
+        // try to access to WinRT for WebView2, if it's not defined either,
+        // let it throw.
+        if (typeof Windows !== 'undefined') {
+          winRT = Windows;
+        } else {
+          winRT = chrome.webview.hostObjects.sync.Windows;
+        }
+
         const protectionCapabilities =
-            new Windows.Media.Protection.ProtectionCapabilities();
+            new winRT.Media.Protection.ProtectionCapabilities();
         const protectionResult =
-            Windows.Media.Protection.ProtectionCapabilityResult;
+            winRT.Media.Protection.ProtectionCapabilityResult;
         // isTypeSupported may return "maybe", which means the operation is not
         // completed. This means we need to retry
         // https://learn.microsoft.com/en-us/uwp/api/windows.media.protection.protectioncapabilityresult?view=winrt-22621

package/lib/util/stream_utils.js

@@ -374,6 +374,9 @@ shaka.util.StreamUtils = class {
     goog.asserts.assert(navigator.mediaCapabilities,
         'MediaCapabilities should be valid.');
 
+    if (shaka.util.Platform.isXboxOne()) {
+      shaka.util.StreamUtils.overrideDolbyVisionCodecs(manifest.variants);
+    }
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false,
         preferredKeySystems);
@@ -400,6 +403,40 @@ shaka.util.StreamUtils = class {
   }
 
 
+  /**
+   * Maps Dolby Vision codecs to H.264 and H.265 equivalents as a workaround
+   * to make Dolby Vision playback work on some platforms.
+   *
+   * Mapping is done according to the relevant Dolby documentation found here:
+   * https://professionalsupport.dolby.com/s/article/How-to-signal-Dolby-Vision-in-MPEG-DASH?language=en_US
+   * @param {!Array<!shaka.extern.Variant>} variants
+   */
+  static overrideDolbyVisionCodecs(variants) {
+    /** @type {!Object<string, string>} */
+    const codecMap = {
+      'dvav': 'avc3',
+      'dva1': 'avc1',
+      'dvhe': 'hev1',
+      'dvh1': 'hvc1',
+    };
+    /** @type {!Set<!shaka.extern.Stream>} */
+    const streams = new Set();
+    for (const variant of variants) {
+      if (variant.video) {
+        streams.add(variant.video);
+      }
+    }
+    for (const video of streams) {
+      for (const dvCodec of Object.keys(codecMap)) {
+        if (video.codecs.includes(dvCodec)) {
+          video.codecs = video.codecs.replace(dvCodec, codecMap[dvCodec]);
+          break;
+        }
+      }
+    }
+  }
+
+
   /**
    * @param {!shaka.extern.Variant} variant
    * @param {?string} keySystem
@@ -1345,6 +1382,13 @@ shaka.util.StreamUtils = class {
       track.hdr = video.hdr || null;
       track.colorGamut = video.colorGamut || null;
       track.videoLayout = video.videoLayout || null;
+
+      if (videoCodec.includes(',')) {
+        track.channelsCount = video.channelsCount;
+        track.audioSamplingRate = video.audioSamplingRate;
+        track.spatialAudio = video.spatialAudio;
+        track.originalLanguage = video.originalLanguage;
+      }
     }
 
     if (audio) {

package/lib/util/tXml.js

@@ -753,11 +753,18 @@ shaka.util.TXml = class {
         // We only want the id attribute in which case
         // /'(.*?)'/ will suffice to get it.
         const idAttr = path.match(/(@id='(.*?)')/);
+        const tAttr = path.match(/(@t='(\d+)')/);
+        const numberIndex = path.match(/(@n='(\d+)')/);
         const position = path.match(/\[(\d+)\]/);
         returnPaths.push({
           name: nodeName[0],
           id: idAttr ?
             idAttr[0].match(/'(.*?)'/)[0].replace(/'/gm, '') : null,
+          t: tAttr ?
+            Number(tAttr[0].match(/'(.*?)'/)[0].replace(/'/gm, '')) : null,
+          n: numberIndex ?
+            Number(numberIndex[0].match(/'(.*?)'/)[0].replace(/'/gm, '')):
+            null,
           // position is counted from 1, so make it readable for devs
           position: position ? Number(position[1]) - 1 : null,
           attribute: path.split('/@')[1] || null,
@@ -787,6 +794,14 @@ shaka.util.TXml = class {
     const position = patchNode.attributes['pos'] || null;
 
     let index = lastNode.position;
+    if (index == null) {
+      if (lastNode.t !== null) {
+        index = TXml.nodePositionByAttribute_(nodes, 't', lastNode.t);
+      }
+      if (lastNode.n !== null) {
+        index = TXml.nodePositionByAttribute_(nodes, 'n', lastNode.n);
+      }
+    }
     if (index === null) {
       index = position === 'prepend' ? 0 : nodes.length;
     } else if (position === 'prepend') {
@@ -798,7 +813,7 @@ shaka.util.TXml = class {
     const attribute = lastNode.attribute;
 
     // Modify attribute
-    if (attribute) {
+    if (attribute && nodes[index]) {
       TXml.modifyNodeAttribute(nodes[index], action, attribute,
           TXml.getContents(patchNode) || '');
     // Rearrange nodes
@@ -814,6 +829,28 @@ shaka.util.TXml = class {
   }
 
 
+  /**
+   * Search the node index by the t attribute
+   * and return the index. if not found return null
+   * @param {!Array<shaka.extern.xml.Node>} nodes
+   * @param {!string} attribute
+   * @param {!number} value
+   * @private
+   */
+  static nodePositionByAttribute_(nodes, attribute, value) {
+    let index = 0;
+    for (const node of nodes) {
+      const attrs = node.attributes;
+      const val = Number(attrs[attribute]);
+      if (val === value) {
+        return index;
+      }
+      index++;
+    }
+    return null;
+  }
+
+
   /**
    * @param {!shaka.extern.xml.Node} node
    * @param {string} action
@@ -875,6 +912,8 @@ shaka.util.TXml.knownNameSpaces_ = new Map([]);
  * @typedef {{
  *   name: string,
  *   id: ?string,
+ *   t: ?number,
+ *   n: ?number,
  *   position: ?number,
  *   attribute: ?string
  * }}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.21",
+  "version": "4.9.23",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -31,12 +31,12 @@
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",
     "fontfaceonload": "^1.0.2",
-    "google-closure-compiler-java": "^20221102.0.0",
-    "google-closure-deps": "^20221102.0.0",
+    "google-closure-compiler-java": "^20240317.0.0",
+    "google-closure-deps": "^20230802.0.0",
     "google-closure-library": "^20221102.0.0",
     "htmlhint": "^1.1.3",
     "jasmine-ajax": "^4.0.0",
-    "jimp": "^0.16.1",
+    "jimp": "^0.22.12",
     "js-yaml": "^4.1.0",
     "jsdoc": "github:joeyparrish/jsdoc#2ca85bb6",
     "karma": "github:joeyparrish/karma#shaka-fixes",
@@ -50,7 +50,7 @@
     "karma-webdriver-launcher": "^1.0.8",
     "lcevc_dec.js": "^1.1.3",
     "less": "^4.2.0",
-    "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
+    "less-plugin-clean-css": "^1.6.0",
     "material-design-lite": "^1.3.0",
     "open-sans-fonts": "^1.6.2",
     "postcss-less": "^6.0.0",

package/ui/presentation_time.js

@@ -83,7 +83,10 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
     const seekRangeSize = seekRange.end - seekRange.start;
     const Utils = shaka.ui.Utils;
 
-    if (this.player.isLive()) {
+    if (!isFinite(seekRangeSize)) {
+      this.setValue_(this.localization.resolve(shaka.ui.Locales.Ids.LIVE));
+      this.currentTime_.disabled = true;
+    } else if (this.player.isLive()) {
       // The amount of time we are behind the live edge.
       const behindLive = Math.floor(seekRange.end - displayTime);
       displayTime = Math.max(0, behindLive);

package/ui/resolution_selection.js

@@ -259,9 +259,17 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
     if (height == 2160) {
       text = '4K';
     }
-    const frameRate = track.frameRate;
-    if (frameRate && (frameRate >= 50 || frameRate <= 20)) {
-      text += Math.round(track.frameRate);
+    const frameRates = new Set();
+    for (const item of tracks) {
+      if (item.frameRate) {
+        frameRates.add(Math.round(item.frameRate));
+      }
+    }
+    if (frameRates.size > 1) {
+      const frameRate = track.frameRate;
+      if (frameRate && (frameRate >= 50 || frameRate <= 20)) {
+        text += Math.round(track.frameRate);
+      }
     }
     if (track.hdr == 'PQ' || track.hdr == 'HLG') {
       text += ' (HDR)';

package/ui/seek_bar.js

@@ -470,7 +470,8 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
     const seekRangeSize = seekRange.end - seekRange.start;
 
     if (this.player.isLive() &&
-        seekRangeSize < shaka.ui.Constants.MIN_SEEK_WINDOW_TO_SHOW_SEEKBAR) {
+        (seekRangeSize < shaka.ui.Constants.MIN_SEEK_WINDOW_TO_SHOW_SEEKBAR ||
+        !isFinite(seekRangeSize))) {
       return false;
     }