shaka-player 4.13.0 → 4.13.2

package/lib/media/preload_manager.js

@@ -92,7 +92,10 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     /** @private {boolean} */
     this.parserEntrusted_ = false;
 
-    /** @private {!shaka.media.RegionTimeline} */
+    /**
+     * @private {!shaka.media.RegionTimeline<
+     *     shaka.extern.TimelineRegionInfo>}
+     */
     this.regionTimeline_ = typedPlayerInterface.regionTimeline;
 
     /** @private {boolean} */
@@ -288,7 +291,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
   /**
    * Gets the region timeline, if it exists. Also marks that the timeline should
    * not be released if this manager is destroyed.
-   * @return {?shaka.media.RegionTimeline}
+   * @return {?shaka.media.RegionTimeline<shaka.extern.TimelineRegionInfo>}
    */
   receiveRegionTimeline() {
     this.regionTimelineEntrusted_ = true;
@@ -296,7 +299,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
   }
 
   /**
-   * @return {?shaka.media.RegionTimeline}
+   * @return {?shaka.media.RegionTimeline<shaka.extern.TimelineRegionInfo>}
    */
   getRegionTimeline() {
     return this.regionTimeline_;
@@ -837,7 +840,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
  * @typedef {{
  *   config: !shaka.extern.PlayerConfiguration,
  *   manifestPlayerInterface: !shaka.extern.ManifestParser.PlayerInterface,
- *   regionTimeline: !shaka.media.RegionTimeline,
+ *   regionTimeline: !shaka.media.RegionTimeline<
+ *       shaka.extern.TimelineRegionInfo>,
  *   qualityObserver: ?shaka.media.QualityObserver,
  *   createDrmEngine: function():!shaka.drm.DrmEngine,
  *   networkingEngine: !shaka.net.NetworkingEngine,
@@ -849,7 +853,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
  * @property {!shaka.extern.PlayerConfiguration} config
  * @property {!shaka.extern.ManifestParser.PlayerInterface
  *           } manifestPlayerInterface
- * @property {!shaka.media.RegionTimeline} regionTimeline
+ * @property {!shaka.media.RegionTimeline<shaka.extern.TimelineRegionInfo>
+ *           } regionTimeline
  * @property {?shaka.media.QualityObserver} qualityObserver
  * @property {function():!shaka.drm.DrmEngine} createDrmEngine
  * @property {!shaka.net.NetworkingEngine} networkingEngine

package/lib/media/region_observer.js

@@ -18,6 +18,7 @@ goog.require('shaka.util.FakeEventTarget');
  * ('enter', 'exit', 'skip') as the playhead moves.
  *
  * @implements {shaka.media.IPlayheadObserver}
+ * @template T
  * @final
  */
 shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
@@ -26,13 +27,13 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * own the timeline, only uses it. This means that the observer should NOT
    * destroy the timeline.
    *
-   * @param {!shaka.media.RegionTimeline} timeline
+   * @param {!shaka.media.RegionTimeline<T>} timeline
    * @param {boolean} startsPastZero
    */
   constructor(timeline, startsPastZero) {
     super();
 
-    /** @private {shaka.media.RegionTimeline} */
+    /** @private {shaka.media.RegionTimeline<T>} */
     this.timeline_ = timeline;
 
     /**
@@ -50,8 +51,7 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
      * When the value here differs from what we calculate, it means we moved and
      * should fire an event.
      *
-     * @private {!Map<shaka.extern.TimelineRegionInfo,
-     *                 shaka.media.RegionObserver.RelativePosition_>}
+     * @private {!Map<T, shaka.media.RegionObserver.RelativePosition_>}
      */
     this.oldPosition_ = new Map();
 
@@ -109,7 +109,7 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
     this.eventManager_ = new shaka.util.EventManager();
 
     this.eventManager_.listen(this.timeline_, 'regionremove', (event) => {
-      /** @type {shaka.extern.TimelineRegionInfo} */
+      /** @type {T} */
       const region = event['region'];
       this.oldPosition_.delete(region);
     });
@@ -162,7 +162,7 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * same parameters: region and seeking.
    *
    * @param {string} eventType
-   * @param {shaka.extern.TimelineRegionInfo} region
+   * @param {T} region
    * @param {boolean} seeking
    * @private
    */
@@ -179,7 +179,8 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * at |seconds|. We treat the region's start and end times as inclusive
    * bounds.
    *
-   * @param {shaka.extern.TimelineRegionInfo} region
+   * @template T
+   * @param {T} region
    * @param {number} seconds
    * @return {shaka.media.RegionObserver.RelativePosition_}
    * @private
@@ -218,7 +219,7 @@ shaka.media.RegionObserver.RelativePosition_ = {
  * region that the playhead is interacting with and whether or not the playhead
  * moving is part of a seek event.
  *
- * @typedef {function(shaka.extern.TimelineRegionInfo, boolean)}
+ * @typedef {function(?, boolean)}
  */
 shaka.media.RegionObserver.EventListener;
 

package/lib/media/region_timeline.js

@@ -18,6 +18,7 @@ goog.require('shaka.util.Timer');
  * deleted, the 'regionremove' event will be fired.
  *
  * @implements {shaka.util.IReleasable}
+ * @template T
  * @final
  */
 shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
@@ -27,7 +28,7 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
   constructor(getSeekRange) {
     super();
 
-    /** @private {!Set<shaka.extern.TimelineRegionInfo>} */
+    /** @private {!Set<T>} */
     this.regions_ = new Set();
 
     /** @private {!function():{start: number, end: number}} */
@@ -54,7 +55,7 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
   }
 
   /**
-   * @param {shaka.extern.TimelineRegionInfo} region
+   * @param {T} region
    */
   addRegion(region) {
     const similarRegion = this.findSimilarRegion_(region);
@@ -97,18 +98,19 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
    * to be the same region. If no similar region can be found, |null| will be
    * returned.
    *
-   * @param {shaka.extern.TimelineRegionInfo} region
-   * @return {?shaka.extern.TimelineRegionInfo}
+   * @param {T} region
+   * @return {?T}
    * @private
    */
   findSimilarRegion_(region) {
+    const isDiffNegligible = (a, b) => Math.abs(a - b) < 0.1;
     for (const existing of this.regions_) {
       // The same scheme ID and time range means that it is similar-enough to
       // be the same region.
       const isSimilar = existing.schemeIdUri == region.schemeIdUri &&
-                        existing.id == region.id &&
-                        existing.startTime == region.startTime &&
-                        existing.endTime == region.endTime;
+          existing.id == region.id &&
+          isDiffNegligible(existing.startTime, region.startTime) &&
+          isDiffNegligible(existing.endTime, region.endTime);
 
       if (isSimilar) {
         return existing;
@@ -123,7 +125,7 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
    * others to see what regions are in the timeline while not being able to
    * change the collection.
    *
-   * @return {!Iterable<shaka.extern.TimelineRegionInfo>}
+   * @return {!Iterable<T>}
    */
   regions() {
     return this.regions_;

package/lib/media/streaming_engine.js

@@ -1368,12 +1368,17 @@ shaka.media.StreamingEngine = class {
       return null;
     }
 
+    // Update updateIntervalSeconds according to our current playbackrate,
+    // and always considering a minimum of 1.
+    const updateIntervalSeconds = this.config_.updateIntervalSeconds /
+        Math.max(1, Math.abs(this.playerInterface_.getPlaybackRate()));
+
     if (!this.playerInterface_.mediaSourceEngine.isStreamingAllowed() &&
         mediaState.type != ContentType.TEXT) {
       // It is not allowed to add segments yet, so we schedule an update to
       // check again later. So any prediction we make now could be terribly
       // invalid soon.
-      return this.config_.updateIntervalSeconds / 2;
+      return updateIntervalSeconds / 2;
     }
 
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
@@ -1445,9 +1450,8 @@ shaka.media.StreamingEngine = class {
       shaka.log.v2(logPrefix, 'buffering goal met');
 
       // Do not try to predict the next update.  Just poll according to
-      // configuration (seconds). The playback rate can change at any time, so
-      // any prediction we make now could be terribly invalid soon.
-      return this.config_.updateIntervalSeconds / 2;
+      // configuration (seconds).
+      return updateIntervalSeconds / 2;
     }
 
     // Lack of segment iterator is the best indicator stream has changed.
@@ -1459,7 +1463,7 @@ shaka.media.StreamingEngine = class {
       // In any case just try again... if the manifest is incomplete or is not
       // being updated then we'll idle forever; otherwise, we'll end up getting
       // a SegmentReference eventually.
-      return this.config_.updateIntervalSeconds;
+      return updateIntervalSeconds;
     }
     // Get media state adaptation and reset this value. By guarding it during
     // actual stream change we ensure it won't be cleaned by accident on regular
@@ -1498,7 +1502,7 @@ shaka.media.StreamingEngine = class {
       // For example, let video buffering catch up to audio buffering before
       // fetching another audio segment.
       shaka.log.v2(logPrefix, 'waiting for other streams to buffer');
-      return this.config_.updateIntervalSeconds;
+      return updateIntervalSeconds;
     }
 
     if (mediaState.segmentPrefetch && mediaState.segmentIterator &&
@@ -1821,7 +1825,19 @@ shaka.media.StreamingEngine = class {
           JSON.stringify(buffered));
 
       if (!mediaState.waitingToClearBuffer) {
-        this.playerInterface_.onSegmentAppended(reference, mediaState.stream);
+        let otherState = null;
+        if (mediaState.type === ContentType.VIDEO) {
+          otherState = this.mediaStates_.get(ContentType.AUDIO);
+        } else if (mediaState.type === ContentType.AUDIO) {
+          otherState = this.mediaStates_.get(ContentType.VIDEO);
+        }
+        if (otherState && otherState.type == ContentType.AUDIO) {
+          this.playerInterface_.onSegmentAppended(reference, mediaState.stream,
+              otherState.stream.isAudioMuxedInVideo);
+        } else {
+          this.playerInterface_.onSegmentAppended(reference, mediaState.stream,
+              mediaState.stream.codecs.includes(','));
+        }
       }
 
       // Update right away.
@@ -2885,7 +2901,7 @@ shaka.media.StreamingEngine = class {
  *   onError: function(!shaka.util.Error),
  *   onEvent: function(!Event),
  *   onSegmentAppended: function(!shaka.media.SegmentReference,
- *     !shaka.extern.Stream),
+ *     !shaka.extern.Stream, boolean),
  *   onInitSegmentAppended: function(!number,!shaka.media.InitSegmentReference),
  *   beforeAppendSegment: function(
  *     shaka.util.ManifestParserUtils.ContentType,!BufferSource):Promise,
@@ -2910,7 +2926,7 @@ shaka.media.StreamingEngine = class {
  * @property {function(!Event)} onEvent
  *   Called when an event occurs that should be sent to the app.
  * @property {function(!shaka.media.SegmentReference,
- *     !shaka.extern.Stream)} onSegmentAppended
+ *     !shaka.extern.Stream, boolean)} onSegmentAppended
  *   Called after a segment is successfully appended to a MediaSource.
  * @property {function(!number,
  *                     !shaka.media.InitSegmentReference)} onInitSegmentAppended

package/lib/mss/mss_parser.js

@@ -610,7 +610,7 @@ shaka.mss.MssParser = class {
     // This is specifically for text tracks.
     const subType = streamIndex.attributes['Subtype'];
     if (subType) {
-      const role = MssParser.ROLE_MAPPING_[subType];
+      const role = MssParser.ROLE_MAPPING_.get(subType);
       if (role) {
         stream.roles.push(role);
       }
@@ -1107,14 +1107,13 @@ shaka.mss.MssParser.SUPPORTED_CODECS_ = [
  * MPEG-DASH Role and accessibility mapping for text tracks according to
  * ETSI TS 103 285 v1.1.1 (section 7.1.2)
  *
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.mss.MssParser.ROLE_MAPPING_ = {
-  'CAPT': 'main',
-  'SUBT': 'alternate',
-  'DESC': 'main',
-};
+shaka.mss.MssParser.ROLE_MAPPING_ = new Map()
+    .set('CAPT', 'main')
+    .set('SUBT', 'alternate')
+    .set('DESC', 'main');
 
 
 /**

package/lib/net/http_plugin_utils.js

@@ -32,7 +32,7 @@ shaka.net.HttpPluginUtils = class {
       requestType) {
     goog.asserts.assert(data, 'Data should be non-null!');
 
-    if (status >= 200 && status <= 299 && status != 202) {
+    if ((status >= 200 && status <= 299 && status != 202) || status == 304) {
       // Most 2xx HTTP codes are success cases.
       /** @type {shaka.extern.Response} */
       const response = {

package/lib/net/networking_engine.js

@@ -156,13 +156,13 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
         priority == undefined || priority > 0, 'explicit priority must be > 0');
     priority =
         priority || shaka.net.NetworkingEngine.PluginPriority.APPLICATION;
-    const existing = shaka.net.NetworkingEngine.schemes_[scheme];
+    const existing = shaka.net.NetworkingEngine.schemes_.get(scheme);
     if (!existing || priority >= existing.priority) {
-      shaka.net.NetworkingEngine.schemes_[scheme] = {
+      shaka.net.NetworkingEngine.schemes_.set(scheme, {
         priority: priority,
         plugin: plugin,
         progressSupport: progressSupport,
-      };
+      });
     }
   }
 
@@ -173,7 +173,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    * @export
    */
   static unregisterScheme(scheme) {
-    delete shaka.net.NetworkingEngine.schemes_[scheme];
+    shaka.net.NetworkingEngine.schemes_.delete(scheme);
   }
 
   /**
@@ -539,7 +539,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     // and https://tools.ietf.org/html/rfc3986#section-3.1
     scheme = scheme.toLowerCase();
 
-    const object = shaka.net.NetworkingEngine.schemes_[scheme];
+    const object = shaka.net.NetworkingEngine.schemes_.get(scheme);
     const plugin = object ? object.plugin : null;
     if (!plugin) {
       return shaka.util.AbortableOperation.failed(
@@ -972,9 +972,9 @@ shaka.net.NetworkingEngine.SchemeObject;
 /**
  * Contains the scheme plugins.
  *
- * @private {!Object<string, shaka.net.NetworkingEngine.SchemeObject>}
+ * @private {!Map<string, shaka.net.NetworkingEngine.SchemeObject>}
  */
-shaka.net.NetworkingEngine.schemes_ = {};
+shaka.net.NetworkingEngine.schemes_ = new Map();
 
 /**
  * @typedef {{

package/lib/net/networking_utils.js

@@ -24,7 +24,7 @@ shaka.net.NetworkingUtils = class {
   static async getMimeType(uri, netEngine, retryParams) {
     const extension = shaka.net.NetworkingUtils.getExtension_(uri);
     let mimeType =
-        shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_[extension];
+        shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_.get(extension);
     if (mimeType) {
       return mimeType;
     }
@@ -73,43 +73,42 @@ shaka.net.NetworkingUtils = class {
 };
 
 /**
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_ = {
-  'mp4': 'video/mp4',
-  'm4v': 'video/mp4',
-  'm4a': 'audio/mp4',
-  'webm': 'video/webm',
-  'weba': 'audio/webm',
-  'mkv': 'video/webm', // Chromium browsers supports it.
-  'ts': 'video/mp2t',
-  'ogv': 'video/ogg',
-  'ogg': 'audio/ogg',
-  'mpg': 'video/mpeg',
-  'mpeg': 'video/mpeg',
-  'mov': 'video/quicktime',
-  'm3u8': 'application/x-mpegurl',
-  'mpd': 'application/dash+xml',
-  'ism': 'application/vnd.ms-sstr+xml',
-  'mp3': 'audio/mpeg',
-  'aac': 'audio/aac',
-  'flac': 'audio/flac',
-  'wav': 'audio/wav',
-  'sbv': 'text/x-subviewer',
-  'srt': 'text/srt',
-  'vtt': 'text/vtt',
-  'webvtt': 'text/vtt',
-  'ttml': 'application/ttml+xml',
-  'lrc': 'application/x-subtitle-lrc',
-  'ssa': 'text/x-ssa',
-  'ass': 'text/x-ssa',
-  'jpeg': 'image/jpeg',
-  'jpg': 'image/jpeg',
-  'png': 'image/png',
-  'svg': 'image/svg+xml',
-  'webp': 'image/webp',
-  'avif': 'image/avif',
-  'html': 'text/html',
-  'htm': 'text/html',
-};
+shaka.net.NetworkingUtils.EXTENSIONS_TO_MIME_TYPES_ = new Map()
+    .set('mp4', 'video/mp4')
+    .set('m4v', 'video/mp4')
+    .set('m4a', 'audio/mp4')
+    .set('webm', 'video/webm')
+    .set('weba', 'audio/webm')
+    .set('mkv', 'video/webm') // Chromium browsers supports it.
+    .set('ts', 'video/mp2t')
+    .set('ogv', 'video/ogg')
+    .set('ogg', 'audio/ogg')
+    .set('mpg', 'video/mpeg')
+    .set('mpeg', 'video/mpeg')
+    .set('mov', 'video/quicktime')
+    .set('m3u8', 'application/x-mpegurl')
+    .set('mpd', 'application/dash+xml')
+    .set('ism', 'application/vnd.ms-sstr+xml')
+    .set('mp3', 'audio/mpeg')
+    .set('aac', 'audio/aac')
+    .set('flac', 'audio/flac')
+    .set('wav', 'audio/wav')
+    .set('sbv', 'text/x-subviewer')
+    .set('srt', 'text/srt')
+    .set('vtt', 'text/vtt')
+    .set('webvtt', 'text/vtt')
+    .set('ttml', 'application/ttml+xml')
+    .set('lrc', 'application/x-subtitle-lrc')
+    .set('ssa', 'text/x-ssa')
+    .set('ass', 'text/x-ssa')
+    .set('jpeg', 'image/jpeg')
+    .set('jpg', 'image/jpeg')
+    .set('png', 'image/png')
+    .set('svg', 'image/svg+xml')
+    .set('webp', 'image/webp')
+    .set('avif', 'image/avif')
+    .set('html', 'text/html')
+    .set('htm', 'text/html');

package/lib/offline/stream_bandwidth_estimator.js

@@ -19,8 +19,8 @@ goog.requireType('shaka.media.SegmentReference');
 shaka.offline.StreamBandwidthEstimator = class {
   /** */
   constructor() {
-    /** @private {!Object<number, number>} */
-    this.estimateByStreamId_ = {};
+    /** @private {!Map<number, number>} */
+    this.estimateByStreamId_ = new Map();
   }
 
   /**
@@ -80,7 +80,7 @@ shaka.offline.StreamBandwidthEstimator = class {
    * @private
    */
   setBitrate_(stream, bitRate) {
-    this.estimateByStreamId_[stream] = bitRate;
+    this.estimateByStreamId_.set(stream, bitRate);
   }
 
   /**
@@ -89,8 +89,8 @@ shaka.offline.StreamBandwidthEstimator = class {
    * @param {shaka.extern.Stream} text
    */
   addText(text) {
-    this.estimateByStreamId_[text.id] =
-        shaka.offline.StreamBandwidthEstimator.DEFAULT_TEXT_BITRATE_;
+    this.estimateByStreamId_.set(text.id,
+        shaka.offline.StreamBandwidthEstimator.DEFAULT_TEXT_BITRATE_);
   }
 
   /**
@@ -99,8 +99,8 @@ shaka.offline.StreamBandwidthEstimator = class {
    * @param {shaka.extern.Stream} image
    */
   addImage(image) {
-    this.estimateByStreamId_[image.id] = image.bandwidth ||
-        shaka.offline.StreamBandwidthEstimator.DEFAULT_IMAGE_BITRATE_;
+    this.estimateByStreamId_.set(image.id, image.bandwidth ||
+        shaka.offline.StreamBandwidthEstimator.DEFAULT_IMAGE_BITRATE_);
   }
 
   /**
@@ -136,7 +136,7 @@ shaka.offline.StreamBandwidthEstimator = class {
    * @private
    */
   getEstimate_(id) {
-    let bitRate = this.estimateByStreamId_[id];
+    let bitRate = this.estimateByStreamId_.get(id);
 
     if (bitRate == null) {
       bitRate = 0;