shaka-player 4.12.1 → 4.12.2

package/externs/shaka/abortable.js

@@ -18,39 +18,39 @@
  * @template T
  * @exportDoc
  */
-shaka.extern.IAbortableOperation = function() {};
-
-
-/**
- * A Promise which represents the underlying operation.  It is resolved when
- * the operation is complete, and rejected if the operation fails or is
- * aborted.  Aborted operations should be rejected with a shaka.util.Error
- * object using the error code OPERATION_ABORTED.
- *
- * @const {!Promise.<T>}
- * @exportDoc
- */
-shaka.extern.IAbortableOperation.prototype.promise;
-
-
-/**
- * Can be called by anyone holding this object to abort the underlying
- * operation.  This is not cancelation, and will not necessarily result in
- * any work being undone.  abort() should return a Promise which is resolved
- * when the underlying operation has been aborted.  The returned Promise
- * should never be rejected.
- *
- * @return {!Promise}
- * @exportDoc
- */
-shaka.extern.IAbortableOperation.prototype.abort = function() {};
-
-
-/**
- * @param {function(boolean)} onFinal A callback to be invoked after the
- *   operation succeeds or fails.  The boolean argument is true if the operation
- *   succeeded and false if it failed.
- * @return {!shaka.extern.IAbortableOperation.<T>} Returns this.
- * @exportDoc
- */
-shaka.extern.IAbortableOperation.prototype.finally = function(onFinal) {};
+shaka.extern.IAbortableOperation = class {
+  constructor() {
+    /**
+     * A Promise which represents the underlying operation.  It is resolved when
+     * the operation is complete, and rejected if the operation fails or is
+     * aborted.  Aborted operations should be rejected with a shaka.util.Error
+     * object using the error code OPERATION_ABORTED.
+     *
+     * @const {!Promise.<T>}
+     * @exportDoc
+     */
+    this.promise;
+  }
+
+  /**
+   * Can be called by anyone holding this object to abort the underlying
+   * operation.  This is not cancelation, and will not necessarily result in
+   * any work being undone.  abort() should return a Promise which is resolved
+   * when the underlying operation has been aborted.  The returned Promise
+   * should never be rejected.
+   *
+   * @return {!Promise}
+   * @exportDoc
+   */
+  abort() {}
+
+
+  /**
+   * @param {function(boolean)} onFinal A callback to be invoked after the
+   *   operation succeeds or fails.  The boolean argument is true
+   *   if the operation succeeded and false if it failed.
+   * @return {!shaka.extern.IAbortableOperation.<T>} Returns this.
+   * @exportDoc
+   */
+  finally(onFinal) {}
+};

package/lib/ads/interstitial_ad_manager.js

@@ -1000,6 +1000,8 @@ shaka.ads.InterstitialAdManager = class {
     goog.asserts.assert(this.player_, 'Must have player');
     goog.asserts.assert(this.basePlayer_, 'Must have base player');
     this.player_.configure(this.basePlayer_.getNonDefaultConfiguration());
+    this.player_.configure('ads.disableHLSInterstitial', true);
+    this.player_.configure('ads.disableDASHInterstitial', true);
     const netEngine = this.player_.getNetworkingEngine();
     goog.asserts.assert(netEngine, 'Need networking engine');
     netEngine.clearAllRequestFilters();

package/lib/hls/hls_parser.js

@@ -4127,7 +4127,7 @@ shaka.hls.HlsParser = class {
     let aesKey = undefined;
 
     let discontinuitySequence = shaka.hls.Utils.getFirstTagWithNameAsNumber(
-        playlist.tags, 'EXT-X-DISCONTINUITY-SEQUENCE', 0);
+        playlist.tags, 'EXT-X-DISCONTINUITY-SEQUENCE', -1);
     const mediaSequenceNumber = shaka.hls.Utils.getFirstTagWithNameAsNumber(
         playlist.tags, 'EXT-X-MEDIA-SEQUENCE', 0);
     const skipTag = shaka.hls.Utils.getFirstTagWithName(

package/lib/media/drm_engine.js

@@ -1717,6 +1717,7 @@ shaka.media.DrmEngine = class {
     const testKeySystems = [
       'org.w3.clearkey',
       'com.widevine.alpha',
+      'com.widevine.alpha.experiment', // Widevine L1 in Windows
       'com.microsoft.playready',
       'com.microsoft.playready.hardware',
       'com.microsoft.playready.recommendation',
@@ -1741,6 +1742,7 @@ shaka.media.DrmEngine = class {
 
     const testRobustness = {
       'com.widevine.alpha': widevineRobustness,
+      'com.widevine.alpha.experiment': widevineRobustness,
       'com.microsoft.playready.recommendation': playreadyRobustness,
     };
 

package/lib/media/media_source_engine.js

@@ -1139,7 +1139,8 @@ shaka.media.MediaSourceEngine = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     if (contentType == ContentType.TEXT) {
-      if (this.sequenceMode_) {
+      if (this.manifestType_ == shaka.media.ManifestParser.HLS &&
+          reference.discontinuitySequence >= 0) {
         // This won't be known until the first video segment is appended.
         const offset = await this.textSequenceModeOffset_;
         this.textEngine_.setTimestampOffset(offset);
@@ -1233,7 +1234,7 @@ shaka.media.MediaSourceEngine = class {
         const isBestSourceBufferForTimestamps =
             contentType == ContentType.VIDEO ||
             !(ContentType.VIDEO in this.sourceBuffers_);
-        if (this.sequenceMode_ && isBestSourceBufferForTimestamps) {
+        if (isBestSourceBufferForTimestamps) {
           this.textSequenceModeOffset_.resolve(timestampOffset);
         }
       }
@@ -1562,6 +1563,10 @@ shaka.media.MediaSourceEngine = class {
       this.textSequenceModeOffset_ = new shaka.util.PublicPromise();
     }
 
+    if (!this.sequenceMode_) {
+      return;
+    }
+
     // Queue an abort() to help MSE splice together overlapping segments.
     // We set appendWindowEnd when we change periods in DASH content, and the
     // period transition may result in overlap.
@@ -2095,6 +2100,48 @@ shaka.media.MediaSourceEngine = class {
         null);
   }
 
+  /**
+   * Returns the source buffer parameters
+   * @param {shaka.util.ManifestParserUtils.ContentType} contentType
+   * @return {?shaka.media.MediaSourceEngine.SourceBufferParams}
+   * @private
+   */
+  getSourceBufferParams_(contentType) {
+    if (!this.sourceBuffers_[contentType]) {
+      return null;
+    }
+    return {
+      timestampOffset: this.sourceBuffers_[contentType].timestampOffset,
+      appendWindowStart: this.sourceBuffers_[contentType].appendWindowStart,
+      appendWindowEnd: this.sourceBuffers_[contentType].appendWindowEnd,
+    };
+  }
+
+  /**
+   * Restore source buffer parameters
+   * @param {shaka.util.ManifestParserUtils.ContentType} contentType
+   * @param {?shaka.media.MediaSourceEngine.SourceBufferParams} params
+   * @private
+   */
+  restoreSourceBufferParams_(contentType, params) {
+    if (!params) {
+      return;
+    }
+
+    if (!this.sourceBuffers_[contentType]) {
+      shaka.log.warning('Attempted to restore a non-existent source buffer');
+      return;
+    }
+
+    this.sourceBuffers_[contentType].timestampOffset =
+      params.timestampOffset;
+    // `end` needs to be set before `start`
+    this.sourceBuffers_[contentType].appendWindowEnd =
+      params.appendWindowEnd;
+    this.sourceBuffers_[contentType].appendWindowStart =
+      params.appendWindowStart;
+  }
+
   /**
    * Resets the MediaSource and re-adds source buffers due to codec mismatch
    *
@@ -2155,7 +2202,6 @@ shaka.media.MediaSourceEngine = class {
       }
       await Promise.all(cleanup);
       this.transmuxers_ = {};
-      this.sourceBuffers_ = {};
 
       const previousDuration = this.mediaSource_.duration;
       this.mediaSourceOpen_ = new shaka.util.PublicPromise();
@@ -2186,6 +2232,7 @@ shaka.media.MediaSourceEngine = class {
           onSourceBufferAdded);
 
       for (const contentType of streamsByType.keys()) {
+        const previousParams = this.getSourceBufferParams_(contentType);
         const stream = streamsByType.get(contentType);
         // eslint-disable-next-line no-await-in-loop
         await this.initSourceBuffer_(contentType, stream, stream.codecs);
@@ -2195,6 +2242,8 @@ shaka.media.MediaSourceEngine = class {
         } else {
           this.queues_[contentType] = [];
         }
+
+        this.restoreSourceBufferParams_(contentType, previousParams);
       }
       const audio = streamsByType.get(ContentType.AUDIO);
       if (audio && audio.isAudioMuxedInVideo) {
@@ -2492,3 +2541,12 @@ shaka.media.MediaSourceEngine.SourceBufferMode_ = {
  *   Called when an embedded 'emsg' box should trigger a manifest update.
  */
 shaka.media.MediaSourceEngine.PlayerInterface;
+
+/**
+ * @typedef {{
+ *   timestampOffset: number,
+ *   appendWindowStart: number,
+ *   appendWindowEnd: number
+ * }}
+ */
+shaka.media.MediaSourceEngine.SourceBufferParams;

package/lib/media/preload_manager.js

@@ -403,7 +403,12 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
         this.successPromise_.resolve();
       } catch (error) {
-        this.successPromise_.reject(error);
+        // Ignore OPERATION_ABORTED and OBJECT_DESTROYED errors.
+        if (!(error instanceof shaka.util.Error) ||
+            (error.code != shaka.util.Error.Code.OPERATION_ABORTED &&
+             error.code != shaka.util.Error.Code.OBJECT_DESTROYED)) {
+          this.successPromise_.reject(error);
+        }
       }
     })();
   }

package/lib/media/segment_reference.js

@@ -295,7 +295,7 @@ shaka.media.SegmentReference = class {
     this.thumbnailSprite = null;
 
     /** @type {number} */
-    this.discontinuitySequence = 0;
+    this.discontinuitySequence = -1;
 
     /** @type {boolean} */
     this.allPartialSegments = allPartialSegments;

package/lib/media/streaming_engine.js

@@ -2156,17 +2156,15 @@ shaka.media.StreamingEngine = class {
       }
     }
 
-    if (this.manifest_.sequenceMode) {
-      const lastDiscontinuitySequence =
-          mediaState.lastSegmentReference ?
-              mediaState.lastSegmentReference.discontinuitySequence : null;
-      // Across discontinuity bounds, we should resync timestamps for
-      // sequence mode playbacks.  The next segment appended should
-      // land at its theoretical timestamp from the segment index.
-      if (reference.discontinuitySequence != lastDiscontinuitySequence) {
-        operations.push(this.playerInterface_.mediaSourceEngine.resync(
-            mediaState.type, reference.startTime));
-      }
+    const lastDiscontinuitySequence =
+        mediaState.lastSegmentReference ?
+            mediaState.lastSegmentReference.discontinuitySequence : null;
+    // Across discontinuity bounds, we should resync timestamps.  The next
+    // segment appended should land at its theoretical timestamp from the
+    // segment index.
+    if (reference.discontinuitySequence != lastDiscontinuitySequence) {
+      operations.push(this.playerInterface_.mediaSourceEngine.resync(
+          mediaState.type, reference.startTime));
     }
 
     await Promise.all(operations);

package/lib/player.js

@@ -8269,7 +8269,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.12.1' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.12.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

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

@@ -86,13 +86,7 @@ shaka.text.VttTextParser = class {
     // 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;
-      }
+      offset = this.computeHlsOffset_(blocks[0], time);
     }
 
     // Parse VTT regions.
@@ -129,7 +123,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_;
   }
 
   /**
@@ -174,7 +176,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/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.
    *
@@ -642,19 +653,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.12.1",
+  "version": "4.12.2",
   "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",

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_;