shaka-player 3.1.1 → 3.1.5

package/lib/polyfill/media_capabilities.js

@@ -15,29 +15,49 @@ goog.require('shaka.util.Platform');
  * @summary A polyfill to provide navigator.mediaCapabilities on all browsers.
  * This is necessary for Tizen 3, Xbox One and possibly others we have yet to
  * discover.
+ * @export
  */
 shaka.polyfill.MediaCapabilities = class {
   /**
    * Install the polyfill if needed.
+   * @suppress {const}
+   * @export
    */
   static install() {
-    shaka.log.debug('MediaCapabilities: install');
-
     // Since MediaCapabilities is not fully supported on Chromecast yet, we
     // should always install polyfill for Chromecast.
     // TODO: re-evaluate MediaCapabilities in the future versions of Chromecast.
-    if (!shaka.util.Platform.isChromecast() && navigator.mediaCapabilities) {
-      shaka.log.debug(
+    // Since MediaCapabilities implementation is buggy in Apple browsers, we
+    // should always install polyfill for Apple browsers.
+    // See: https://github.com/google/shaka-player/issues/3530
+    // TODO: re-evaluate MediaCapabilities in the future versions of Apple
+    // Browsers.
+    // Since MediaCapabilities implementation is buggy in PS5 browsers, we
+    // should always install polyfill for PS5 browsers.
+    // See: https://github.com/google/shaka-player/issues/3582
+    // TODO: re-evaluate MediaCapabilities in the future versions of PS5
+    // Browsers.
+    if (!shaka.util.Platform.isChromecast() &&
+        !shaka.util.Platform.isApple() &&
+        !shaka.util.Platform.isPS5() &&
+        navigator.mediaCapabilities) {
+      shaka.log.info(
           'MediaCapabilities: Native mediaCapabilities support found.');
       return;
-    } else if (!window.MediaSource) {
-      shaka.log.debug(
-          'MediaSource must be available to install mediaCapabilities ',
-          'polyfill.');
-      return;
     }
 
-    navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
+    shaka.log.info('MediaCapabilities: install');
+
+    if (!navigator.mediaCapabilities) {
+      navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
+    }
+
+    // Keep the patched MediaCapabilities object from being garbage-collected in
+    // Safari.
+    // See https://github.com/google/shaka-player/issues/3696#issuecomment-1009472718
+    shaka.polyfill.MediaCapabilities.originalMcap =
+        navigator.mediaCapabilities;
+
     navigator.mediaCapabilities.decodingInfo =
         shaka.polyfill.MediaCapabilities.decodingInfo_;
   }
@@ -60,21 +80,45 @@ shaka.polyfill.MediaCapabilities = class {
       return res;
     }
 
-    // Use 'MediaSource.isTypeSupported' to check if the stream is supported.
-    if (mediaDecodingConfig['video']) {
-      const contentType = mediaDecodingConfig['video'].contentType;
-      const isSupported = MediaSource.isTypeSupported(contentType);
-      if (!isSupported) {
+    if (mediaDecodingConfig.type == 'media-source') {
+      if (!shaka.util.Platform.supportsMediaSource()) {
         return res;
       }
-    }
+      // Use 'MediaSource.isTypeSupported' to check if the stream is supported.
+      if (mediaDecodingConfig['video']) {
+        const contentType = mediaDecodingConfig['video'].contentType;
+        const isSupported = MediaSource.isTypeSupported(contentType);
+        if (!isSupported) {
+          return res;
+        }
+      }
 
-    if (mediaDecodingConfig['audio']) {
-      const contentType = mediaDecodingConfig['audio'].contentType;
-      const isSupported = MediaSource.isTypeSupported(contentType);
-      if (!isSupported) {
-        return res;
+      if (mediaDecodingConfig['audio']) {
+        const contentType = mediaDecodingConfig['audio'].contentType;
+        const isSupported = MediaSource.isTypeSupported(contentType);
+        if (!isSupported) {
+          return res;
+        }
       }
+    } else if (mediaDecodingConfig.type == 'file') {
+      if (mediaDecodingConfig['video']) {
+        const contentType = mediaDecodingConfig['video'].contentType;
+        const isSupported = shaka.util.Platform.supportsMediaType(contentType);
+        if (!isSupported) {
+          return res;
+        }
+      }
+
+      if (mediaDecodingConfig['audio']) {
+        const contentType = mediaDecodingConfig['audio'].contentType;
+        const isSupported = shaka.util.Platform.supportsMediaType(contentType);
+        if (!isSupported) {
+          return res;
+        }
+      }
+    } else {
+      // Otherwise not supported.
+      return res;
     }
 
     if (!mediaDecodingConfig.keySystemConfiguration) {
@@ -116,7 +160,7 @@ shaka.polyfill.MediaCapabilities = class {
         sessionTypes: mediaCapkeySystemConfig.sessionTypes,
       };
 
-      // Only add the audio video capablities if they have valid data.
+      // Only add the audio video capabilities if they have valid data.
       // Otherwise the query will fail.
       if (audioCapabilities.length) {
         mediaKeySystemConfig.audioCapabilities = audioCapabilities;
@@ -143,6 +187,16 @@ shaka.polyfill.MediaCapabilities = class {
   }
 };
 
+/**
+ * A copy of the MediaCapabilities instance, to prevent Safari from
+ * garbage-collecting the polyfilled method on it.  We make it public and export
+ * it to ensure that it is not stripped out by the compiler.
+ *
+ * @type {MediaCapabilities}
+ * @export
+ */
+shaka.polyfill.MediaCapabilities.originalMcap = null;
+
 // Install at a lower priority than MediaSource polyfill, so that we have
 // MediaSource available first.
 shaka.polyfill.register(shaka.polyfill.MediaCapabilities.install, -1);

package/lib/polyfill/mediasource.js

@@ -13,10 +13,12 @@ goog.require('shaka.util.Platform');
 
 /**
  * @summary A polyfill to patch MSE bugs.
+ * @export
  */
 shaka.polyfill.MediaSource = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     shaka.log.debug('MediaSource.install');
@@ -206,6 +208,12 @@ shaka.polyfill.MediaSource = class {
   static patchVp09_() {
     const originalIsTypeSupported = MediaSource.isTypeSupported;
 
+    if (shaka.util.Platform.isWebOS()) {
+      // Don't do this on LG webOS as otherwise it is unable
+      // to play vp09 at all.
+      return;
+    }
+
     MediaSource.isTypeSupported = (mimeType) => {
       // Split the MIME type into its various parameters.
       const pieces = mimeType.split(/ *; */);

package/lib/polyfill/orientation.js

@@ -15,10 +15,12 @@ goog.require('shaka.polyfill');
  * @summary A polyfill for systems that do not implement screen.orientation.
  * For now, this only handles systems that implement the deprecated
  * window.orientation feature... e.g. iPad.
+ * @export
  */
 shaka.polyfill.Orientation = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (screen.orientation) {
@@ -90,7 +92,7 @@ class extends shaka.util.FakeEventTarget {
 
   /** Dispatch a 'change' event. */
   dispatchChangeEvent() {
-    const event = new shaka.util.FakeEvent('change', {});
+    const event = new shaka.util.FakeEvent('change');
     this.dispatchEvent(event);
   }
 

package/lib/polyfill/patchedmediakeys_apple.js

@@ -22,10 +22,12 @@ goog.require('shaka.util.StringUtils');
 /**
  * @summary A polyfill to implement modern, standardized EME on top of Apple's
  * prefixed EME in Safari.
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysApple = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement || !window.WebKitMediaKeys) {
@@ -565,10 +567,10 @@ class extends shaka.util.FakeEventTarget {
 
     const isNew = this.keyStatuses.getStatus() == undefined;
 
-    const event2 = new shaka.util.FakeEvent('message', {
-      messageType: isNew ? 'license-request' : 'license-renewal',
-      message: shaka.util.BufferUtils.toArrayBuffer(event.message),
-    });
+    const data = new Map()
+        .set('messageType', isNew ? 'license-request' : 'license-renewal')
+        .set('message', shaka.util.BufferUtils.toArrayBuffer(event.message));
+    const event2 = new shaka.util.FakeEvent('message', data);
 
     this.dispatchEvent(event2);
   }

package/lib/polyfill/patchedmediakeys_ms.js

@@ -24,10 +24,12 @@ goog.require('shaka.util.PublicPromise');
  * {@link https://bit.ly/EmeMar15 EME draft 12 March 2015}
  * on top of ms-prefixed
  * {@link https://www.w3.org/TR/2014/WD-encrypted-media-20140218/ EME v20140218}
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysMs = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement || !window.MSMediaKeys ||
@@ -510,10 +512,10 @@ class extends shaka.util.FakeEventTarget {
 
     const isNew = this.keyStatuses.getStatus() == undefined;
 
-    const event2 = new shaka.util.FakeEvent('message', {
-      messageType: isNew ? 'license-request' : 'license-renewal',
-      message: shaka.util.BufferUtils.toArrayBuffer(event.message),
-    });
+    const data = new Map()
+        .set('messageType', isNew ? 'license-request' : 'license-renewal')
+        .set('message', shaka.util.BufferUtils.toArrayBuffer(event.message));
+    const event2 = new shaka.util.FakeEvent('message', data);
 
     this.dispatchEvent(event2);
   }

package/lib/polyfill/patchedmediakeys_nop.js

@@ -16,10 +16,12 @@ goog.require('shaka.polyfill');
  * {@link https://bit.ly/EmeMar15 EME draft 12 March 2015} on browsers without
  * EME.
  * All methods will fail.
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysNop = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement ||

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -24,10 +24,12 @@ goog.require('shaka.util.Uint8ArrayUtils');
  * @summary A polyfill to implement
  * {@link https://bit.ly/EmeMar15 EME draft 12 March 2015} on top of
  * webkit-prefixed {@link https://bit.ly/Eme01b EME v0.1b}.
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysWebkit = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     // Alias.
@@ -449,10 +451,10 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeys = class {
 
     const isNew = session.keyStatuses.getStatus() == undefined;
 
-    const event2 = new shaka.util.FakeEvent('message', {
-      messageType: isNew ? 'licenserequest' : 'licenserenewal',
-      message: event.message,
-    });
+    const data = new Map()
+        .set('messageType', isNew ? 'licenserequest' : 'licenserenewal')
+        .set('message', event.message);
+    const event2 = new shaka.util.FakeEvent('message', data);
 
     session.generated();
     session.dispatchEvent(event2);

package/lib/polyfill/pip_webkit.js

@@ -12,10 +12,12 @@ goog.require('shaka.polyfill');
 /**
  * @summary A polyfill to provide PiP support in Safari.
  * Note that Safari only supports PiP on video elements, not audio.
+ * @export
  */
 shaka.polyfill.PiPWebkit = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement) {

package/lib/polyfill/storage_estimate.js

@@ -13,10 +13,12 @@ goog.require('shaka.polyfill');
  * @summary A polyfill to provide navigator.storage.estimate in old
  * webkit browsers.
  * See: https://developers.google.com/web/updates/2017/08/estimating-available-storage-space#the-present
+ * @export
  */
 shaka.polyfill.StorageEstimate = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (navigator.storage && navigator.storage.estimate) {

package/lib/polyfill/video_play_promise.js

@@ -12,10 +12,12 @@ goog.require('shaka.polyfill');
 
 /**
  * @summary A polyfill to silence the play() Promise in HTML5 video.
+ * @export
  */
 shaka.polyfill.VideoPlayPromise = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     shaka.log.debug('VideoPlayPromise.install');

package/lib/polyfill/videoplaybackquality.js

@@ -13,10 +13,12 @@ goog.require('shaka.polyfill');
  * @summary A polyfill to provide MSE VideoPlaybackQuality metrics.
  * Many browsers do not yet provide this API, and Chrome currently provides
  * similar data through individual prefixed attributes on HTMLVideoElement.
+ * @export
  */
 shaka.polyfill.VideoPlaybackQuality = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement) {

package/lib/polyfill/vttcue.js

@@ -12,10 +12,12 @@ goog.require('shaka.polyfill');
 
 /**
  * @summary A polyfill to provide VTTCue.
+ * @export
  */
 shaka.polyfill.VTTCue = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (window.VTTCue) {

package/lib/text/cue.js

@@ -210,6 +210,12 @@ shaka.text.Cue = class {
      */
     this.nestedCues = [];
 
+    /**
+     * @override
+     * @exportInterface
+     */
+    this.isContainer = false;
+
     /**
      * @override
      * @exportInterface
@@ -232,6 +238,17 @@ shaka.text.Cue = class {
     };
   }
 
+  /**
+   * @param {number} start
+   * @param {number} end
+   * @return {!shaka.text.Cue}
+   */
+  static lineBreak(start, end) {
+    const cue = new shaka.text.Cue(start, end, '');
+    cue.lineBreak = true;
+    return cue;
+  }
+
   /**
    * Create a copy of the cue with the same properties.
    * @return {!shaka.text.Cue}

package/lib/text/mp4_ttml_parser.js

@@ -88,6 +88,9 @@ shaka.text.Mp4TtmlParser = class {
 
 shaka.text.TextEngine.registerParser(
     'application/mp4; codecs="stpp"', () => new shaka.text.Mp4TtmlParser());
+shaka.text.TextEngine.registerParser(
+    'application/mp4; codecs="stpp.ttml"',
+    () => new shaka.text.Mp4TtmlParser());
 shaka.text.TextEngine.registerParser(
     'application/mp4; codecs="stpp.ttml.im1t"',
     () => new shaka.text.Mp4TtmlParser());

package/lib/text/text_engine.js

@@ -345,6 +345,19 @@ shaka.text.TextEngine = class {
     return cues;
   }
 
+  /**
+   * @param {!shaka.text.Cue} cue the cue to apply the timestamp to recursively
+   * @param {number} videoTimestampOffset the timestamp offset of the video
+   * @private
+   */
+  applyVideoTimestampOffsetRecursive_(cue, videoTimestampOffset) {
+    cue.startTime += videoTimestampOffset;
+    cue.endTime += videoTimestampOffset;
+    for (const nested of cue.nestedCues) {
+      this.applyVideoTimestampOffsetRecursive_(nested, videoTimestampOffset);
+    }
+  }
+
   /**
    * Store the closed captions in the text engine, and append the cues to the
    * text displayer.  This is a side-channel used for embedded text only.
@@ -373,8 +386,7 @@ shaka.text.TextEngine = class {
 
       // Adjust CEA captions with respect to the timestamp offset of the video
       // stream in which they were embedded.
-      cue.startTime += videoTimestampOffset;
-      cue.endTime += videoTimestampOffset;
+      this.applyVideoTimestampOffsetRecursive_(cue, videoTimestampOffset);
 
       const keepThisCue =
           cue.startTime >= this.appendWindowStart_ &&