shaka-player 4.11.13 → 4.11.15

package/lib/polyfill/media_capabilities.js

@@ -327,18 +327,56 @@ shaka.polyfill.MediaCapabilities = class {
 
     let displayType = videoConfig.contentType;
     if (videoConfig.width && videoConfig.height) {
-      displayType +=
-          `; width=${videoConfig.width}; height=${videoConfig.height}`;
+      // All Chromecast can support 720p videos
+      if (videoConfig.width > 1280 || videoConfig.height > 720) {
+        displayType +=
+            `; width=${videoConfig.width}; height=${videoConfig.height}`;
+      }
     }
     if (videoConfig.framerate) {
-      displayType += `; framerate=${videoConfig.framerate}`;
+      // All Chromecast can support a framerate of 24, 25 or 30.
+      const framerate = Math.round(videoConfig.framerate);
+      if (framerate < 24 || framerate > 30) {
+        displayType += `; framerate=${videoConfig.framerate}`;
+      }
     }
-    if (videoConfig.transferFunction === 'pq') {
-      // A "PQ" transfer function indicates this is an HDR-capable stream;
-      // "smpte2084" is the published standard. We need to inform the platform
-      // this query is specifically for HDR.
-      displayType += '; eotf=smpte2084';
+
+    // Don't trust Closure types here.  Although transferFunction is string or
+    // undefined, we don't want to count on the input type.  A switch statement
+    // will, however, differentiate between null and undefined.  So we default
+    // to a blank string.
+    const transferFunction = videoConfig.transferFunction || '';
+
+    // Based on internal sources.  Googlers, see go/cast-hdr-queries for source.
+    switch (transferFunction) {
+      // The empty case falls through to SDR.
+      case '':
+      // These are the only 3 values defined by MCap as of November 2024.
+      case 'srgb':
+        // https://en.wikipedia.org/wiki/Standard-dynamic-range_video
+        // https://en.wikipedia.org/wiki/SRGB
+        // https://en.wikipedia.org/wiki/Rec._709
+        // This is SDR, standardized in BT 709.
+        // The platform recognizes "eotf=bt709", but we can also omit it.
+        break;
+
+      case 'pq':
+        // https://en.wikipedia.org/wiki/Perceptual_quantizer
+        // This HDR transfer function is standardized as SMPTE ST 2084.
+        displayType += '; eotf=smpte2084';
+        break;
+
+      case 'hlg':
+        // https://en.wikipedia.org/wiki/Hybrid_log%E2%80%93gamma
+        // This HDR transfer function is standardized as ARIB STD-B67.
+        displayType += '; eotf=arib-std-b67';
+        break;
+
+      default:
+        // An unrecognized transfer function.  Reject this query.
+        return false;
     }
+
     let result = false;
     if (displayType in shaka.polyfill.MediaCapabilities
         .memoizedCanDisplayTypeRequests_) {

package/lib/text/vtt_text_parser.js

@@ -83,15 +83,14 @@ shaka.text.VttTextParser = class {
     // HLS content, which should use X-TIMESTAMP-MAP and periodStart instead.
     let offset = time.vttOffset;
 
-    // Only use 'X-TIMESTAMP-MAP' with HLS.  This overrides offset above.
-    if (blocks[0].includes('X-TIMESTAMP-MAP') &&
-        this.manifestType_ == shaka.media.ManifestParser.HLS) {
-      if (this.sequenceMode_) {
-        // Compute a different, rollover-based offset for sequence mode.
-        offset = this.computeHlsSequenceModeOffset_(blocks[0], time);
-      } else {
-        // Calculate the offset from the segment startTime.
-        offset = time.segmentStart;
+    if (this.manifestType_ == shaka.media.ManifestParser.HLS) {
+      // Only use 'X-TIMESTAMP-MAP' with HLS.
+      if (blocks[0].includes('X-TIMESTAMP-MAP')) {
+        offset = this.computeHlsOffset_(blocks[0], time);
+      } else if (time.periodStart && time.vttOffset == time.periodStart) {
+        // In the case where X-TIMESTAMP-MAP is not used and it is HLS, we
+        // should not use offset unless segment-relative times are used.
+        offset = 0;
       }
     }
 
@@ -129,7 +128,7 @@ shaka.text.VttTextParser = class {
    * @return {number}
    * @private
    */
-  computeHlsSequenceModeOffset_(headerBlock, time) {
+  computeHlsOffset_(headerBlock, time) {
     // https://bit.ly/2K92l7y
     // The 'X-TIMESTAMP-MAP' header is used in HLS to align text with
     // the rest of the media.

package/lib/util/abortable_operation.js

@@ -39,8 +39,8 @@ shaka.util.AbortableOperation = class {
     /** @private {function():!Promise} */
     this.onAbort_ = onAbort;
 
-    /** @private {boolean} */
-    this.aborted_ = false;
+    /** @private {?Promise} */
+    this.abortPromise_ = null;
   }
 
   /**
@@ -48,7 +48,7 @@ shaka.util.AbortableOperation = class {
    * @export
    */
   get aborted() {
-    return this.aborted_;
+    return this.abortPromise_ !== null;
   }
 
   /**
@@ -118,8 +118,10 @@ shaka.util.AbortableOperation = class {
    * @export
    */
   abort() {
-    this.aborted_ = true;
-    return this.onAbort_();
+    if (!this.abortPromise_) {
+      this.abortPromise_ = this.onAbort_();
+    }
+    return this.abortPromise_;
   }
 
   /**
@@ -164,6 +166,9 @@ shaka.util.AbortableOperation = class {
    */
   chain(onSuccess, onError) {
     const newPromise = new shaka.util.PublicPromise();
+    // Silence uncaught rejection errors, which may otherwise occur any place
+    // we don't explicitly handle aborted operations.
+    newPromise.catch(() => {});
     const abortError = shaka.util.AbortableOperation.abortError();
 
     // If called before "this" completes, just abort "this".
@@ -174,7 +179,7 @@ shaka.util.AbortableOperation = class {
 
     const makeCallback = (isSuccess) => {
       return (value) => {
-        if (this.aborted_ && isSuccess) {
+        if (this.abortPromise_ && isSuccess) {
           // If "this" is not abortable(), or if abort() is called after "this"
           // is complete but before the next stage in the chain begins, we
           // should stop right away.

package/lib/util/buffer_utils.js

@@ -62,10 +62,10 @@ shaka.util.BufferUtils = class {
    * @private
    */
   static unsafeGetArrayBuffer_(view) {
-    if (view instanceof ArrayBuffer) {
-      return view;
+    if (!ArrayBuffer.isView(view)) {
+      return /** @type {!ArrayBuffer} */(view);
     } else {
-      return view.buffer;
+      return /** @type {!ArrayBufferView} */(view).buffer;
     }
   }
 
@@ -79,17 +79,19 @@ shaka.util.BufferUtils = class {
    * @export
    */
   static toArrayBuffer(view) {
-    if (view instanceof ArrayBuffer) {
-      return view;
+    if (!ArrayBuffer.isView(view)) {
+      return /** @type {!ArrayBuffer} */(view);
     } else {
-      if (view.byteOffset == 0 && view.byteLength == view.buffer.byteLength) {
+      const aView = /** @type {!ArrayBufferView} */(view);
+      if (aView.byteOffset == 0 &&
+          aView.byteLength == aView.buffer.byteLength) {
         // This is a TypedArray over the whole buffer.
-        return view.buffer;
+        return aView.buffer;
       }
       // This is a "view" on the buffer.  Create a new buffer that only contains
       // the data.  Note that since this isn't an ArrayBuffer, the "new" call
       // will allocate a new buffer to hold the copy.
-      return new Uint8Array(view).buffer;
+      return new Uint8Array(aView).buffer;
     }
   }
 

package/lib/util/mime_utils.js

@@ -166,6 +166,8 @@ shaka.util.MimeUtils = class {
         return 'dtsx'; // DTS:X
       case base === 'mp4a' && profile === 'a9':
         return 'dtsc'; // DTS Digital Surround
+      case base === 'vp09':
+        return 'vp9';
       case base === 'avc1':
       case base === 'avc3':
         return 'avc'; // H264

package/lib/util/number_utils.js

@@ -0,0 +1,37 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.util.NumberUtils');
+
+
+shaka.util.NumberUtils = class {
+  /**
+   * Compare two float numbers, taking a configurable tolerance margin into
+   * account.
+   *
+   * @param {number} a
+   * @param {number} b
+   * @param {number=} tolerance
+   * @return {boolean}
+   */
+  static isFloatEqual(a, b, tolerance = Number.EPSILON) {
+    if (a === b) {
+      return true;
+    }
+
+    const error = Math.abs(a - b);
+
+    if (error <= tolerance) {
+      return true;
+    }
+
+    if (tolerance !== Number.EPSILON) {
+      return Math.abs(error - tolerance) <= Number.EPSILON;
+    }
+
+    return false;
+  }
+};

package/lib/util/object_utils.js

@@ -41,7 +41,7 @@ shaka.util.ObjectUtils = class {
 
           // This covers Uint8Array and friends, even without a TypedArray
           // base-class constructor.
-          const isTypedArray = val.buffer instanceof ArrayBuffer;
+          const isTypedArray = ArrayBuffer.isView(val);
           if (isTypedArray) {
             return val;
           }

package/lib/util/platform.js

@@ -205,6 +205,17 @@ shaka.util.Platform = class {
         shaka.util.Platform.chromeVersion() === 68;
   }
 
+  /**
+   * Check if the current platform is a WebOS 6.
+   *
+   * @return {boolean}
+   */
+  static isWebOS6() {
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 79;
+  }
+
   /**
    * Check if the current platform is a Google Chromecast.
    *
@@ -627,19 +638,19 @@ shaka.util.Platform = class {
   /**
    * Returns if codec switching SMOOTH is known reliable device support.
    *
-   * Some devices are known not to support `MediaSource.changeType`
+   * Some devices are known not to support <code>SourceBuffer.changeType</code>
    * well. These devices should use the reload strategy. If a device
-   * reports that it supports `changeType` but support it unreliably
-   * it should be added to this list.
+   * reports that it supports <code<changeType</code> but supports it unreliably
+   * it should be disallowed in this method.
    *
    * @return {boolean}
    */
   static supportsSmoothCodecSwitching() {
     const Platform = shaka.util.Platform;
-    if (Platform.isTizen2() || Platform.isTizen3() || Platform.isTizen4() ||
-        Platform.isTizen5() || Platform.isTizen6() || Platform.isWebOS3() ||
-        Platform.isWebOS4() || Platform.isWebOS5() || Platform.isPS4() ||
-        Platform.isPS5()) {
+    // All Tizen versions (up to Tizen 8) do not support SMOOTH so far.
+    // webOS seems to support SMOOTH from webOS 22.
+    if (Platform.isTizen() || Platform.isPS4() || Platform.isPS5() ||
+        Platform.isWebOS6()) {
       return false;
     }
     // Older chromecasts without GoogleTV seem to not support SMOOTH properly.

package/lib/util/uint8array_utils.js

@@ -119,8 +119,9 @@ shaka.util.Uint8ArrayUtils = class {
 
     for (let i = 0; i < varArgs.length; ++i) {
       const value = varArgs[i];
-      if (value instanceof Uint8Array) {
-        result.set(value, offset);
+      if (ArrayBuffer.isView(value) &&
+      /** @type {TypedArray} */ (value).BYTES_PER_ELEMENT === 1) {
+        result.set(/** @type {!Uint8Array} */(value), offset);
       } else {
         result.set(BufferUtils.toUint8(value), offset);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.11.13",
+  "version": "4.11.15",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -26,7 +26,7 @@
     "core-js": "^3.21.1",
     "dialog-polyfill": "^0.5.6",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^8.9.0",
+    "eslint": "^8.57.1",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",
@@ -105,7 +105,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.1.5"
+    "eme-encryption-scheme-polyfill": "^2.1.6"
   },
   "clean-package": {
     "remove": [

package/ui/chapter_selection.js

@@ -119,14 +119,18 @@ shaka.ui.ChapterSelection = class extends shaka.ui.SettingsMenu {
     const currentLocales = this.localization.getCurrentLocales();
     for (const locale of Array.from(currentLocales)) {
       nextLanguage = locale;
-      nextChapters = this.player.getChapters(nextLanguage);
+      // If player is a proxy, and the cast receiver doesn't support this
+      // method, you get back undefined.
+      nextChapters = this.player.getChapters(nextLanguage) || [];
       if (nextChapters.length) {
         break;
       }
     }
     if (!nextChapters.length) {
       nextLanguage = 'und';
-      nextChapters = this.player.getChapters(nextLanguage);
+      // If player is a proxy, and the cast receiver doesn't support this
+      // method, you get back undefined.
+      nextChapters = this.player.getChapters(nextLanguage) || [];
     }
 
     const languageChanged = nextLanguage !== this.chaptersLanguage_;

package/ui/language_utils.js

@@ -14,6 +14,7 @@ goog.require('shaka.ui.Overlay.TrackLabelFormat');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.LanguageUtils');
+goog.require('shaka.util.MimeUtils');
 goog.requireType('shaka.ui.Localization');
 
 
@@ -48,7 +49,8 @@ shaka.ui.LanguageUtils = class {
       if (!codecsByLanguage.has(track.language)) {
         codecsByLanguage.set(track.language, new Set());
       }
-      codecsByLanguage.get(track.language).add(track.audioCodec);
+      codecsByLanguage.get(track.language).add(
+          shaka.util.MimeUtils.getNormalizedCodec(track.audioCodec));
     }
     const hasDifferentAudioCodecs = (language) =>
       codecsByLanguage.has(language) && codecsByLanguage.get(language).size > 1;

package/ui/less/ad_controls.less

@@ -95,11 +95,11 @@
 
 .shaka-skip-ad-button {
   padding: 5px 15px;
-  background: rgba(0 0 0 / 70%);
+  background: rgba(0, 0, 0, 70%);
   border: none;
 
   &:disabled {
-    background: rgba(0 0 0 / 30%);
+    background: rgba(0, 0, 0, 30%);
   }
 
   cursor: pointer;
@@ -107,6 +107,6 @@
 
 .shaka-skip-ad-counter {
   padding: 5px;
-  background: rgba(0 0 0 / 70%);
+  background: rgba(0, 0, 0, 70%);
   margin: 0;
 }

package/ui/less/buttons.less

@@ -38,7 +38,7 @@
   border-radius: 50%;
 
   /* A small drop shadow below the button. */
-  box-shadow: rgba(0 0 0 / 10%) 0 0 20px 0;
+  box-shadow: rgba(0, 0, 0, 10%) 0 0 20px 0;
 
   /* No border. */
   border: none;
@@ -51,7 +51,7 @@
   background-position: center center;
 
   /* A background color behind the play arrow. */
-  background-color: rgba(255 255 255 / 90%);
+  background-color: rgba(255, 255, 255, 90%);
 
   .show-when-controls-shown();
 
@@ -127,10 +127,10 @@
   border: none;
 
   /* Setting text color to white */
-  color: rgb(255 255 255);
+  color: rgb(255, 255, 255);
 
   /* Setting background color to black so white text can be seen clearly */
-  background-color: rgb(0 0 0 / 50%);
+  background-color: rgb(0, 0, 0, 50%);
 
   cursor: default;
   font-size: 20px;

package/ui/less/containers.less

@@ -222,7 +222,7 @@
   min-width: 300px;
 
   color: white;
-  background-color: rgba(35 35 35 / 90%);
+  background-color: rgba(35, 35, 35, 90%);
 
   font-size: 14px;
 
@@ -243,7 +243,7 @@
   }
 
   span {
-    color: rgb(150 150 150);
+    color: rgb(150, 150, 150);
   }
 }
 
@@ -254,7 +254,7 @@
   min-width: 150px;
 
   color: white;
-  background-color: rgba(35 35 35 / 90%);
+  background-color: rgba(35, 35, 35, 90%);
 
   font-size: 14px;
 
@@ -275,12 +275,12 @@
   }
 
   span {
-    color: rgb(150 150 150);
+    color: rgb(150, 150, 150);
   }
 }
 
 .shaka-context-menu {
-  background-color: rgba(35 35 35 / 90%);
+  background-color: rgba(35, 35, 35, 90%);
 
   border-radius: 2px;
 
@@ -300,7 +300,7 @@
     cursor: pointer;
 
     &:hover {
-      background-color: rgba(50 50 50 / 90%);
+      background-color: rgba(50, 50, 50, 90%);
     }
   }
 
@@ -406,7 +406,7 @@
 
   /* Add a bit of a white shadow to keep our black spinner visible
   on a black background. */
-  filter: drop-shadow(0 0 2px rgba(255 255 255 / 50%));
+  filter: drop-shadow(0 0 2px rgba(255, 255, 255, 50%));
 }
 
 .shaka-hidden-fast-forward-container,

package/ui/less/overflow_menu.less

@@ -18,7 +18,7 @@
 
   /* Styles for the menu itself. */
   background: white;
-  box-shadow: 0 1px 9px 0 rgba(0 0 0 / 40%);
+  box-shadow: 0 1px 9px 0 rgba(0, 0, 0, 40%);
   border-radius: 2px;
   max-height: 250px;
   min-width: 180px;
@@ -53,7 +53,7 @@
 
     /* When hovered, the button's background is highlighted. */
     &:hover {
-      background: rgb(224 224 224);
+      background: rgb(224, 224, 224);
     }
 
     /* The button is clickable, showing cursor pointer */
@@ -65,7 +65,7 @@
     }
 
     .shaka-keyboard-navigation &:focus {
-      background: rgb(224 224 224);
+      background: rgb(224, 224, 224);
     }
   }
 
@@ -110,7 +110,7 @@
  * language, the currently-selected resolution, etc. */
 .shaka-current-selection-span {
   /* This is dimmer than the other span, which is the name of the submenu. */
-  color: rgba(0 0 0 / 54%);
+  color: rgba(0, 0, 0, 54%);
 }
 
 /* The submenus have somewhat different margins inside them. */

package/ui/less/thumbnails.less

@@ -1,7 +1,7 @@
 #shaka-player-ui-thumbnail-container {
   background-color: black;
   border: 1px solid black;
-  box-shadow: 0 8px 8px 0 rgb(0 0 0 / 50%);
+  box-shadow: 0 8px 8px 0 rgb(0, 0, 0, 50%);
   min-width: 150px;
   overflow: hidden;
   position: absolute;
@@ -14,7 +14,7 @@
   }
 
   #shaka-player-ui-thumbnail-time {
-    background-color: rgb(0 0 0 / 50%);
+    background-color: rgb(0, 0, 0, 50%);
     bottom: 0;
     color: white;
     font-size: 16px;
@@ -29,7 +29,7 @@
   background-color: white;
   border: 1px solid black;
   border-radius: 10px;
-  box-shadow: 0 8px 8px 0 rgb(0 0 0 / 50%);
+  box-shadow: 0 8px 8px 0 rgb(0, 0, 0, 50%);
   color: black;
   overflow: hidden;
   padding: 1px 7px;

package/ui/less/tooltip.less

@@ -53,7 +53,7 @@
       font-size: 13px;
 
       /* Styling */
-      background: rgba(35 35 35 / 90%);
+      background: rgba(35, 35, 35, 90%);
       color: white;
       border-radius: 3px;
       padding: 5px 10px;