shaka-player 4.12.8 → 4.13.0

package/lib/media/content_workarounds.js

@@ -55,7 +55,7 @@ shaka.media.ContentWorkarounds = class {
     // Multiplexed content could have multiple boxes that we need to modify.
     // Add to this array in order of box offset.  This will be important later,
     // when we process the boxes.
-    /** @type {!Array.<{box: shaka.extern.ParsedBox, newType: number}>} */
+    /** @type {!Array<{box: shaka.extern.ParsedBox, newType: number}>} */
     const boxesToModify = [];
 
     new shaka.util.Mp4Parser()
@@ -208,7 +208,7 @@ shaka.media.ContentWorkarounds = class {
    * @param {!Uint8Array} initSegment
    * @param {shaka.extern.ParsedBox} stsdBox
    * @param {shaka.extern.ParsedBox} sourceBox
-   * @param {!Array.<shaka.extern.ParsedBox>} ancestorBoxes
+   * @param {!Array<shaka.extern.ParsedBox>} ancestorBoxes
    * @param {number} metadataBoxType
    * @return {!Uint8Array}
    * @private

package/lib/media/example_based_criteria.js

@@ -0,0 +1,69 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.media.ExampleBasedCriteria');
+
+goog.require('shaka.media.AdaptationSetCriteria');
+goog.requireType('shaka.config.CodecSwitchingStrategy');
+
+
+/**
+ * @implements {shaka.media.AdaptationSetCriteria}
+ * @final
+ */
+shaka.media.ExampleBasedCriteria = class {
+  /**
+   * @param {shaka.extern.Variant} example
+   * @param {shaka.config.CodecSwitchingStrategy} codecSwitchingStrategy
+   * @param {shaka.media.AdaptationSetCriteria.Factory
+   *        } adaptationSetCriteriaFactory
+   */
+  constructor(example, codecSwitchingStrategy, adaptationSetCriteriaFactory) {
+    // We can't know if role and label are really important, so we don't use
+    // role and label for this.
+    const role = '';
+    const audioLabel = '';
+    const videoLabel = '';
+    const hdrLevel = example.video && example.video.hdr ?
+        example.video.hdr : '';
+    const spatialAudio = example.audio && example.audio.spatialAudio ?
+        example.audio.spatialAudio : false;
+    const videoLayout = example.video && example.video.videoLayout ?
+        example.video.videoLayout : '';
+    const channelCount = example.audio && example.audio.channelsCount ?
+        example.audio.channelsCount : 0;
+    const audioCodec = example.audio && example.audio.codecs ?
+        example.audio.codecs : '';
+
+    /** @private {!shaka.media.AdaptationSetCriteria} */
+    this.preferenceBasedCriteria_ = adaptationSetCriteriaFactory();
+    this.preferenceBasedCriteria_.configure({
+      language: example.language,
+      role,
+      channelCount,
+      hdrLevel,
+      spatialAudio,
+      videoLayout,
+      audioLabel,
+      videoLabel,
+      codecSwitchingStrategy,
+      audioCodec,
+    });
+  }
+
+  /**
+   * @override
+   */
+  create(variants) {
+    return this.preferenceBasedCriteria_.create(variants);
+  }
+
+  /**
+   * @override
+   */
+  configure() {
+  }
+};

package/lib/media/gap_jumping_controller.js

@@ -53,6 +53,9 @@ shaka.media.GapJumpingController = class {
     /** @private {shaka.util.EventManager} */
     this.eventManager_ = new shaka.util.EventManager();
 
+    /** @private {boolean} */
+    this.started_ = false;
+
     /** @private {boolean} */
     this.seekingEventReceived_ = false;
 
@@ -90,7 +93,7 @@ shaka.media.GapJumpingController = class {
      */
     this.gapJumpTimer_ = new shaka.util.Timer(() => {
       this.onPollGapJump_();
-    }).tickEvery(this.config_.gapJumpTimerTime);
+    });
   }
 
 
@@ -134,16 +137,22 @@ shaka.media.GapJumpingController = class {
    * @param {number} startTime
    */
   onStarted(startTime) {
+    this.started_ = true;
     if (this.video_.seeking && !this.seekingEventReceived_) {
       this.seekingEventReceived_ = true;
       this.startTime_ = startTime;
     }
+    if (this.gapJumpTimer_) {
+      this.gapJumpTimer_.tickEvery(this.config_.gapJumpTimerTime);
+    }
+    this.onPollGapJump_();
   }
 
   /** Called when a seek has started. */
   onSeeking() {
     this.seekingEventReceived_ = true;
     this.hadSegmentAppended_ = false;
+    this.onPollGapJump_();
   }
 
 
@@ -167,6 +176,10 @@ shaka.media.GapJumpingController = class {
     if (this.video_.readyState == 0) {
       return;
     }
+    // Don't gap jump before playback started
+    if (!this.started_) {
+      return;
+    }
     // Do not gap jump if seeking has begun, but the seeking event has not
     // yet fired for this particular seek.
     if (this.video_.seeking) {

package/lib/media/manifest_filterer.js

@@ -7,8 +7,8 @@
 goog.provide('shaka.media.ManifestFilterer');
 
 goog.require('goog.asserts');
+goog.require('shaka.drm.DrmEngine');
 goog.require('shaka.util.StreamUtils');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.util.Error');
 
 /**
@@ -20,7 +20,7 @@ shaka.media.ManifestFilterer = class {
   /**
    * @param {?shaka.extern.PlayerConfiguration} config
    * @param {shaka.extern.Resolution} maxHwRes
-   * @param {?shaka.media.DrmEngine} drmEngine
+   * @param {?shaka.drm.DrmEngine} drmEngine
    */
   constructor(config, maxHwRes, drmEngine) {
     goog.asserts.assert(config, 'Must have config');
@@ -31,11 +31,11 @@ shaka.media.ManifestFilterer = class {
     /** @private {shaka.extern.Resolution} */
     this.maxHwRes_ = maxHwRes;
 
-    /** @private {?shaka.media.DrmEngine} drmEngine */
+    /** @private {?shaka.drm.DrmEngine} drmEngine */
     this.drmEngine_ = drmEngine;
   }
 
-  /** @param {!shaka.media.DrmEngine} drmEngine */
+  /** @param {!shaka.drm.DrmEngine} drmEngine */
   setDrmEngine(drmEngine) {
     this.drmEngine_ = drmEngine;
   }
@@ -45,7 +45,7 @@ shaka.media.ManifestFilterer = class {
    * the codecs.
    *
    * @param {?shaka.extern.Manifest} manifest
-   * @return {!Promise.<boolean>} tracksChanged
+   * @return {!Promise<boolean>} tracksChanged
    */
   async filterManifest(manifest) {
     goog.asserts.assert(manifest, 'Manifest should exist!');
@@ -156,10 +156,10 @@ shaka.media.ManifestFilterer = class {
     let hasPlayable = false;
     let hasAppRestrictions = false;
 
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const missingKeys = new Set();
 
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const badKeyStatuses = new Set();
 
     for (const variant of manifest.variants) {
@@ -214,7 +214,7 @@ shaka.media.ManifestFilterer = class {
  * of the usable keys.  'expired' status is being handled separately in
  * DrmEngine.
  *
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.media.ManifestFilterer.restrictedStatuses =
     ['output-restricted', 'internal-error'];

package/lib/media/manifest_parser.js

@@ -59,7 +59,7 @@ shaka.media.ManifestParser = class {
   /**
    * Returns a map of manifest support for well-known types.
    *
-   * @return {!Object.<string, boolean>}
+   * @return {!Object<string, boolean>}
    */
   static probeSupport() {
     const ManifestParser = shaka.media.ManifestParser;
@@ -191,7 +191,7 @@ shaka.media.ManifestParser.AccessibilityPurpose = {
 /**
  * Contains the parser factory functions indexed by MIME type.
  *
- * @type {!Object.<string, shaka.extern.ManifestParser.Factory>}
+ * @type {!Object<string, shaka.extern.ManifestParser.Factory>}
  */
 shaka.media.ManifestParser.parsersByMime = {};
 

package/lib/media/media_source_capabilities.js

@@ -42,10 +42,29 @@ shaka.media.Capabilities = class {
         // eslint-disable-next-line no-restricted-syntax
         !!sourceBuffer.prototype && !!sourceBuffer.prototype.changeType;
   }
+
+  /**
+   * Determine support for MediaSource.setLiveSeekableRange and
+   * MediaSource.clearLiveSeekableRange, which can allow for a media element
+   * duration of Infinite by providing a non-infinite seekable range.
+   *
+   * @return {boolean}
+   */
+  static isInfiniteLiveStreamDurationSupported() {
+    const mediaSource = window.ManagedMediaSource || window.MediaSource;
+    // eslint-disable-next-line no-restricted-syntax
+    if (mediaSource && mediaSource.prototype) {
+      // eslint-disable-next-line no-restricted-syntax
+      return !!mediaSource.prototype.setLiveSeekableRange &&
+      // eslint-disable-next-line no-restricted-syntax
+          !!mediaSource.prototype.clearLiveSeekableRange;
+    }
+    return false;
+  }
 };
 
 /**
  * Public it for unit test, and developer could also check the support map.
- * @type {!Map.<string, boolean>}
+ * @type {!Map<string, boolean>}
  */
 shaka.media.Capabilities.MediaSourceTypeSupportMap = new Map();

package/lib/media/media_source_engine.js

@@ -72,17 +72,23 @@ shaka.media.MediaSourceEngine = class {
     /** @private {shaka.extern.TextDisplayer} */
     this.textDisplayer_ = textDisplayer;
 
-    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
-                           SourceBuffer>} */
+    /**
+     * @private {!Object<shaka.util.ManifestParserUtils.ContentType,
+     *                    SourceBuffer>}
+     */
     this.sourceBuffers_ = {};
 
-    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
-                           string>} */
+    /**
+     * @private {!Object<shaka.util.ManifestParserUtils.ContentType,
+     *                    string>}
+     */
     this.sourceBufferTypes_ = {};
 
 
-    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
-                           boolean>} */
+    /**
+     * @private {!Object<shaka.util.ManifestParserUtils.ContentType,
+     *                    boolean>}
+     */
     this.expectedEncryption_ = {};
 
     /** @private {shaka.text.TextEngine} */
@@ -95,15 +101,15 @@ shaka.media.MediaSourceEngine = class {
     this.lcevcDec_ = lcevcDec || null;
 
     /**
-     * @private {!Object.<string,
-     *                    !Array.<shaka.media.MediaSourceEngine.Operation>>}
+     * @private {!Object<string,
+     *                    !Array<shaka.media.MediaSourceEngine.Operation>>}
      */
     this.queues_ = {};
 
     /** @private {shaka.util.EventManager} */
     this.eventManager_ = new shaka.util.EventManager();
 
-    /** @private {!Object.<string, !shaka.extern.Transmuxer>} */
+    /** @private {!Object<string, !shaka.extern.Transmuxer>} */
     this.transmuxers_ = {};
 
     /** @private {?shaka.media.IClosedCaptionParser} */
@@ -155,7 +161,7 @@ shaka.media.MediaSourceEngine = class {
     /** @private {boolean} */
     this.attemptTimestampOffsetCalculation_ = false;
 
-    /** @private {!shaka.util.PublicPromise.<number>} */
+    /** @private {!shaka.util.PublicPromise<number>} */
     this.textSequenceModeOffset_ = new shaka.util.PublicPromise();
 
     /** @private {boolean} */
@@ -164,8 +170,10 @@ shaka.media.MediaSourceEngine = class {
     /** @private {?number} */
     this.lastDuration_ = null;
 
-    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
-                           !shaka.util.TsParser>} */
+    /**
+     * @private {!Object<shaka.util.ManifestParserUtils.ContentType,
+     *                    !shaka.util.TsParser>}
+     */
     this.tsParsers_ = {};
 
     /** @private {?number} */
@@ -180,7 +188,7 @@ shaka.media.MediaSourceEngine = class {
     /** @private {?number} */
     this.firstAudioReferenceStartTime_ = null;
 
-    /** @private {!shaka.util.PublicPromise.<number>} */
+    /** @private {!shaka.util.PublicPromise<number>} */
     this.audioCompensation_ = new shaka.util.PublicPromise();
 
     if (this.video_.remote) {
@@ -307,7 +315,7 @@ shaka.media.MediaSourceEngine = class {
    *
    * @param {shaka.extern.Stream} stream
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
-   * @return {!Promise.<boolean>}
+   * @return {!Promise<boolean>}
    */
   static async isStreamSupported(stream, contentType) {
     if (stream.createSegmentIndex) {
@@ -371,7 +379,7 @@ shaka.media.MediaSourceEngine = class {
   /**
    * Returns a map of MediaSource support for well-known types.
    *
-   * @return {!Object.<string, boolean>}
+   * @return {!Object<string, boolean>}
    */
   static probeSupport() {
     const testMimeTypes = [
@@ -532,7 +540,7 @@ shaka.media.MediaSourceEngine = class {
    * Note that it is not valid to call this multiple times, except to add or
    * reinitialize text streams.
    *
-   * @param {!Map.<shaka.util.ManifestParserUtils.ContentType,
+   * @param {!Map<shaka.util.ManifestParserUtils.ContentType,
    *               shaka.extern.Stream>} streamsByType
    *   A map of content types to streams.  All streams must be supported
    *   according to MediaSourceEngine.isStreamSupported.
@@ -699,7 +707,7 @@ shaka.media.MediaSourceEngine = class {
 
   /**
    * Indicate if the streaming is allowed by MediaSourceEngine.
-   * If we using MediaSource we allways returns true.
+   * If we using MediaSource we always returns true.
    *
    * @return {boolean}
    */
@@ -891,7 +899,7 @@ shaka.media.MediaSourceEngine = class {
    *   we are appending
    * @param {shaka.extern.Stream} stream
    * @param {!string} mimeType
-   * @return {{timestamp: ?number, metadata: !Array.<shaka.extern.ID3Metadata>}}
+   * @return {{timestamp: ?number, metadata: !Array<shaka.extern.ID3Metadata>}}
    */
   getTimestampAndDispatchMetadata(contentType, data, reference, stream,
       mimeType) {
@@ -980,7 +988,7 @@ shaka.media.MediaSourceEngine = class {
    * Parse the EMSG box from a MP4 container.
    *
    * @param {!shaka.media.SegmentReference} reference
-   * @param {?Array.<string>} emsgSchemeIdUris Array of emsg
+   * @param {?Array<string>} emsgSchemeIdUris Array of emsg
    *     scheme_id_uri for which emsg boxes should be parsed.
    * @param {!shaka.extern.ParsedBox} box
    * @private
@@ -1506,7 +1514,7 @@ shaka.media.MediaSourceEngine = class {
    *   not be applied in this step.
    * @param {string} mimeType
    * @param {string} codecs
-   * @param {!Map.<shaka.util.ManifestParserUtils.ContentType,
+   * @param {!Map<shaka.util.ManifestParserUtils.ContentType,
    *               shaka.extern.Stream>} streamsByType
    *   A map of content types to streams.  All streams must be supported
    *   according to MediaSourceEngine.isStreamSupported.
@@ -1562,20 +1570,24 @@ shaka.media.MediaSourceEngine = class {
             null));
       }
     }
-    operations.push(this.enqueueOperation_(
-        contentType,
-        () => this.setAppendWindow_(
-            contentType, appendWindowStart, appendWindowEnd),
-        null));
-    if (this.needSplitMuxedContent_) {
+    if (appendWindowStart != 0 || appendWindowEnd != Infinity) {
       operations.push(this.enqueueOperation_(
-          ContentType.AUDIO,
+          contentType,
           () => this.setAppendWindow_(
-              ContentType.AUDIO, appendWindowStart, appendWindowEnd),
+              contentType, appendWindowStart, appendWindowEnd),
           null));
+      if (this.needSplitMuxedContent_) {
+        operations.push(this.enqueueOperation_(
+            ContentType.AUDIO,
+            () => this.setAppendWindow_(
+                ContentType.AUDIO, appendWindowStart, appendWindowEnd),
+            null));
+      }
     }
 
-    await Promise.all(operations);
+    if (operations.length) {
+      await Promise.all(operations);
+    }
   }
 
   /**
@@ -1699,6 +1711,43 @@ shaka.media.MediaSourceEngine = class {
     return this.mediaSource_.duration;
   }
 
+  /**
+   * Updates the live seekable range.
+   *
+   * @param {number} startTime
+   * @param {number} endTime
+   */
+  async setLiveSeekableRange(startTime, endTime) {
+    goog.asserts.assert('setLiveSeekableRange' in this.mediaSource_,
+        'Using setLiveSeekableRange on not supported platform');
+    if (this.ended() || this.closed()) {
+      return;
+    }
+    await this.enqueueBlockingOperation_(() => {
+      if (this.ended() || this.closed()) {
+        return;
+      }
+      this.mediaSource_.setLiveSeekableRange(startTime, endTime);
+    });
+  }
+
+  /**
+   * Clear the current live seekable range.
+   */
+  async clearLiveSeekableRange() {
+    goog.asserts.assert('clearLiveSeekableRange' in this.mediaSource_,
+        'Using clearLiveSeekableRange on not supported platform');
+    if (this.ended() || this.closed()) {
+      return;
+    }
+    await this.enqueueBlockingOperation_(() => {
+      if (this.ended() || this.closed()) {
+        return;
+      }
+      this.mediaSource_.clearLiveSeekableRange();
+    });
+  }
+
   /**
    * Append data to the SourceBuffer.
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
@@ -1901,9 +1950,9 @@ shaka.media.MediaSourceEngine = class {
   async enqueueBlockingOperation_(run) {
     this.destroyer_.ensureNotDestroyed();
 
-    /** @type {!Array.<!shaka.util.PublicPromise>} */
+    /** @type {!Array<!shaka.util.PublicPromise>} */
     const allWaiters = [];
-    /** @type {!Array.<!shaka.util.ManifestParserUtils.ContentType>} */
+    /** @type {!Array<!shaka.util.ManifestParserUtils.ContentType>} */
     const contentTypes = Object.keys(this.sourceBuffers_);
 
     // Enqueue a 'wait' operation onto each queue.
@@ -2149,7 +2198,7 @@ shaka.media.MediaSourceEngine = class {
   /**
    * Resets the MediaSource and re-adds source buffers due to codec mismatch
    *
-   * @param {!Map.<shaka.util.ManifestParserUtils.ContentType,
+   * @param {!Map<shaka.util.ManifestParserUtils.ContentType,
    *               shaka.extern.Stream>} streamsByType
    * @private
    */
@@ -2257,7 +2306,7 @@ shaka.media.MediaSourceEngine = class {
 
   /**
    * Resets the Media Source
-   * @param {!Map.<shaka.util.ManifestParserUtils.ContentType,
+   * @param {!Map<shaka.util.ManifestParserUtils.ContentType,
    *               shaka.extern.Stream>} streamsByType
    * @return {!Promise}
    */
@@ -2333,9 +2382,9 @@ shaka.media.MediaSourceEngine = class {
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
    * @param {string} mimeType
    * @param {string} codecs
-   * @param {!Map.<shaka.util.ManifestParserUtils.ContentType,
+   * @param {!Map<shaka.util.ManifestParserUtils.ContentType,
    *               shaka.extern.Stream>} streamsByType
-   * @return {!Promise.<boolean>} true if there was a codec switch,
+   * @return {!Promise<boolean>} true if there was a codec switch,
    *                              false otherwise.
    * @private
    */

package/lib/media/mp4_segment_index_parser.js

@@ -20,13 +20,13 @@ shaka.media.Mp4SegmentIndexParser = class {
    * @param {BufferSource} sidxData The MP4's container's SIDX.
    * @param {number} sidxOffset The SIDX's offset, in bytes, from the start of
    *   the MP4 container.
-   * @param {!Array.<string>} uris The possible locations of the MP4 file that
+   * @param {!Array<string>} uris The possible locations of the MP4 file that
    *   contains the segments.
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {number} timestampOffset
    * @param {number} appendWindowStart
    * @param {number} appendWindowEnd
-   * @return {!Array.<!shaka.media.SegmentReference>}
+   * @return {!Array<!shaka.media.SegmentReference>}
    */
   static parse(
       sidxData, sidxOffset, uris, initSegmentReference, timestampOffset,
@@ -71,10 +71,10 @@ shaka.media.Mp4SegmentIndexParser = class {
    * @param {number} timestampOffset
    * @param {number} appendWindowStart
    * @param {number} appendWindowEnd
-   * @param {!Array.<string>} uris The possible locations of the MP4 file that
+   * @param {!Array<string>} uris The possible locations of the MP4 file that
    *   contains the segments.
    * @param {!shaka.extern.ParsedBox} box
-   * @return {!Array.<!shaka.media.SegmentReference>}
+   * @return {!Array<!shaka.media.SegmentReference>}
    * @private
    */
   static parseSIDX_(
@@ -136,7 +136,7 @@ shaka.media.Mp4SegmentIndexParser = class {
       // If |referenceType| is 1 then the reference is to another SIDX.
       // We do not support this.
       if (referenceType == 1) {
-        shaka.log.error('Heirarchical SIDXs are not supported.');
+        shaka.log.error('Hierarchical SIDXs are not supported.');
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,

package/lib/media/playhead.js

@@ -231,9 +231,6 @@ shaka.media.MediaSourcePlayhead = class {
     /** @private {shaka.media.PresentationTimeline} */
     this.timeline_ = manifest.presentationTimeline;
 
-    /** @private {number} */
-    this.minBufferTime_ = manifest.minBufferTime || 0;
-
     /** @private {?shaka.extern.StreamingConfiguration} */
     this.config_ = config;
 
@@ -476,16 +473,13 @@ shaka.media.MediaSourcePlayhead = class {
   reposition_(currentTime) {
     goog.asserts.assert(
         this.config_,
-        'Cannot reposition playhead when it has beeen destroyed');
+        'Cannot reposition playhead when it has been destroyed');
 
     /** @type {function(number)} */
     const isBuffered = (playheadTime) => shaka.media.TimeRangesUtils.isBuffered(
         this.mediaElement_.buffered, playheadTime);
 
-    const rebufferingGoal = Math.max(
-        this.minBufferTime_,
-        this.config_.rebufferingGoal);
-
+    const rebufferingGoal = this.config_.rebufferingGoal;
     const safeSeekOffset = this.config_.safeSeekOffset;
 
     let start = this.timeline_.getSeekRangeStart();

package/lib/media/playhead_observer.js

@@ -52,7 +52,7 @@ shaka.media.PlayheadObserverManager = class {
      * We are using a set to ensure that we don't double update an observer if
      * it is accidentally added twice.
      *
-     * @private {!Set.<shaka.media.IPlayheadObserver>}
+     * @private {!Set<shaka.media.IPlayheadObserver>}
      */
     this.observers_ = new Set();