shaka-player 4.12.8 → 4.13.0

package/lib/media/segment_index.js

@@ -20,12 +20,12 @@ goog.require('shaka.util.Timer');
  *
  * @implements {shaka.extern.SegmentIndex}
  * @implements {shaka.util.IReleasable}
- * @implements {Iterable.<!shaka.media.SegmentReference>}
+ * @implements {Iterable<!shaka.media.SegmentReference>}
  * @export
  */
 shaka.media.SegmentIndex = class {
   /**
-   * @param {!Array.<!shaka.media.SegmentReference>} references The list of
+   * @param {!Array<!shaka.media.SegmentReference>} references The list of
    *   SegmentReferences, which must be sorted first by their start times
    *   (ascending) and second by their end times (ascending).
    */
@@ -34,7 +34,7 @@ shaka.media.SegmentIndex = class {
       shaka.media.SegmentIndex.assertCorrectReferences_(references);
     }
 
-    /** @protected {!Array.<!shaka.media.SegmentReference>} */
+    /** @protected {!Array<!shaka.media.SegmentReference>} */
     this.references = references;
 
     /** @private {shaka.util.Timer} */
@@ -213,7 +213,7 @@ shaka.media.SegmentIndex = class {
    * all available references, so we must keep available references in memory to
    * fill the availability window.
    *
-   * @param {!Array.<!shaka.media.SegmentReference>} references The list of
+   * @param {!Array<!shaka.media.SegmentReference>} references The list of
    *   SegmentReferences, which must be sorted first by their start times
    *   (ascending) and second by their end times (ascending).
    */
@@ -254,7 +254,7 @@ shaka.media.SegmentIndex = class {
    * all available references, so we must keep available references in memory to
    * fill the availability window.
    *
-   * @param {!Array.<!shaka.media.SegmentReference>} references The list of
+   * @param {!Array<!shaka.media.SegmentReference>} references The list of
    *   SegmentReferences, which must be sorted first by their start times
    *   (ascending) and second by their end times (ascending).
    * @param {number} windowStart The start of the availability window to filter
@@ -389,7 +389,7 @@ shaka.media.SegmentIndex = class {
    * returned by the callback is null.
    *
    * @param {number} interval The interval in seconds.
-   * @param {function():Array.<shaka.media.SegmentReference>} updateCallback
+   * @param {function(): Array<shaka.media.SegmentReference>} updateCallback
    * @export
    */
   updateEvery(interval, updateCallback) {
@@ -435,12 +435,12 @@ shaka.media.SegmentIndex = class {
    * Playlist will contain at least one independent frame."
    *
    * @param {number} time
-   * @param {boolean=} allowNonIndepedent
+   * @param {boolean=} allowNonIndependent
    * @param {boolean=} reverse
    * @return {?shaka.media.SegmentIterator}
    * @export
    */
-  getIteratorForTime(time, allowNonIndepedent = false, reverse = false) {
+  getIteratorForTime(time, allowNonIndependent = false, reverse = false) {
     let index = this.find(time);
     if (index == null) {
       return null;
@@ -463,7 +463,7 @@ shaka.media.SegmentIndex = class {
         let r = ref.partialReferences[i];
         // Note that a segment ends immediately before the end time.
         if ((time >= r.startTime) && (time < r.endTime)) {
-          if (!allowNonIndepedent) {
+          if (!allowNonIndependent) {
             // Find an independent partial segment by moving backwards.
             while (i && (!r.isIndependent())) {
               i--;
@@ -503,7 +503,7 @@ shaka.media.SegmentIndex = class {
    *
    * @param {number} startTime
    * @param {number} duration
-   * @param {!Array.<string>} uris
+   * @param {!Array<string>} uris
    * @return {!shaka.media.SegmentIndex}
    * @export
    */
@@ -527,7 +527,7 @@ if (goog.DEBUG) {
   /**
    * Asserts that the given SegmentReferences are sorted.
    *
-   * @param {!Array.<shaka.media.SegmentReference>} references
+   * @param {!Array<shaka.media.SegmentReference>} references
    * @private
    */
   shaka.media.SegmentIndex.assertCorrectReferences_ = (references) => {
@@ -555,7 +555,7 @@ if (goog.DEBUG) {
 /**
  * An iterator over a SegmentIndex's references.
  *
- * @implements {Iterator.<shaka.media.SegmentReference>}
+ * @implements {Iterator<shaka.media.SegmentReference>}
  * @export
  */
 shaka.media.SegmentIterator = class {
@@ -708,7 +708,7 @@ shaka.media.SegmentIterator = class {
  *
  * @extends shaka.media.SegmentIndex
  * @implements {shaka.util.IReleasable}
- * @implements {Iterable.<!shaka.media.SegmentReference>}
+ * @implements {Iterable<!shaka.media.SegmentReference>}
  * @export
  */
 shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
@@ -716,7 +716,7 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
   constructor() {
     super([]);
 
-    /** @private {!Array.<!shaka.media.SegmentIndex>} */
+    /** @private {!Array<!shaka.media.SegmentIndex>} */
     this.indexes_ = [];
   }
 

package/lib/media/segment_prefetch.js

@@ -40,15 +40,15 @@ shaka.media.SegmentPrefetch = class {
     this.fetchDispatcher_ = fetchDispatcher;
 
     /**
-     * @private {!Map.<
-     *        !(shaka.media.SegmentReference),
+     * @private {!Map<
+     *        !shaka.media.SegmentReference,
      *        !shaka.media.SegmentPrefetchOperation>}
      */
     this.segmentPrefetchMap_ = new Map();
 
     /**
-     * @private {!Map.<
-     *        !(shaka.media.InitSegmentReference),
+     * @private {!Map<
+     *        !shaka.media.InitSegmentReference,
      *        !shaka.media.SegmentPrefetchOperation>}
      */
     this.initSegmentPrefetchMap_ = new Map();
@@ -89,7 +89,7 @@ shaka.media.SegmentPrefetch = class {
     }
     if (!this.iterator_) {
       this.iterator_ = this.stream_.segmentIndex.getIteratorForTime(
-          currTime, /* allowNonIndepedent= */ true, this.reverse_);
+          currTime, /* allowNonIndependent= */ true, this.reverse_);
     }
     if (!this.iterator_) {
       shaka.log.debug(logPrefix, 'missing iterator');
@@ -104,7 +104,7 @@ shaka.media.SegmentPrefetch = class {
       if (!reference) {
         break;
       }
-      // By default doesn't prefech preload partial segments when using
+      // By default doesn't prefetch preload partial segments when using
       // byterange
       let prefetchAllowed = true;
       if (reference.isPreload() && reference.endByte != null) {
@@ -173,8 +173,8 @@ shaka.media.SegmentPrefetch = class {
 
   /**
    * Get the result of prefetched segment if already exists.
-   * @param {!(shaka.media.SegmentReference|shaka.media.InitSegmentReference)}
-   *        reference
+   * @param {!(shaka.media.SegmentReference|
+   *           shaka.media.InitSegmentReference)} reference
    * @param {?function(BufferSource):!Promise=} streamDataCallback
    * @return {?shaka.net.NetworkingEngine.PendingRequest} op
    * @public
@@ -225,6 +225,9 @@ shaka.media.SegmentPrefetch = class {
 
   /**
    * Clear All Helper
+   * @param {!Map<T,
+   *        !shaka.media.SegmentPrefetchOperation>} map
+   * @template T SegmentReference or InitSegmentReference
    * @private
    */
   clearMap_(map) {
@@ -355,8 +358,8 @@ shaka.media.SegmentPrefetch = class {
 
   /**
    * Remove a segment from prefetch map and abort it.
-   * @param {!(shaka.media.SegmentReference|shaka.media.InitSegmentReference)}
-   *        reference
+   * @param {!(shaka.media.SegmentReference|
+   *           shaka.media.InitSegmentReference)} reference
    * @private
    */
   abortPrefetchedSegment_(reference) {
@@ -384,6 +387,7 @@ shaka.media.SegmentPrefetch = class {
 
   /**
    * The prefix of the logs that are created in this class.
+   * @param {shaka.extern.Stream} stream
    * @return {string}
    * @private
    */
@@ -419,10 +423,10 @@ shaka.media.SegmentPrefetchOperation = class {
   }
 
   /**
-   * Fetch a segments
+   * Fetch segments
    *
-   * @param {!(shaka.media.SegmentReference|shaka.media.InitSegmentReference)}
-   *        reference
+   * @param {!(shaka.media.SegmentReference|
+   *           shaka.media.InitSegmentReference)} reference
    * @param {!shaka.extern.Stream} stream
    * @return {!Promise}
    * @public

package/lib/media/segment_reference.js

@@ -21,7 +21,7 @@ goog.require('shaka.util.BufferUtils');
  */
 shaka.media.InitSegmentReference = class {
   /**
-   * @param {function():!Array.<string>} uris A function that creates the URIs
+   * @param {function(): !Array<string>} uris A function that creates the URIs
    *   of the resource containing the segment.
    * @param {number} startByte The offset from the start of the resource to the
    *   start of the segment.
@@ -37,7 +37,7 @@ shaka.media.InitSegmentReference = class {
    */
   constructor(uris, startByte, endByte, mediaQuality = null, timescale = null,
       segmentData = null, aesKey = null) {
-    /** @type {function():!Array.<string>} */
+    /** @type {function(): !Array<string>} */
     this.getUris = uris;
 
     /** @const {number} */
@@ -158,7 +158,7 @@ shaka.media.SegmentReference = class {
    * @param {number} endTime The segment's end time in seconds.  The segment
    *   ends the instant before this time, so |endTime| must be strictly greater
    *   than |startTime|.
-   * @param {function():!Array.<string>} uris
+   * @param {function(): !Array<string>} uris
    *   A function that creates the URIs of the resource containing the segment.
    * @param {number} startByte The offset from the start of the resource to the
    *   start of the segment.
@@ -189,7 +189,7 @@ shaka.media.SegmentReference = class {
    *   The end of the append window for this reference, relative to the
    *   presentation.  Any content from after this time will be removed by
    *   MediaSource.
-   * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
+   * @param {!Array<!shaka.media.SegmentReference>=} partialReferences
    *   A list of SegmentReferences for the partial segments.
    * @param {?string=} tilesLayout
    *   The value is a grid-item-dimension consisting of two positive decimal
@@ -237,7 +237,7 @@ shaka.media.SegmentReference = class {
      */
     this.trueEndTime = endTime;
 
-    /** @type {function():!Array.<string>} */
+    /** @type {function(): !Array<string>} */
     this.getUrisInner = uris;
 
     /** @const {number} */
@@ -258,7 +258,7 @@ shaka.media.SegmentReference = class {
     /** @type {number} */
     this.appendWindowEnd = appendWindowEnd;
 
-    /** @type {!Array.<!shaka.media.SegmentReference>} */
+    /** @type {!Array<!shaka.media.SegmentReference>} */
     this.partialReferences = partialReferences;
 
     /** @type {?string} */
@@ -331,7 +331,7 @@ shaka.media.SegmentReference = class {
   /**
    * Creates and returns the URIs of the resource containing the segment.
    *
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    * @export
    */
   getUris() {

package/lib/media/segment_utils.js

@@ -463,8 +463,8 @@ shaka.media.SegmentUtils = class {
   }
 
   /**
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
+   * @param {!Array<string>} codecs
+   * @return {!Array<string>} codecs
    */
   static codecsFiltering(codecs) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
@@ -487,8 +487,8 @@ shaka.media.SegmentUtils = class {
   }
 
   /**
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
+   * @param {!Array<string>} codecs
+   * @return {!Array<string>} codecs
    * @private
    */
   static filterDuplicateCodecs_(codecs) {
@@ -511,8 +511,8 @@ shaka.media.SegmentUtils = class {
    * Prioritizes Dolby Vision if supported. This is necessary because with
    * Dolby Vision we could have hvcC and dvcC boxes at the same time.
    *
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
+   * @param {!Array<string>} codecs
+   * @return {!Array<string>} codecs
    * @private
    */
   static chooseBetterCodecs_(codecs) {
@@ -570,7 +570,7 @@ shaka.media.SegmentUtils = class {
    * @param {!BufferSource} rawResult
    * @param {shaka.extern.aesKey} aesKey
    * @param {number} position
-   * @return {!Promise.<!BufferSource>}
+   * @return {!Promise<!BufferSource>}
    */
   static async aesDecrypt(rawResult, aesKey, position) {
     const key = aesKey;
@@ -619,7 +619,7 @@ shaka.media.SegmentUtils = class {
  *   width: ?string,
  *   channelCount: ?number,
  *   sampleRate: ?number,
- *   closedCaptions: Map.<string, string>,
+ *   closedCaptions: Map<string, string>,
  *   videoRange: ?string,
  *   colorGamut: ?string,
  *   frameRate: ?string
@@ -633,7 +633,7 @@ shaka.media.SegmentUtils = class {
  * @property {?string} width
  * @property {?number} channelCount
  * @property {?number} sampleRate
- * @property {Map.<string, string>} closedCaptions
+ * @property {Map<string, string>} closedCaptions
  * @property {?string} videoRange
  * @property {?string} colorGamut
  * @property {?string} frameRate

package/lib/media/streaming_engine.js

@@ -12,6 +12,7 @@ goog.provide('shaka.media.StreamingEngine');
 
 goog.require('goog.asserts');
 goog.require('shaka.log');
+goog.require('shaka.media.Capabilities');
 goog.require('shaka.media.InitSegmentReference');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.MediaSourceEngine');
@@ -33,6 +34,7 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4BoxParsers');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Networking');
+goog.require('shaka.util.Timer');
 
 
 /**
@@ -76,7 +78,7 @@ shaka.media.StreamingEngine = class {
     /**
      * Retains a reference to the function used to close SegmentIndex objects
      * for streams which were switched away from during an ongoing update_().
-     * @private {!Map.<string, !function()>}
+     * @private {!Map<string, !function()>}
      */
     this.deferredCloseSegmentIndex_ = new Map();
 
@@ -95,7 +97,7 @@ shaka.media.StreamingEngine = class {
     /**
      * Maps a content type, e.g., 'audio', 'video', or 'text', to a MediaState.
      *
-     * @private {!Map.<shaka.util.ManifestParserUtils.ContentType,
+     * @private {!Map<shaka.util.ManifestParserUtils.ContentType,
      *                 !shaka.media.StreamingEngine.MediaState_>}
      */
     this.mediaStates_ = new Map();
@@ -147,6 +149,30 @@ shaka.media.StreamingEngine = class {
 
     /** @private {?shaka.media.StreamingEngine.MediaState_} */
     this.lastTextMediaStateBeforeUnload_ = null;
+
+    /** @private {?shaka.util.Timer} */
+    this.updateLiveSeekableRangeTime_ = new shaka.util.Timer(() => {
+      if (!this.manifest_ || !this.playerInterface_) {
+        return;
+      }
+      if (!this.manifest_.presentationTimeline.isLive()) {
+        this.playerInterface_.mediaSourceEngine.clearLiveSeekableRange();
+        if (this.updateLiveSeekableRangeTime_) {
+          this.updateLiveSeekableRangeTime_.stop();
+        }
+        return;
+      }
+      const startTime = this.manifest_.presentationTimeline.getSeekRangeStart();
+      const endTime = this.manifest_.presentationTimeline.getSeekRangeEnd();
+      // Some older devices require the range to be greater than 1 or exceptions
+      // are thrown, due to an old and buggy implementation.
+      if (endTime - startTime > 1) {
+        this.playerInterface_.mediaSourceEngine.setLiveSeekableRange(
+            startTime, endTime);
+      } else {
+        this.playerInterface_.mediaSourceEngine.clearLiveSeekableRange();
+      }
+    });
   }
 
   /** @override */
@@ -181,6 +207,10 @@ shaka.media.StreamingEngine = class {
     this.playerInterface_ = null;
     this.manifest_ = null;
     this.config_ = null;
+    if (this.updateLiveSeekableRangeTime_) {
+      this.updateLiveSeekableRangeTime_.stop();
+    }
+    this.updateLiveSeekableRangeTime_ = null;
   }
 
   /**
@@ -291,7 +321,7 @@ shaka.media.StreamingEngine = class {
    * chosen by a prior call to switchTextStream().  Once the Promise resolves,
    * switch*() may be called freely.
    *
-   * @param {!Map.<number, shaka.media.SegmentPrefetch>=} segmentPrefetchById
+   * @param {!Map<number, shaka.media.SegmentPrefetch>=} segmentPrefetchById
    *   If provided, segments prefetched for these streams will be used as needed
    *   during playback.
    * @return {!Promise}
@@ -779,9 +809,7 @@ shaka.media.StreamingEngine = class {
     // If the new segment can be finished in time without risking a buffer
     // underflow, we should abort the old one and switch.
     const bufferedAhead = (bufferEnd || 0) - presentationTime;
-    const safetyBuffer = Math.max(
-        this.manifest_.minBufferTime || 0,
-        this.config_.rebufferingGoal);
+    const safetyBuffer = this.config_.rebufferingGoal;
     const safeBufferedAhead = bufferedAhead - safetyBuffer;
     if (timeToFetchNewSegment < safeBufferedAhead) {
       return true;
@@ -933,7 +961,7 @@ shaka.media.StreamingEngine = class {
    * Initializes the initial streams and media states.  This will schedule
    * updates for the given types.
    *
-   * @param {!Map.<number, shaka.media.SegmentPrefetch>} segmentPrefetchById
+   * @param {!Map<number, shaka.media.SegmentPrefetch>} segmentPrefetchById
    * @return {!Promise}
    * @private
    */
@@ -952,11 +980,11 @@ shaka.media.StreamingEngine = class {
     }
 
     /**
-     * @type {!Map.<shaka.util.ManifestParserUtils.ContentType,
+     * @type {!Map<shaka.util.ManifestParserUtils.ContentType,
      *              shaka.extern.Stream>}
      */
     const streamsByType = new Map();
-    /** @type {!Set.<shaka.extern.Stream>} */
+    /** @type {!Set<shaka.extern.Stream>} */
     const streams = new Set();
 
     if (this.currentVariant_.audio) {
@@ -1166,17 +1194,30 @@ shaka.media.StreamingEngine = class {
    * Sets the MediaSource's duration.
    */
   updateDuration() {
+    const isInfiniteLiveStreamDurationSupported =
+        shaka.media.Capabilities.isInfiniteLiveStreamDurationSupported();
     const duration = this.manifest_.presentationTimeline.getDuration();
     if (duration < Infinity) {
+      if (isInfiniteLiveStreamDurationSupported) {
+        if (this.updateLiveSeekableRangeTime_) {
+          this.updateLiveSeekableRangeTime_.stop();
+        }
+        this.playerInterface_.mediaSourceEngine.clearLiveSeekableRange();
+      }
       this.playerInterface_.mediaSourceEngine.setDuration(duration);
     } else {
-      // To set the media source live duration as Infinity
-      // If infiniteLiveStreamDuration as true
-      const duration =
-      this.config_.infiniteLiveStreamDuration ? Infinity : Math.pow(2, 32);
-      // Not all platforms support infinite durations, so set a finite duration
-      // so we can append segments and so the user agent can seek.
-      this.playerInterface_.mediaSourceEngine.setDuration(duration);
+      // Set the media source live duration as Infinity if the platform supports
+      // it.
+      if (isInfiniteLiveStreamDurationSupported) {
+        if (this.updateLiveSeekableRangeTime_) {
+          this.updateLiveSeekableRangeTime_.tickEvery(/* seconds= */ 0.5);
+        }
+        this.playerInterface_.mediaSourceEngine.setDuration(Infinity);
+      } else {
+        // Not all platforms support infinite durations, so set a finite
+        // duration so we can append segments and so the user agent can seek.
+        this.playerInterface_.mediaSourceEngine.setDuration(Math.pow(2, 32));
+      }
     }
   }
 
@@ -1246,7 +1287,7 @@ shaka.media.StreamingEngine = class {
         // Releases the segmentIndex of the old stream.
         if (thisStream.closeSegmentIndex) {
           goog.asserts.assert(!mediaState.stream.segmentIndex,
-              'mediastate.stream should not have segmentIndex yet.');
+              'mediaState.stream should not have segmentIndex yet.');
           thisStream.closeSegmentIndex();
         }
         if (!mediaState.performingUpdate && !mediaState.updateTimer) {
@@ -1311,7 +1352,7 @@ shaka.media.StreamingEngine = class {
 
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
-    // Do not schedule update for closed captions text mediastate, since closed
+    // Do not schedule update for closed captions text mediaState, since closed
     // captions are embedded in video streams.
     if (shaka.media.StreamingEngine.isEmbeddedText_(mediaState)) {
       this.playerInterface_.mediaSourceEngine.setSelectedClosedCaptionId(
@@ -1366,9 +1407,7 @@ shaka.media.StreamingEngine = class {
         'bufferedAhead=' + bufferedAhead);
 
     const unscaledBufferingGoal = Math.max(
-        this.manifest_.minBufferTime || 0,
-        this.config_.rebufferingGoal,
-        this.config_.bufferingGoal);
+        this.config_.rebufferingGoal, this.config_.bufferingGoal);
 
     const scaledBufferingGoal = Math.max(1,
         unscaledBufferingGoal * this.bufferingScale_);
@@ -1536,7 +1575,7 @@ shaka.media.StreamingEngine = class {
       if (mediaState.stream.segmentIndex) {
         mediaState.segmentIterator =
             mediaState.stream.segmentIndex.getIteratorForTime(
-                time, /* allowNonIndepedent= */ false, reverse);
+                time, /* allowNonIndependent= */ false, reverse);
       }
       const ref = mediaState.segmentIterator &&
           mediaState.segmentIterator.next().value;
@@ -1564,7 +1603,7 @@ shaka.media.StreamingEngine = class {
         if (mediaState.stream.segmentIndex) {
           mediaState.segmentIterator =
               mediaState.stream.segmentIndex.getIteratorForTime(
-                  lookupTime, /* allowNonIndepedent= */ false, reverse);
+                  lookupTime, /* allowNonIndependent= */ false, reverse);
         }
         ref = mediaState.segmentIterator &&
             mediaState.segmentIterator.next().value;
@@ -1575,7 +1614,7 @@ shaka.media.StreamingEngine = class {
         if (mediaState.stream.segmentIndex) {
           mediaState.segmentIterator =
               mediaState.stream.segmentIndex.getIteratorForTime(
-                  presentationTime, /* allowNonIndepedent= */ false, reverse);
+                  presentationTime, /* allowNonIndependent= */ false, reverse);
         }
         ref = mediaState.segmentIterator &&
             mediaState.segmentIterator.next().value;
@@ -1976,7 +2015,7 @@ shaka.media.StreamingEngine = class {
     const logPrefix = StreamingEngine.logPrefix_(mediaState);
     const nullLastReferences = mediaState.lastSegmentReference == null;
 
-    /** @type {!Array.<!Promise>} */
+    /** @type {!Array<!Promise>} */
     const operations = [];
 
     // Rounding issues can cause us to remove the first frame of a Period, so
@@ -2148,7 +2187,7 @@ shaka.media.StreamingEngine = class {
           const bufferEnd =
             this.playerInterface_.mediaSourceEngine.bufferEnd(mediaState.type);
           if (bufferEnd != null) {
-            // Adjust init segment appendance time if we have something in
+            // Adjust init segment append time if we have something in
             // a buffer, i.e. due to running switchVariant() with non zero
             // safe margin value.
             initSegmentTime = bufferEnd;
@@ -2190,7 +2229,7 @@ shaka.media.StreamingEngine = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     /**
-     * @type {!Map.<shaka.util.ManifestParserUtils.ContentType,
+     * @type {!Map<shaka.util.ManifestParserUtils.ContentType,
      *              shaka.extern.Stream>}
      */
     const streamsByType = new Map();
@@ -2425,11 +2464,11 @@ shaka.media.StreamingEngine = class {
    * Fetches the given segment.
    *
    * @param {!shaka.media.StreamingEngine.MediaState_} mediaState
-   * @param {(!shaka.media.InitSegmentReference|!shaka.media.SegmentReference)}
-   *   reference
+   * @param {(!shaka.media.InitSegmentReference|
+   *          !shaka.media.SegmentReference)} reference
    * @param {?function(BufferSource):!Promise=} streamDataCallback
    *
-   * @return {!Promise.<BufferSource>}
+   * @return {!Promise<BufferSource>}
    * @private
    */
   async fetch_(mediaState, reference, streamDataCallback) {
@@ -2466,9 +2505,9 @@ shaka.media.StreamingEngine = class {
   /**
    * Fetches the given segment.
    *
+   * @param {(!shaka.media.InitSegmentReference|
+   *          !shaka.media.SegmentReference)} reference
    * @param {!shaka.extern.Stream} stream
-   * @param {(!shaka.media.InitSegmentReference|!shaka.media.SegmentReference)}
-   *   reference
    * @param {?function(BufferSource):!Promise=} streamDataCallback
    * @param {boolean=} isPreload
    *
@@ -2486,9 +2525,9 @@ shaka.media.StreamingEngine = class {
   /**
    * Fetches the given segment.
    *
+   * @param {(!shaka.media.InitSegmentReference|
+   *          !shaka.media.SegmentReference)} reference
    * @param {!shaka.extern.Stream} stream
-   * @param {(!shaka.media.InitSegmentReference|!shaka.media.SegmentReference)}
-   *   reference
    * @param {?function(BufferSource):!Promise} streamDataCallback
    * @param {shaka.extern.RetryParameters} retryParameters
    * @param {!shaka.net.NetworkingEngine} netEngine
@@ -2717,7 +2756,7 @@ shaka.media.StreamingEngine = class {
    * Reset Media Source
    *
    * @param {boolean=} force
-   * @return {!Promise.<boolean>}
+   * @return {!Promise<boolean>}
    */
   async resetMediaSource(force = false, clearBuffer = true) {
     const now = (Date.now() / 1000);
@@ -2757,7 +2796,7 @@ shaka.media.StreamingEngine = class {
       }
     }
     /**
-     * @type {!Map.<shaka.util.ManifestParserUtils.ContentType,
+     * @type {!Map<shaka.util.ManifestParserUtils.ContentType,
      *              shaka.extern.Stream>}
      */
     const streamsByType = new Map();
@@ -2873,8 +2912,8 @@ shaka.media.StreamingEngine = class {
  * @property {function(!shaka.media.SegmentReference,
  *     !shaka.extern.Stream)} onSegmentAppended
  *   Called after a segment is successfully appended to a MediaSource.
- * @property
- *  {function(!number, !shaka.media.InitSegmentReference)} onInitSegmentAppended
+ * @property {function(!number,
+ *                     !shaka.media.InitSegmentReference)} onInitSegmentAppended
  *   Called when an init segment is appended to a MediaSource.
  * @property {!function(shaka.util.ManifestParserUtils.ContentType,
  *   !BufferSource):Promise} beforeAppendSegment

package/lib/media/time_ranges_utils.js

@@ -151,7 +151,7 @@ shaka.media.TimeRangesUtils = class {
 
   /**
    * @param {TimeRanges} b
-   * @return {!Array.<shaka.extern.BufferedRange>}
+   * @return {!Array<shaka.extern.BufferedRange>}
    */
   static getBufferedInfo(b) {
     if (!b) {

package/lib/media/video_wrapper.js

@@ -28,7 +28,7 @@ shaka.media.VideoWrapper = class {
    * @param {!HTMLMediaElement} video
    * @param {function()} onSeek Called when the video seeks.
    * @param {function(number)} onStarted Called when the video has started.
-   * @param {function():number} getStartTime Calle to get the time to start at.
+   * @param {function():number} getStartTime Called to get the time to start at.
    */
   constructor(video, onSeek, onStarted, getStartTime) {
     /** @private {HTMLMediaElement} */

package/lib/media/webm_segment_index_parser.js

@@ -20,13 +20,13 @@ shaka.media.WebmSegmentIndexParser = class {
    * Parses SegmentReferences from a WebM container.
    * @param {BufferSource} cuesData The WebM container's "Cueing Data" section.
    * @param {BufferSource} initData The WebM container's headers.
-   * @param {!Array.<string>} uris The possible locations of the WebM file that
+   * @param {!Array<string>} uris The possible locations of the WebM 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>}
    * @see http://www.matroska.org/technical/specs/index.html
    * @see http://www.webmproject.org/docs/container/
    */
@@ -183,12 +183,12 @@ shaka.media.WebmSegmentIndexParser = class {
    * @param {number} segmentOffset
    * @param {number} timecodeScale
    * @param {number} duration
-   * @param {!Array.<string>} uris
+   * @param {!Array<string>} uris
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {number} timestampOffset
    * @param {number} appendWindowStart
    * @param {number} appendWindowEnd
-   * @return {!Array.<!shaka.media.SegmentReference>}
+   * @return {!Array<!shaka.media.SegmentReference>}
    * @private
    */
   static parseCues_(cuesElement, segmentOffset, timecodeScale, duration,