shaka-player 4.12.9 → 4.13.0

package/lib/player.js

@@ -9,10 +9,11 @@ goog.provide('shaka.Player');
 goog.require('goog.asserts');
 goog.require('shaka.config.AutoShowText');
 goog.require('shaka.Deprecate');
+goog.require('shaka.drm.DrmEngine');
+goog.require('shaka.drm.DrmUtils');
 goog.require('shaka.log');
 goog.require('shaka.media.AdaptationSetCriteria');
 goog.require('shaka.media.BufferingObserver');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.media.ExampleBasedCriteria');
 goog.require('shaka.media.ManifestFilterer');
 goog.require('shaka.media.ManifestParser');
@@ -22,7 +23,6 @@ goog.require('shaka.media.MetaSegmentIndex');
 goog.require('shaka.media.PlayRateController');
 goog.require('shaka.media.Playhead');
 goog.require('shaka.media.PlayheadObserverManager');
-goog.require('shaka.media.PreferenceBasedCriteria');
 goog.require('shaka.media.PreloadManager');
 goog.require('shaka.media.QualityObserver');
 goog.require('shaka.media.RegionObserver');
@@ -46,7 +46,6 @@ goog.require('shaka.util.CmcdManager');
 goog.require('shaka.util.CmsdManager');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.Dom');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
@@ -106,6 +105,17 @@ goog.requireType('shaka.media.PresentationTimeline');
  */
 
 
+/**
+ * @event shaka.Player.DownloadCompleted
+ * @description Fired when a download has completed.
+ * @property {string} type
+ *   'downloadcompleted'
+ * @property {!shaka.extern.Request} request
+ * @property {!shaka.extern.Response} response
+ * @exportDoc
+ */
+
+
 /**
  * @event shaka.Player.DownloadFailed
  * @description Fired when a download has failed, for any reason.
@@ -124,7 +134,7 @@ goog.requireType('shaka.media.PresentationTimeline');
  *   a download, but before the body has been downloaded.
  *   If the HTTP plugin being used does not track this information, this event
  *   will default to being fired when the body is received, instead.
- * @property {!Object.<string, string>} headers
+ * @property {!Object<string, string>} headers
  * @property {!shaka.extern.Request} request
  * @property {!shaka.net.NetworkingEngine.RequestType} type
  *   'downloadheadersreceived'
@@ -642,7 +652,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     /** @private {shaka.net.NetworkingEngine} */
     this.networkingEngine_ = null;
 
-    /** @private {shaka.media.DrmEngine} */
+    /** @private {shaka.drm.DrmEngine} */
     this.drmEngine_ = null;
 
     /** @private {shaka.media.MediaSourceEngine} */
@@ -749,7 +759,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
      */
     this.nextExternalStreamId_ = 1e9;
 
-    /** @private {!Array.<shaka.extern.Stream>} */
+    /** @private {!Array<shaka.extern.Stream>} */
     this.externalSrcEqualsThumbnailsStreams_ = [];
 
     /** @private {number} */
@@ -758,6 +768,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     /** @private {?shaka.extern.PlayerConfiguration} */
     this.config_ = this.defaultConfig_();
 
+    /** @private {!Object} */
+    this.lowLatencyConfig_ =
+        shaka.util.PlayerConfiguration.createDefaultForLL();
+
     /** @private {?number} */
     this.currentTargetLatency_ = null;
 
@@ -781,7 +795,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.manifestFilterer_ = new shaka.media.ManifestFilterer(
         this.config_, this.maxHwRes_, null);
 
-    /** @private {!Array.<shaka.media.PreloadManager>} */
+    /** @private {!Array<shaka.media.PreloadManager>} */
     this.createdPreloadManagers_ = [];
 
     /** @private {shaka.util.Stats} */
@@ -789,17 +803,20 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     /** @private {!shaka.media.AdaptationSetCriteria} */
     this.currentAdaptationSetCriteria_ =
-        new shaka.media.PreferenceBasedCriteria(
-            this.config_.preferredAudioLanguage,
-            this.config_.preferredVariantRole,
-            this.config_.preferredAudioChannelCount,
-            this.config_.preferredVideoHdrLevel,
-            this.config_.preferSpatialAudio,
-            this.config_.preferredVideoLayout,
-            this.config_.preferredAudioLabel,
-            this.config_.preferredVideoLabel,
-            this.config_.mediaSource.codecSwitchingStrategy,
-            /* audioCodec= */ '');
+        this.config_.adaptationSetCriteriaFactory();
+    this.currentAdaptationSetCriteria_.configure({
+      language: this.config_.preferredAudioLanguage,
+      role: this.config_.preferredVariantRole,
+      channelCount: this.config_.preferredAudioChannelCount,
+      hdrLevel: this.config_.preferredVideoHdrLevel,
+      spatialAudio: this.config_.preferSpatialAudio,
+      videoLayout: this.config_.preferredVideoLayout,
+      audioLabel: this.config_.preferredAudioLabel,
+      videoLabel: this.config_.preferredVideoLabel,
+      codecSwitchingStrategy:
+          this.config_.mediaSource.codecSwitchingStrategy,
+      audioCodec: '',
+    });
 
     /** @private {string} */
     this.currentTextLanguage_ = this.config_.preferredTextLanguage;
@@ -810,7 +827,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     /** @private {boolean} */
     this.currentTextForced_ = this.config_.preferForcedSubs;
 
-    /** @private {!Array.<function():(!Promise|undefined)>} */
+    /** @private {!Array<function(): (!Promise | undefined)>} */
     this.cleanupOnUnload_ = [];
 
     if (dependencyInjector) {
@@ -976,7 +993,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
   /**
    * @param {!shaka.util.FakeEvent.EventName} name
-   * @param {Map.<string, Object>=} data
+   * @param {Map<string, Object>=} data
    * @return {!shaka.util.FakeEvent}
    * @private
    */
@@ -1071,7 +1088,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
   /**
    * Set a factory to create an ad manager during player construction time.
-   * This method needs to be called bafore instantiating the Player class.
+   * This method needs to be called before instantiating the Player class.
    *
    * @param {!shaka.extern.IAdManager.Factory} factory
    * @export
@@ -1111,14 +1128,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return false;
     }
 
-    // DRM support is not strictly necessary, but the APIs at least need to be
-    // there.  Our no-op DRM polyfill should handle that.
-    // TODO(#1017): Consider making even DrmEngine optional.
-    const drmSupport = shaka.util.DrmUtils.isBrowserSupported();
-    if (!drmSupport) {
-      return false;
-    }
-
     // If we have MediaSource (MSE) support, we should be able to use Shaka.
     if (shaka.util.Platform.supportsMediaSource()) {
       return true;
@@ -1139,7 +1148,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @see https://bit.ly/2ywccmH
    * @param {boolean=} promptsOkay
-   * @return {!Promise.<shaka.extern.SupportType>}
+   * @return {!Promise<shaka.extern.SupportType>}
    * @export
    */
   static async probeSupport(promptsOkay=true) {
@@ -1147,7 +1156,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         'Must have basic support');
     let drm = {};
     if (promptsOkay) {
-      drm = await shaka.media.DrmEngine.probeSupport();
+      drm = await shaka.drm.DrmEngine.probeSupport();
     }
     const manifest = shaka.media.ManifestParser.probeSupport();
     const media = shaka.media.MediaSourceEngine.probeSupport();
@@ -1215,6 +1224,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         const onError = (error) => this.onVideoError_(error);
         this.attachEventManager_.listen(mediaElement, 'error', onError);
         this.video_ = mediaElement;
+        if (this.cmcdManager_) {
+          this.cmcdManager_.setMediaElement(mediaElement);
+        }
       }
 
       // Only initialize media source if the platform supports it.
@@ -1290,7 +1302,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Meant for operations that can't be interrupted midway through (e.g.
    * everything but load).
    * @param {string} mutexIdentifier
-   * @return {!Promise.<boolean>} endEarly If false, the calling context will
+   * @return {!Promise<boolean>} endEarly If false, the calling context will
    *   need to release the mutex.
    * @private
    */
@@ -1510,7 +1522,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // each playback.
       if (this.config_ && this.config_.streaming.clearDecodingCache) {
         shaka.util.StreamUtils.clearDecodingConfigCache();
-        shaka.util.DrmUtils.clearMediaKeySystemAccessMap();
+        shaka.drm.DrmUtils.clearMediaKeySystemAccessMap();
       }
 
       this.manifest_ = null;
@@ -1525,6 +1537,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       this.completionPercent_ = -1;
 
+      if (this.networkingEngine_) {
+        this.networkingEngine_.clearCommonAccessTokenMap();
+      }
+
       // Make sure that the app knows of the new buffering state.
       this.updateBufferState_();
     } finally {
@@ -1856,7 +1872,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {boolean=} initializeMediaSource
    * @param {boolean=} keepAdManager
-   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @return {!Promise<?shaka.media.PreloadManager>}
    * @export
    */
   async unloadAndSavePreload(
@@ -1876,7 +1892,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {boolean=} keepAdManager
    * @param {boolean=} saveLivePosition
-   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @return {!Promise<?shaka.media.PreloadManager>}
    * @export
    */
   async detachAndSavePreload(keepAdManager = false, saveLivePosition = false) {
@@ -1887,7 +1903,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
   /**
    * @param {boolean=} saveLivePosition
-   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @return {!Promise<?shaka.media.PreloadManager>}
    * @private
    */
   async savePreload_(saveLivePosition = false) {
@@ -1950,7 +1966,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *    <code>undefined</code>, playback will start at the default start time (0
    *    for VOD and liveEdge for LIVE).
    * @param {?string=} mimeType
-   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @return {!Promise<?shaka.media.PreloadManager>}
    * @export
    */
   async preload(assetUri, startTime = null, mimeType) {
@@ -1987,7 +2003,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {?number} startTime
    * @param {?string=} mimeType
    * @param {boolean=} standardLoad
-   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @return {!Promise<?shaka.media.PreloadManager>}
    * @private
    */
   async preloadInner_(assetUri, startTime, mimeType, standardLoad = false) {
@@ -2047,7 +2063,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {boolean=} allowPrefetch
    * @param {boolean=} disableVideo
    * @param {boolean=} allowMakeAbrManager
-   * @return {!Promise.<!shaka.media.PreloadManager>}
+   * @return {!Promise<!shaka.media.PreloadManager>}
    * @private
    */
   async makePreloadManager_(assetUri, startTime, mimeType,
@@ -2077,14 +2093,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
     };
 
-    const setConfig = (name, value) => {
-      if (getPreloadManager()) {
-        preloadManager.configure(name, value);
-      } else {
-        this.configure(name, value);
-      }
-    };
-
     // Avoid having to detect the resolution again if it has already been
     // detected or set
     if (this.maxHwRes_.width == Infinity &&
@@ -2124,10 +2132,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       onEvent: (event) => preloadManager.dispatchEvent(event),
       onError: (error) => preloadManager.onError(error),
       isLowLatencyMode: () => getConfig().streaming.lowLatencyMode,
-      isAutoLowLatencyMode: () => getConfig().streaming.autoLowLatencyMode,
-      enableLowLatencyMode: () => {
-        setConfig('streaming.lowLatencyMode', true);
-      },
       updateDuration: () => {
         if (this.streamingEngine_ && preloadManager.hasBeenAttached()) {
           this.streamingEngine_.updateDuration();
@@ -2270,7 +2274,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const networkingEngine = this.createNetworkingEngine(getPreloadManager);
     this.networkingEngine_.copyFiltersInto(networkingEngine);
 
-    /** @return {!shaka.media.DrmEngine} */
+    /** @return {!shaka.drm.DrmEngine} */
     const createDrmEngine = () => {
       return this.createDrmEngine(drmPlayerInterface);
     };
@@ -2296,7 +2300,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * the loading process.
    *
    * @param {string} assetUri
-   * @return {!Promise.<?string>} mimeType
+   * @return {!Promise<?string>} mimeType
    * @private
    */
   async guessMimeType_(assetUri) {
@@ -2360,7 +2364,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // example, Android has native HLS, but we'd prefer our own MediaSource
       // version there.
       if (MimeUtils.isHlsType(mimeType)) {
-        // Native FairPlay HLS can be preferred on Apple platfforms.
+        // Native FairPlay HLS can be preferred on Apple platforms.
         if (Platform.isApple() &&
             (this.config_.drm.servers['com.apple.fps'] ||
             this.config_.drm.servers['com.apple.fps.1_0'])) {
@@ -2371,6 +2375,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         return this.config_.streaming.preferNativeHls;
       }
 
+      if (MimeUtils.isDashType(mimeType)) {
+        // Native DASH can be preferred on any platform via this flag:
+        return this.config_.streaming.preferNativeDash;
+      }
+
       // In all other cases, we prefer MediaSource.
       return false;
     }
@@ -2504,7 +2513,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
               switch (track.kind) {
                 case 'metadata':
-                  this.processTimedMetadataSrcEqls_(track);
+                  this.processTimedMetadataSrcEquals_(track);
                   break;
 
                 case 'chapters':
@@ -2542,7 +2551,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {number} startTimeOfLoad
    * @param {?shaka.extern.Variant} prefetchedVariant
-   * @param {!Map.<number, shaka.media.SegmentPrefetch>} segmentPrefetchById
+   * @param {!Map<number, shaka.media.SegmentPrefetch>} segmentPrefetchById
    * @return {!Promise}
    * @private
    */
@@ -2633,16 +2642,21 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.parser_.onInitialVariantChosen(toLazyLoad);
     }
 
-    if (this.manifest_.isLowLatency && !this.config_.streaming.lowLatencyMode) {
-      shaka.log.alwaysWarn('Low-latency live stream detected, but ' +
-          'low-latency streaming mode is not enabled in Shaka Player. ' +
-          'Set streaming.lowLatencyMode configuration to true, and see ' +
-          'https://bit.ly/3clctcj for details.');
+    if (this.manifest_.isLowLatency) {
+      if (this.config_.streaming.lowLatencyMode) {
+        this.configure(this.lowLatencyConfig_);
+      } else {
+        shaka.log.alwaysWarn('Low-latency live stream detected, but ' +
+            'low-latency streaming mode is not enabled in Shaka Player. ' +
+            'Set streaming.lowLatencyMode configuration to true, and see ' +
+            'https://bit.ly/3clctcj for details.');
+      }
     }
 
     if (this.cmcdManager_) {
       this.cmcdManager_.setLowLatency(
           this.manifest_.isLowLatency && this.config_.streaming.lowLatencyMode);
+      this.cmcdManager_.setStartTimeOfLoad(startTimeOfLoad * 1000);
     }
 
     shaka.Player.applyPlayRange_(this.manifest_.presentationTimeline,
@@ -2657,13 +2671,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.playheadObservers_ =
           this.createPlayheadObserversForMSE_(startTime);
 
-      // We need to start the buffer management code near the end because it
-      // will set the initial buffering state and that depends on other
-      // components being initialized.
-      const rebufferThreshold = Math.max(
-          this.manifest_.minBufferTime,
-          this.config_.streaming.rebufferingGoal);
-      this.startBufferManagement_(mediaElement, rebufferThreshold);
+      this.startBufferManagement_(
+          mediaElement, this.config_.streaming.rebufferingGoal);
     };
 
     if (!this.config_.streaming.startAtSegmentBoundary) {
@@ -2677,7 +2686,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Now we can switch to the initial variant.
     if (!activeVariant) {
       goog.asserts.assert(initialVariant,
-          'Must have choosen an initial variant!');
+          'Must have chosen an initial variant!');
 
       // Now that we have initial streams, we may adjust the start time to
       // align to a segment boundary.
@@ -3241,7 +3250,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {!TextTrack} track
    * @private
    */
-  processTimedMetadataSrcEqls_(track) {
+  processTimedMetadataSrcEquals_(track) {
     if (track.kind != 'metadata') {
       return;
     }
@@ -3260,7 +3269,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
       }
       if (track.cues) {
-        /** @type {!Array.<shaka.extern.HLSInterstitial>} */
+        /** @type {!Array<shaka.extern.HLSInterstitial>} */
         const interstitials = [];
 
         for (const cue of track.cues) {
@@ -3322,7 +3331,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
 
   /**
-   * @param {!Array.<shaka.extern.ID3Metadata>} metadata
+   * @param {!Array<shaka.extern.ID3Metadata>} metadata
    * @param {number} offset
    * @param {?number} segmentEndTime
    * @private
@@ -3411,11 +3420,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * fake instances. Configuration and initialization will be handled after
    * |createDrmEngine|.
    *
-   * @param {shaka.media.DrmEngine.PlayerInterface} playerInterface
-   * @return {!shaka.media.DrmEngine}
+   * @param {shaka.drm.DrmEngine.PlayerInterface} playerInterface
+   * @return {!shaka.drm.DrmEngine}
    */
   createDrmEngine(playerInterface) {
-    return new shaka.media.DrmEngine(playerInterface);
+    return new shaka.drm.DrmEngine(playerInterface);
   }
 
   /**
@@ -3492,6 +3501,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
       });
     };
+    /** @type {shaka.net.NetworkingEngine.OnDownloadCompleted} */
+    const onDownloadCompleted_ = (request, response) => {
+      // Release a 'downloadcompleted' event.
+      const name = shaka.util.FakeEvent.EventName.DownloadCompleted;
+      const data = new Map()
+          .set('request', request)
+          .set('response', response);
+      dispatchEvent(shaka.Player.makeEvent_(name, data));
+    };
     /** @type {shaka.net.NetworkingEngine.OnDownloadFailed} */
     const onDownloadFailed_ = (request, error, httpResponseCode, aborted) => {
       // Release a 'downloadfailed' event.
@@ -3533,8 +3551,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     };
 
     return new shaka.net.NetworkingEngine(
-        onProgressUpdated_, onHeadersReceived_, onDownloadFailed_, onRequest_,
-        onRetry_, onResponse_);
+        onProgressUpdated_, onHeadersReceived_, onDownloadCompleted_,
+        onDownloadFailed_, onRequest_, onRetry_, onResponse_);
   }
 
   /**
@@ -3642,7 +3660,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     this.bufferPoller_ = new shaka.util.Timer(() => {
       this.pollBufferState_();
-    }).tickEvery(/* seconds= */ 0.25);
+    });
+    if (this.config_.streaming.rebufferingGoal) {
+      this.bufferPoller_.tickEvery(/* seconds= */ 0.25);
+    }
     this.loadEventManager_.listen(mediaElement, 'waiting',
         (e) => this.pollBufferState_());
     this.loadEventManager_.listen(mediaElement, 'stalled',
@@ -3651,6 +3672,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         (e) => this.pollBufferState_());
     this.loadEventManager_.listen(mediaElement, 'progress',
         (e) => this.pollBufferState_());
+    this.loadEventManager_.listen(mediaElement, 'seeked',
+        (e) => this.pollBufferState_());
   }
 
   /**
@@ -3750,6 +3773,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       getNetworkingEngine: () => this.getNetworkingEngine(),
       getVariantTracks: () => this.getVariantTracks(),
       isLive: () => this.isLive(),
+      getLiveLatency: () => this.getLiveLatency(),
     };
 
     return new shaka.util.CmcdManager(playerInterface, this.config_.cmcd);
@@ -4037,60 +4061,47 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       delete config['streaming']['dispatchAllEmsgBoxes'];
     }
 
-    // If lowLatencyMode is enabled, and inaccurateManifestTolerance and
-    // rebufferingGoal and segmentPrefetchLimit and baseDelay and
-    // autoCorrectDrift and maxDisabledTime are not specified, set
-    // inaccurateManifestTolerance to 0 and rebufferingGoal to 0.01 and
-    // segmentPrefetchLimit to 2 and updateIntervalSeconds to 0.1 and and
-    // baseDelay to 100 and autoCorrectDrift to false and maxDisabledTime
-    // to 1 by default for low latency streaming.
-    if (config['streaming'] && config['streaming']['lowLatencyMode']) {
-      if (config['streaming']['inaccurateManifestTolerance'] == undefined) {
-        config['streaming']['inaccurateManifestTolerance'] = 0;
-      }
-      if (config['streaming']['rebufferingGoal'] == undefined) {
-        config['streaming']['rebufferingGoal'] = 0.01;
-      }
-      if (config['streaming']['segmentPrefetchLimit'] == undefined) {
-        config['streaming']['segmentPrefetchLimit'] = 2;
-      }
-      if (config['streaming']['updateIntervalSeconds'] == undefined) {
-        config['streaming']['updateIntervalSeconds'] = 0.1;
-      }
-      if (config['streaming']['maxDisabledTime'] == undefined) {
-        config['streaming']['maxDisabledTime'] = 1;
-      }
-      if (config['streaming']['retryParameters'] == undefined) {
-        config['streaming']['retryParameters'] = {};
-      }
-      if (config['streaming']['retryParameters']['baseDelay'] == undefined) {
-        config['streaming']['retryParameters']['baseDelay'] = 100;
-      }
-      if (config['manifest'] == undefined) {
-        config['manifest'] = {};
-      }
-      if (config['manifest']['dash'] == undefined) {
-        config['manifest']['dash'] = {};
-      }
-      if (config['manifest']['dash']['autoCorrectDrift'] == undefined) {
-        config['manifest']['dash']['autoCorrectDrift'] = false;
-      }
-      if (config['manifest']['retryParameters'] == undefined) {
-        config['manifest']['retryParameters'] = {};
-      }
-      if (config['manifest']['retryParameters']['baseDelay'] == undefined) {
-        config['manifest']['retryParameters']['baseDelay'] = 100;
-      }
-      if (config['drm'] == undefined) {
-        config['drm'] = {};
-      }
-      if (config['drm']['retryParameters'] == undefined) {
-        config['drm']['retryParameters'] = {};
+    // Deprecate 'streaming.autoLowLatencyMode' configuration.
+    if (config['streaming'] && 'autoLowLatencyMode' in config['streaming']) {
+      shaka.Deprecate.deprecateFeature(5,
+          'streaming.autoLowLatencyMode configuration',
+          'Please Use streaming.lowLatencyMode instead.');
+      config['streaming']['lowLatencyMode'] =
+          config['streaming']['autoLowLatencyMode'];
+      delete config['streaming']['autoLowLatencyMode'];
+    }
+
+    // Deprecate AdvancedDrmConfiguration's videoRobustness and audioRobustness
+    // as a string. It's now an array of strings.
+    if (config['drm'] && config['drm']['advanced']) {
+      let fixedUp = false;
+      for (const keySystem in config['drm']['advanced']) {
+        const {videoRobustness, audioRobustness} =
+            config['drm']['advanced'][keySystem];
+        if ('videoRobustness' in config['drm']['advanced'][keySystem] &&
+            !Array.isArray(
+                config['drm']['advanced'][keySystem]['videoRobustness'])) {
+          config['drm']['advanced'][keySystem]['videoRobustness'] =
+              [videoRobustness];
+          fixedUp = true;
+        }
+        if ('audioRobustness' in config['drm']['advanced'][keySystem] &&
+            !Array.isArray(
+                config['drm']['advanced'][keySystem]['audioRobustness'])) {
+          config['drm']['advanced'][keySystem]['audioRobustness'] =
+              [audioRobustness];
+          fixedUp = true;
+        }
       }
-      if (config['drm']['retryParameters']['baseDelay'] == undefined) {
-        config['drm']['retryParameters']['baseDelay'] = 100;
+
+      if (fixedUp) {
+        shaka.Deprecate.deprecateFeature(5,
+            'AdvancedDrmConfiguration\'s videoRobustness and audioRobustness',
+            'These properties are no longer strings but array of strings, ' +
+            'please update your usage of these properties.');
       }
     }
+
     const ret = shaka.util.PlayerConfiguration.mergeConfigObjects(
         this.config_, config, this.defaultConfig_());
 
@@ -4098,6 +4109,18 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     return ret;
   }
 
+  /**
+   * Changes low latency configuration settings on the Player.
+   *
+   * @param {!Object} config This object should follow the
+   *    {@link shaka.extern.PlayerConfiguration} object.  Not all fields
+   *    need to be set; unset fields retain their old values.
+   * @export
+   */
+  configurationForLowLatency(config) {
+    this.lowLatencyConfig_ = config;
+  }
+
   /**
    * Apply config changes.
    * @private
@@ -4210,12 +4233,14 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.onAbrStatusChanged_();
     }
     if (this.bufferObserver_) {
-      let rebufferThreshold = this.config_.streaming.rebufferingGoal;
-      if (this.manifest_) {
-        rebufferThreshold =
-            Math.max(rebufferThreshold, this.manifest_.minBufferTime);
+      this.updateBufferingSettings_(this.config_.streaming.rebufferingGoal);
+    }
+    if (this.bufferPoller_) {
+      if (!this.config_.streaming.rebufferingGoal) {
+        this.bufferPoller_.stop();
+      } else {
+        this.bufferPoller_.tickEvery(/* seconds= */ 0.25);
       }
-      this.updateBufferingSettings_(rebufferThreshold);
     }
 
     if (this.manifest_) {
@@ -4251,6 +4276,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     return ret;
   }
 
+  /**
+   * Return a copy of the current configuration for low latency.
+   *
+   * @return {!Object}
+   * @export
+   */
+  getConfigurationForLowLatency() {
+    return this.lowLatencyConfig_;
+  }
+
   /**
    * Return a copy of the current non default configuration.  Modifications of
    * the returned value will not affect the Player's active configuration.
@@ -4561,7 +4596,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   keySystem() {
-    return shaka.util.DrmUtils.keySystem(this.drmInfo());
+    return shaka.drm.DrmUtils.keySystem(this.drmInfo());
   }
 
   /**
@@ -4582,7 +4617,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * This method should only be used for testing. Applications SHOULD NOT
    * use this in production.
    *
-   * @return {?shaka.media.DrmEngine}
+   * @return {?shaka.drm.DrmEngine}
    */
   getDrmEngine() {
     return this.drmEngine_;
@@ -4605,7 +4640,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Returns the active sessions metadata
    *
-   * @return {!Array.<shaka.extern.DrmSessionMetadata>}
+   * @return {!Array<shaka.extern.DrmSessionMetadata>}
    * @export
    */
   getActiveSessionsMetadata() {
@@ -4745,7 +4780,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * <p>
    * If the player has not loaded content, this will return an empty list.
    *
-   * @return {!Array.<shaka.extern.Track>}
+   * @return {!Array<shaka.extern.Track>}
    * @export
    */
   getVariantTracks() {
@@ -4801,7 +4836,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * <p>
    * If the player has not loaded content, this will return an empty list.
    *
-   * @return {!Array.<shaka.extern.Track>}
+   * @return {!Array<shaka.extern.Track>}
    * @export
    */
   getTextTracks() {
@@ -4833,7 +4868,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * If the player has not loaded content, this will return an empty list.
    *
-   * @return {!Array.<shaka.extern.Track>}
+   * @return {!Array<shaka.extern.Track>}
    * @export
    */
   getImageTracks() {
@@ -4851,7 +4886,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * If the player has not loaded content, this will return a null.
    *
    * @param {number} trackId
-   * @return {!Promise.<?Array<!shaka.extern.Thumbnail>>}
+   * @return {!Promise<?Array<!shaka.extern.Thumbnail>>}
    * @export
    */
   async getAllThumbnails(trackId) {
@@ -4922,7 +4957,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {number} trackId
    * @param {number} time
-   * @return {!Promise.<?shaka.extern.Thumbnail>}
+   * @return {!Promise<?shaka.extern.Thumbnail>}
    * @export
    */
   async getThumbnails(trackId, time) {
@@ -5155,8 +5190,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           active.audio.channelsCount == variant.audio.channelsCount))) {
         shaka.log.alwaysWarn('Changing tracks while abr manager is enabled ' +
                              'will likely result in the selected track ' +
-                             'being overriden. Consider disabling abr before ' +
-                             'calling selectVariantTrack().');
+                             'being overridden. Consider disabling abr ' +
+                             'before calling selectVariantTrack().');
       }
 
       if (this.isRemotePlayback()) {
@@ -5175,7 +5210,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // currentAudioLanguage_.
       this.currentAdaptationSetCriteria_ = new shaka.media.ExampleBasedCriteria(
           variant,
-          this.config_.mediaSource.codecSwitchingStrategy);
+          this.config_.mediaSource.codecSwitchingStrategy,
+          this.config_.adaptationSetCriteriaFactory);
 
       // Update AbrManager variants to match these new settings.
       this.updateAbrManagerVariants_();
@@ -5209,7 +5245,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Return a list of audio language-role combinations available.  If the
    * player has not loaded any content, this will return an empty list.
    *
-   * @return {!Array.<shaka.extern.LanguageRole>}
+   * @return {!Array<shaka.extern.LanguageRole>}
    * @export
    */
   getAudioLanguagesAndRoles() {
@@ -5220,7 +5256,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Return a list of text language-role combinations available.  If the player
    * has not loaded any content, this will be return an empty list.
    *
-   * @return {!Array.<shaka.extern.LanguageRole>}
+   * @return {!Array<shaka.extern.LanguageRole>}
    * @export
    */
   getTextLanguagesAndRoles() {
@@ -5231,7 +5267,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Return a list of audio languages available. If the player has not loaded
    * any content, this will return an empty list.
    *
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    * @export
    */
   getAudioLanguages() {
@@ -5242,7 +5278,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Return a list of text languages available. If the player has not loaded
    * any content, this will return an empty list.
    *
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    * @export
    */
   getTextLanguages() {
@@ -5266,17 +5302,20 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       codec = '', spatialAudio = false) {
     const selectMediaSourceMode = () => {
       this.currentAdaptationSetCriteria_ =
-          new shaka.media.PreferenceBasedCriteria(
-              language,
-              role || '',
-              channelsCount || 0,
-              /* hdrLevel= */ '',
-              spatialAudio || false,
-              /* videoLayout= */ '',
-              /* audioLabel= */ '',
-              /* videoLabel= */ '',
-              this.config_.mediaSource.codecSwitchingStrategy,
-              codec || '');
+          this.config_.adaptationSetCriteriaFactory();
+      this.currentAdaptationSetCriteria_.configure({
+        language,
+        role: role || '',
+        channelCount: channelsCount || 0,
+        hdrLevel: '',
+        spatialAudio: spatialAudio || false,
+        videoLayout: '',
+        audioLabel: '',
+        videoLabel: '',
+        codecSwitchingStrategy:
+            this.config_.mediaSource.codecSwitchingStrategy,
+        audioCodec: codec || '',
+      });
 
       const diff = (a, b) => {
         if (!a.video && !b.video) {
@@ -5423,17 +5462,21 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // Because of that we assume that all the variants with the same
       // label have the same language.
       this.currentAdaptationSetCriteria_ =
-          new shaka.media.PreferenceBasedCriteria(
-              firstVariantWithLabel.language,
-              /* role= */ '',
-              /* channelCount= */ 0,
-              /* hdrLevel= */ '',
-              /* spatialAudio= */ false,
-              /* videoLayout= */ '',
-              label,
-              /* videoLabel= */ '',
-              this.config_.mediaSource.codecSwitchingStrategy,
-              /* audioCodec= */ '');
+          this.config_.adaptationSetCriteriaFactory();
+      this.currentAdaptationSetCriteria_.configure({
+        language: firstVariantWithLabel.language,
+        role: '',
+        channelCount: 0,
+        hdrLevel: '',
+        spatialAudio: false,
+        videoLayout: '',
+        label,
+        videoLabel: '',
+        audioLabel: '',
+        codecSwitchingStrategy:
+            this.config_.mediaSource.codecSwitchingStrategy,
+        audioCodec: '',
+      });
 
       this.chooseVariantAndSwitch_(clearBuffer, safeMargin);
     };
@@ -5488,7 +5531,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Return a list of chapters tracks.
    *
-   * @return {!Array.<shaka.extern.Track>}
+   * @return {!Array<shaka.extern.Track>}
    * @export
    */
   getChaptersTracks() {
@@ -5505,7 +5548,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * This returns the list of chapters.
    *
    * @param {string} language
-   * @return {!Array.<shaka.extern.Chapter>}
+   * @return {!Array<shaka.extern.Chapter>}
    * @export
    */
   getChapters(language) {
@@ -5513,10 +5556,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return [];
     }
     const LanguageUtils = shaka.util.LanguageUtils;
-    const inputlanguage = LanguageUtils.normalize(language);
+    const inputLanguage = LanguageUtils.normalize(language);
     const chaptersTracks = this.getChaptersTracks_();
     const chaptersTracksWithLanguage = chaptersTracks
-        .filter((t) => LanguageUtils.normalize(t.language) == inputlanguage);
+        .filter((t) => LanguageUtils.normalize(t.language) == inputLanguage);
     if (!chaptersTracksWithLanguage || !chaptersTracksWithLanguage.length) {
       return [];
     }
@@ -5550,7 +5593,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Ignore the TextTracks with the 'metadata' or 'chapters' kind, or the one
    * generated by the SimpleTextDisplayer.
    *
-   * @return {!Array.<TextTrack>}
+   * @return {!Array<TextTrack>}
    * @private
    */
   getFilteredTextTracks_() {
@@ -5564,7 +5607,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Get the TextTracks with the 'metadata' kind.
    *
-   * @return {!Array.<TextTrack>}
+   * @return {!Array<TextTrack>}
    * @private
    */
   getMetadataTracks_() {
@@ -5577,7 +5620,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Get the TextTracks with the 'chapters' kind.
    *
-   * @return {!Array.<TextTrack>}
+   * @return {!Array<TextTrack>}
    * @private
    */
   getChaptersTracks_() {
@@ -5595,11 +5638,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   setTextTrackVisibility(isVisible) {
-    const oldVisibilty = this.isTextVisible_;
+    const oldVisibility = this.isTextVisible_;
     // Convert to boolean in case apps pass 0/1 instead false/true.
     const newVisibility = !!isVisible;
 
-    if (oldVisibilty == newVisibility) {
+    if (oldVisibility == newVisibility) {
       return;
     }
 
@@ -5772,6 +5815,22 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     return info;
   }
 
+  /**
+   * Get latency in milliseconds between the live edge and what's currently
+   * playing.
+   *
+   * @return {?number} The latency in milliseconds, or null if nothing
+   * is playing.
+   */
+  getLiveLatency() {
+    if (!this.video_) {
+      return null;
+    }
+    const now = this.getPresentationStartTimeAsDate().getTime() +
+      this.video_.currentTime * 1000;
+    return Date.now() - now;
+  }
+
   /**
    * Get statistics for the current playback session. If the player is not
    * playing content, this will return an empty stats object.
@@ -5841,10 +5900,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
 
       if (this.isLive()) {
-        const now = this.getPresentationStartTimeAsDate().valueOf() +
-            element.currentTime * 1000;
-        const latency = (Date.now() - now) / 1000;
-        this.stats_.setLiveLatency(latency);
+        const latency = this.getLiveLatency() || 0;
+        this.stats_.setLiveLatency(latency / 1000);
       }
 
       if (this.manifest_) {
@@ -5885,7 +5942,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {string=} codec
    * @param {string=} label
    * @param {boolean=} forced
-   * @return {!Promise.<shaka.extern.Track>}
+   * @return {!Promise<shaka.extern.Track>}
    * @export
    */
   async addTextTrackAsync(uri, language, kind, mimeType, codec, label,
@@ -6035,7 +6092,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {string} uri
    * @param {string=} mimeType
-   * @return {!Promise.<shaka.extern.Track>}
+   * @return {!Promise<shaka.extern.Track>}
    * @export
    */
   async addThumbnailsTrack(uri, mimeType) {
@@ -6194,7 +6251,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {string} uri
    * @param {string} language
    * @param {string=} mimeType
-   * @return {!Promise.<shaka.extern.Track>}
+   * @return {!Promise<shaka.extern.Track>}
    * @export
    */
   async addChaptersTrack(uri, language, mimeType) {
@@ -6258,7 +6315,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
   /**
    * @param {string} uri
-   * @return {!Promise.<string>}
+   * @return {!Promise<string>}
    * @private
    */
   async getTextMimetype_(uri) {
@@ -6266,7 +6323,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     try {
       goog.asserts.assert(
           this.networkingEngine_, 'Need networking engine.');
-      // eslint-disable-next-line require-atomic-updates
       mimeType = await shaka.net.NetworkingUtils.getMimeType(uri,
           this.networkingEngine_,
           this.config_.streaming.retryParameters);
@@ -6292,8 +6348,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {string} kind
    * @param {string} mimeType
    * @param {string} label
-   * @param {!Array.<!shaka.extern.AdCuePoint>} adCuePoints
-   * @return {!Promise.<!HTMLTrackElement>}
+   * @param {!Array<!shaka.extern.AdCuePoint>} adCuePoints
+   * @return {!Promise<!HTMLTrackElement>}
    * @private
    */
   async addSrcTrackElement_(uri, language, kind, mimeType, label,
@@ -6335,7 +6391,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {string} uri
    * @param {!shaka.net.NetworkingEngine} netEngine
    * @param {shaka.extern.RetryParameters} retryParams
-   * @return {!Promise.<BufferSource>}
+   * @return {!Promise<BufferSource>}
    * @private
    */
   async getTextData_(uri, netEngine, retryParams) {
@@ -6357,7 +6413,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {BufferSource} buffer
    * @param {string} mimeType
-   * @param {!Array.<!shaka.extern.AdCuePoint>} adCuePoints
+   * @param {!Array<!shaka.extern.AdCuePoint>} adCuePoints
    * @return {string}
    * @private
    */
@@ -6671,7 +6727,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * @param {shaka.extern.Variant} initialVariant
    * @param {number} time
-   * @return {!Promise.<number>}
+   * @return {!Promise<number>}
    * @private
    */
   async adjustStartTime_(initialVariant, time) {
@@ -6683,14 +6739,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     /**
      * @param {?shaka.extern.Stream} stream
      * @param {number} time
-     * @return {!Promise.<?number>}
+     * @return {!Promise<?number>}
      */
     const getAdjustedTime = async (stream, time) => {
       if (!stream) {
         return null;
       }
 
-      await stream.createSegmentIndex();
+      if (!stream.segmentIndex) {
+        await stream.createSegmentIndex();
+      }
       const iter = stream.segmentIndex.getIteratorForTime(time);
       const ref = iter ? iter.next().value : null;
       if (!ref) {
@@ -6736,7 +6794,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const loaded = this.stats_ && this.bufferObserver_ && this.playhead_;
 
     if (loaded) {
-      this.playRateController_.setBuffering(isBuffering);
+      if (this.config_.streaming.rebufferingGoal == 0) {
+        // Disable buffer control with playback rate
+        this.playRateController_.setBuffering(/* isBuffering= */ false);
+      } else {
+        this.playRateController_.setBuffering(isBuffering);
+      }
       if (this.cmcdManager_) {
         this.cmcdManager_.setBuffering(isBuffering);
       }
@@ -7933,7 +7996,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   }
 
   /**
-   * @param {!Object.<string, string>} keyStatusMap A map of hex key IDs to
+   * @param {!Object<string, string>} keyStatusMap A map of hex key IDs to
    *   statuses.
    * @private
    */
@@ -8082,8 +8145,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Get the normalized languages for a group of tracks.
    *
-   * @param {!Array.<?shaka.extern.Track>} tracks
-   * @return {!Set.<string>}
+   * @param {!Array<?shaka.extern.Track>} tracks
+   * @return {!Set<string>}
    * @private
    */
   static getLanguagesFrom_(tracks) {
@@ -8104,14 +8167,14 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Get all permutations of normalized languages and role for a group of
    * tracks.
    *
-   * @param {!Array.<?shaka.extern.Track>} tracks
-   * @return {!Array.<shaka.extern.LanguageRole>}
+   * @param {!Array<?shaka.extern.Track>} tracks
+   * @return {!Array<shaka.extern.LanguageRole>}
    * @private
    */
   static getLanguageAndRolesFrom_(tracks) {
-    /** @type {!Map.<string, !Set>} */
+    /** @type {!Map<string, !Set>} */
     const languageToRoles = new Map();
-    /** @type {!Map.<string, !Map.<string, string>>} */
+    /** @type {!Map<string, !Map<string, string>>} */
     const languageRoleToLabel = new Map();
 
     for (const track of tracks) {
@@ -8320,15 +8383,15 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-// eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.12.9' + '-uncompiled';  // x-release-please-version
+// eslint-disable-next-line no-useless-concat
+shaka.Player.version = 'v4.13.0' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.
 shaka.Deprecate.init(shaka.Player.version);
 
 
-/** @private {!Object.<string, function():*>} */
+/** @private {!Object<string, function(): *>} */
 shaka.Player.supportPlugins_ = {};