shaka-player 4.9.32 → 4.9.34

package/lib/offline/download_info.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.offline.DownloadInfo');
 
 goog.require('shaka.util.Networking');
+goog.require('shaka.util.Uint8ArrayUtils');
 goog.requireType('shaka.media.InitSegmentReference');
 goog.requireType('shaka.media.SegmentReference');
 
@@ -43,6 +44,10 @@ shaka.offline.DownloadInfo = class {
    * @return {string}
    */
   static idForSegmentRef(ref) {
+    const segmentData = ref.getSegmentData();
+    if (segmentData) {
+      return shaka.util.Uint8ArrayUtils.toBase64(segmentData);
+    }
     // Escape the URIs using encodeURI, to make sure that a weirdly formed URI
     // cannot cause two unrelated refs to be considered equivalent.
     return ref.getUris().map((uri) => '{' + encodeURI(uri) + '}').join('') +

package/lib/offline/download_manager.js

@@ -168,6 +168,60 @@ shaka.offline.DownloadManager = class {
     return newPromise;
   }
 
+  /**
+   * Add already-downloaded data to a group.
+   *
+   * @param {number} groupId
+   *    The group to add this segment to. If the group does not exist, a new
+   *    group will be created.
+   * @param {!BufferSource} queueData
+   * @param {number} estimateId
+   * @param {boolean} isInitSegment
+   * @param {function(BufferSource):!Promise} onDownloaded
+   *   The callback for when this request has been downloaded. Downloading for
+   *   |group| will pause until the promise returned by |onDownloaded| resolves.
+   * @return {!Promise} Resolved when this request is complete.
+   */
+  queueData(groupId, queueData, estimateId, isInitSegment, onDownloaded) {
+    this.destroyer_.ensureNotDestroyed();
+
+    const group = this.groups_.get(groupId) || Promise.resolve();
+
+    // Add another download to the group.
+    const newPromise = group.then(() => {
+      // Make sure we stop downloading if we have been destroyed.
+      if (this.destroyer_.destroyed()) {
+        throw new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.STORAGE,
+            shaka.util.Error.Code.OPERATION_ABORTED);
+      }
+
+      // Update initData
+      if (isInitSegment) {
+        const segmentBytes = shaka.util.BufferUtils.toUint8(queueData);
+        const pssh = new shaka.util.Pssh(segmentBytes);
+        for (const key in pssh.data) {
+          const index = Number(key);
+          const data = pssh.data[index];
+          const systemId = pssh.systemIds[index];
+          this.onInitData_(data, systemId);
+        }
+      }
+
+      // Update all our internal stats.
+      this.estimator_.close(estimateId, queueData.byteLength);
+      this.onProgress_(
+          this.estimator_.getEstimatedProgress(),
+          this.estimator_.getTotalDownloaded());
+
+      return onDownloaded(queueData);
+    });
+
+    this.groups_.set(groupId, newPromise);
+    return newPromise;
+  }
+
   /**
    * Add additional async work to the group work queue.
    *

package/lib/offline/manifest_converter.js

@@ -212,6 +212,7 @@ shaka.offline.ManifestConverter = class {
       spatialAudio: streamDB.spatialAudio,
       closedCaptions: streamDB.closedCaptions,
       tilesLayout: streamDB.tilesLayout,
+      mssPrivateData: streamDB.mssPrivateData,
       accessibilityPurpose: null,
       external: streamDB.external,
       fastSwitching: streamDB.fastSwitching,

package/lib/offline/storage.js

@@ -474,8 +474,16 @@ shaka.offline.Storage = class {
           pendingDataSize += data.byteLength;
         };
 
-        downloader.queue(download.groupId,
-            request, estimateId, isInitSegment, onDownloaded);
+        const ref = /** @type {!shaka.media.SegmentReference} */ (
+          download.ref);
+        const segmentData = ref.getSegmentData();
+        if (segmentData) {
+          downloader.queueData(download.groupId,
+              segmentData, estimateId, isInitSegment, onDownloaded);
+        } else {
+          downloader.queue(download.groupId,
+              request, estimateId, isInitSegment, onDownloaded);
+        }
       }
       await downloader.waitToFinish();
 
@@ -1335,6 +1343,7 @@ shaka.offline.Storage = class {
       spatialAudio: stream.spatialAudio,
       closedCaptions: stream.closedCaptions,
       tilesLayout: stream.tilesLayout,
+      mssPrivateData: stream.mssPrivateData,
       external: stream.external,
       fastSwitching: stream.fastSwitching,
     };

package/lib/player.js

@@ -56,6 +56,7 @@ goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MediaReadyState');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mutex');
+goog.require('shaka.util.NumberUtils');
 goog.require('shaka.util.ObjectUtils');
 goog.require('shaka.util.Platform');
 goog.require('shaka.util.PlayerConfiguration');
@@ -705,7 +706,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.externalSrcEqualsThumbnailsStreams_ = [];
 
     /** @private {number} */
-    this.completionPercent_ = NaN;
+    this.completionPercent_ = -1;
 
     /** @private {?shaka.extern.PlayerConfiguration} */
     this.config_ = this.defaultConfig_();
@@ -1446,7 +1447,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // after several playbacks, and they are not able anymore to properly
       // create MediaKeys objects. To prevent it, clear the cache after
       // each playback.
-      if (this.config_.streaming.clearDecodingCache) {
+      if (this.config_ && this.config_.streaming.clearDecodingCache) {
         shaka.util.StreamUtils.clearDecodingConfigCache();
         shaka.util.DrmUtils.clearMediaKeySystemAccessMap();
       }
@@ -1457,7 +1458,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       this.externalSrcEqualsThumbnailsStreams_ = [];
 
-      this.completionPercent_ = NaN;
+      this.completionPercent_ = -1;
 
       // Make sure that the app knows of the new buffering state.
       this.updateBufferState_();
@@ -2524,7 +2525,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       if (this.manifest_.nextUrl) {
         if (this.config_.streaming.preloadNextUrlWindow > 0) {
           const onTimeUpdate = async () => {
-            const timeToEnd = this.video_.duration - this.video_.currentTime;
+            const timeToEnd = this.seekRange().end - this.video_.currentTime;
             if (!isNaN(timeToEnd)) {
               if (timeToEnd <= this.config_.streaming.preloadNextUrlWindow) {
                 this.loadEventManager_.unlisten(
@@ -4059,10 +4060,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // seekable range.  This covers both plain mp4s and native HLS playbacks.
     if (this.video_ && this.video_.src) {
       const seekable = this.video_.seekable;
-      if (seekable.length) {
+      if (seekable && seekable.length) {
+        const playRangeStart =
+            this.config_ ? this.config_.playRangeStart : 0;
+        const start = Math.max(seekable.start(0), playRangeStart);
+        const playRangeEnd =
+            this.config_ ? this.config_.playRangeEnd : Infinity;
+        const end = Math.min(seekable.end(seekable.length - 1), playRangeEnd);
         return {
-          'start': seekable.start(0),
-          'end': seekable.end(seekable.length - 1),
+          'start': start,
+          'end': end,
         };
       }
     }
@@ -4220,12 +4227,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
     this.trickPlayEventManager_.removeAll();
 
-    if (this.video_.paused) {
-      // Our fast forward is implemented with playbackRate and needs the video
-      // to be playing (to not be paused) to take immediate effect.
-      // If the video is paused, "unpause" it.
-      this.video_.play();
-    }
     this.playRateController_.set(rate);
 
     if (this.loadMode_ == shaka.Player.LoadMode.MEDIA_SOURCE) {
@@ -5389,7 +5390,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
-    let duration = this.video_.duration;
+    const seekRange = this.seekRange();
+    let duration = seekRange.end - seekRange.start;
     if (this.manifest_) {
       duration = this.manifest_.presentationTimeline.getDuration();
     }
@@ -5502,7 +5504,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
-    let duration = this.video_.duration;
+    const seekRange = this.seekRange();
+    let duration = seekRange.end - seekRange.start;
     if (this.manifest_) {
       duration = this.manifest_.presentationTimeline.getDuration();
     }
@@ -5928,9 +5931,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       const Platform = shaka.util.Platform;
       if (this.videoContainer_ &&
           (!Platform.safariVersion() || document.fullscreenEnabled)) {
-        const latestConfig = this.getConfiguration();
         return new shaka.text.UITextDisplayer(
-            this.video_, this.videoContainer_, latestConfig.textDisplayer);
+            this.video_, this.videoContainer_);
       } else {
         // eslint-disable-next-line no-restricted-syntax
         if (HTMLMediaElement.prototype.addTextTrack) {
@@ -6198,7 +6200,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     let updateState = 'playing';
     if (this.bufferObserver_.getState() == State.STARVING) {
       updateState = 'buffering';
-    } else if (this.video_.ended) {
+    } else if (this.isEnded()) {
       updateState = 'ended';
     } else if (this.video_.paused) {
       updateState = 'paused';
@@ -6370,41 +6372,62 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (!this.video_) {
       return;
     }
-    let hasNewCompletionPercent = false;
-    const completionRatio = this.video_.currentTime / this.video_.duration;
-    if (!isNaN(completionRatio)) {
-      const percent = Math.round(100 * completionRatio);
-      if (isNaN(this.completionPercent_)) {
-        this.completionPercent_ = percent;
-        hasNewCompletionPercent = true;
-      } else {
-        const newCompletionPercent = Math.max(this.completionPercent_, percent);
-        if (this.completionPercent_ != newCompletionPercent) {
-          this.completionPercent_ = newCompletionPercent;
-          hasNewCompletionPercent = true;
+
+    const isQuartile = (quartilePercent, currentPercent) => {
+      const NumberUtils = shaka.util.NumberUtils;
+
+      if ((NumberUtils.isFloatEqual(quartilePercent, currentPercent) ||
+          currentPercent > quartilePercent) &&
+          this.completionPercent_ < quartilePercent) {
+        this.completionPercent_ = quartilePercent;
+        return true;
+      }
+      return false;
+    };
+
+    const checkEnded = () => {
+      if (this.config_ && this.config_.playRangeEnd != Infinity) {
+        // Make sure the video stops when we reach the end.
+        // This is required when there is a custom playRangeEnd specified.
+        if (this.isEnded()) {
+          this.video_.pause();
         }
       }
+    };
+
+    const seekRange = this.seekRange();
+    const duration = seekRange.end - seekRange.start;
+    const completionRatio =
+        duration > 0 ? this.video_.currentTime / duration : 0;
+
+    if (isNaN(completionRatio)) {
+      return;
     }
-    if (hasNewCompletionPercent) {
-      let event;
-      if (this.completionPercent_ == 0) {
-        event = shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.Started);
-      } else if (this.completionPercent_ == 25) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.FirstQuartile);
-      } else if (this.completionPercent_ == 50) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.Midpoint);
-      } else if (this.completionPercent_ == 75) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.ThirdQuartile);
-      } else if (this.completionPercent_ == 100) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.Complete);
-      }
-      if (event) {
-        this.dispatchEvent(event);
-      }
+
+    const percent = completionRatio * 100;
+
+    let event;
+    if (isQuartile(0, percent)) {
+      event = shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.Started);
+    } else if (isQuartile(25, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.FirstQuartile);
+    } else if (isQuartile(50, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.Midpoint);
+    } else if (isQuartile(75, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.ThirdQuartile);
+    } else if (isQuartile(100, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.Complete);
+      checkEnded();
+    } else {
+      checkEnded();
+    }
+
+    if (event) {
+      this.dispatchEvent(event);
     }
   }
 
@@ -7440,7 +7463,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // This is a strong guarantee that we are buffered to the end, because it
     // means the playhead is already at that end.
-    if (this.video_.ended) {
+    if (this.isEnded()) {
       return true;
     }
 
@@ -7480,7 +7503,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // This is a strong guarantee that we are buffered to the end, because it
     // means the playhead is already at that end.
-    if (this.video_.ended) {
+    if (this.isEnded()) {
       return true;
     }
 
@@ -7508,6 +7531,19 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         shaka.util.Error.Category.PLAYER,
         shaka.util.Error.Code.LOAD_INTERRUPTED);
   }
+
+  /**
+   * Indicate if the video has ended.
+   *
+   * @return {boolean}
+   * @export
+   */
+  isEnded() {
+    if (!this.video_ || this.video_.ended) {
+      return true;
+    }
+    return this.video_.currentTime >= this.seekRange().end;
+  }
 };
 
 /**
@@ -7549,7 +7585,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.9.32' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.34' + '-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

@@ -328,7 +328,7 @@ shaka.polyfill.MediaCapabilities = class {
     let displayType = videoConfig.contentType;
     if (videoConfig.width && videoConfig.height) {
       // All Chromecast can support 720p videos
-      if (videoConfig.width > 1280 || videoConfig.height > 720) {
+      if (videoConfig.width > 1280 && videoConfig.height > 720) {
         displayType +=
             `; width=${videoConfig.width}; height=${videoConfig.height}`;
       }

package/lib/text/simple_text_displayer.js

@@ -91,6 +91,9 @@ shaka.text.SimpleTextDisplayer = class {
    * @export
    */
   append(cues) {
+    if (!this.textTrack_) {
+      return;
+    }
     const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues);
 
     // Convert cues.
@@ -178,6 +181,9 @@ shaka.text.SimpleTextDisplayer = class {
    * @export
    */
   isTextVisible() {
+    if (!this.textTrack_) {
+      return false;
+    }
     return this.textTrack_.mode == 'showing';
   }
 
@@ -186,7 +192,9 @@ shaka.text.SimpleTextDisplayer = class {
    * @export
    */
   setTextVisibility(on) {
-    this.textTrack_.mode = on ? 'showing' : 'hidden';
+    if (this.textTrack_) {
+      this.textTrack_.mode = on ? 'showing' : 'hidden';
+    }
   }
 
   /**

package/lib/text/ui_text_displayer.js

@@ -8,7 +8,6 @@
 goog.provide('shaka.text.UITextDisplayer');
 
 goog.require('goog.asserts');
-goog.require('shaka.Deprecate');
 goog.require('shaka.log');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
@@ -31,9 +30,8 @@ shaka.text.UITextDisplayer = class {
    * Constructor.
    * @param {HTMLMediaElement} video
    * @param {HTMLElement} videoContainer
-   * @param {shaka.extern.TextDisplayerConfiguration} config
    */
-  constructor(video, videoContainer, config) {
+  constructor(video, videoContainer) {
     goog.asserts.assert(videoContainer, 'videoContainer should be valid.');
 
     if (!document.fullscreenEnabled) {
@@ -74,22 +72,12 @@ shaka.text.UITextDisplayer = class {
 
     this.videoContainer_.appendChild(this.textContainer_);
 
-    if (!config || !config.captionsUpdatePeriod) {
-      shaka.Deprecate.deprecateFeature(5,
-          'UITextDisplayer w/ config',
-          'Please migrate to initializing UITextDisplayer with a config.');
-    }
-
-    /** @private {number} */
-    const updatePeriod = (config && config.captionsUpdatePeriod) ?
-       config.captionsUpdatePeriod : 0.25;
-
     /** @private {shaka.util.Timer} */
     this.captionsTimer_ = new shaka.util.Timer(() => {
       if (!this.video_.paused) {
         this.updateCaptions_();
       }
-    }).tickEvery(updatePeriod);
+    }).tickEvery(/* seconds= */ 0.25);
 
     /**
      * Maps cues to cue elements. Specifically points out the wrapper element of

package/lib/text/vtt_text_parser.js

@@ -84,10 +84,15 @@ 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) {
-      offset = this.computeHlsOffset_(blocks[0], time);
+    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;
+      }
     }
 
     // Parse VTT regions.

package/lib/transmuxer/aac_transmuxer.js

@@ -35,6 +35,9 @@ shaka.transmuxer.AacTransmuxer = class {
 
     /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
+
+    /** @private {?Uint8Array} */
+    this.lastInitSegment_ = null;
   }
 
 
@@ -215,11 +218,16 @@ shaka.transmuxer.AacTransmuxer = class {
     } else {
       initSegment = this.initSegments.get(initSegmentKey);
     }
+    const appendInitSegment = this.lastInitSegment_ !== initSegment;
     const segmentData = mp4Generator.segmentData();
-
+    this.lastInitSegment_ = initSegment;
     this.frameIndex_++;
-    const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
-    return Promise.resolve(transmuxData);
+    if (appendInitSegment) {
+      const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
+      return Promise.resolve(transmuxData);
+    } else {
+      return Promise.resolve(segmentData);
+    }
   }
 };
 

package/lib/transmuxer/ac3_transmuxer.js

@@ -34,6 +34,9 @@ shaka.transmuxer.Ac3Transmuxer = class {
 
     /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
+
+    /** @private {?Uint8Array} */
+    this.lastInitSegment_ = null;
   }
 
 
@@ -203,11 +206,16 @@ shaka.transmuxer.Ac3Transmuxer = class {
     } else {
       initSegment = this.initSegments.get(initSegmentKey);
     }
+    const appendInitSegment = this.lastInitSegment_ !== initSegment;
     const segmentData = mp4Generator.segmentData();
-
+    this.lastInitSegment_ = initSegment;
     this.frameIndex_++;
-    const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
-    return Promise.resolve(transmuxData);
+    if (appendInitSegment) {
+      const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
+      return Promise.resolve(transmuxData);
+    } else {
+      return Promise.resolve(segmentData);
+    }
   }
 };
 

package/lib/transmuxer/ec3_transmuxer.js

@@ -34,6 +34,9 @@ shaka.transmuxer.Ec3Transmuxer = class {
 
     /** @private {!Map.<string, !Uint8Array>} */
     this.initSegments = new Map();
+
+    /** @private {?Uint8Array} */
+    this.lastInitSegment_ = null;
   }
 
 
@@ -203,11 +206,16 @@ shaka.transmuxer.Ec3Transmuxer = class {
     } else {
       initSegment = this.initSegments.get(initSegmentKey);
     }
+    const appendInitSegment = this.lastInitSegment_ !== initSegment;
     const segmentData = mp4Generator.segmentData();
-
+    this.lastInitSegment_ = initSegment;
     this.frameIndex_++;
-    const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
-    return Promise.resolve(transmuxData);
+    if (appendInitSegment) {
+      const transmuxData = Uint8ArrayUtils.concat(initSegment, segmentData);
+      return Promise.resolve(transmuxData);
+    } else {
+      return Promise.resolve(segmentData);
+    }
   }
 };