shaka-player 4.9.30 → 4.9.32

package/externs/shaka/abortable.js

@@ -18,39 +18,39 @@
  * @template T
  * @exportDoc
  */
-shaka.extern.IAbortableOperation = function() {};
-
-
-/**
- * A Promise which represents the underlying operation.  It is resolved when
- * the operation is complete, and rejected if the operation fails or is
- * aborted.  Aborted operations should be rejected with a shaka.util.Error
- * object using the error code OPERATION_ABORTED.
- *
- * @const {!Promise.<T>}
- * @exportDoc
- */
-shaka.extern.IAbortableOperation.prototype.promise;
-
-
-/**
- * Can be called by anyone holding this object to abort the underlying
- * operation.  This is not cancelation, and will not necessarily result in
- * any work being undone.  abort() should return a Promise which is resolved
- * when the underlying operation has been aborted.  The returned Promise
- * should never be rejected.
- *
- * @return {!Promise}
- * @exportDoc
- */
-shaka.extern.IAbortableOperation.prototype.abort = function() {};
-
-
-/**
- * @param {function(boolean)} onFinal A callback to be invoked after the
- *   operation succeeds or fails.  The boolean argument is true if the operation
- *   succeeded and false if it failed.
- * @return {!shaka.extern.IAbortableOperation.<T>} Returns this.
- * @exportDoc
- */
-shaka.extern.IAbortableOperation.prototype.finally = function(onFinal) {};
+shaka.extern.IAbortableOperation = class {
+  constructor() {
+    /**
+     * A Promise which represents the underlying operation.  It is resolved when
+     * the operation is complete, and rejected if the operation fails or is
+     * aborted.  Aborted operations should be rejected with a shaka.util.Error
+     * object using the error code OPERATION_ABORTED.
+     *
+     * @const {!Promise.<T>}
+     * @exportDoc
+     */
+    this.promise;
+  }
+
+  /**
+   * Can be called by anyone holding this object to abort the underlying
+   * operation.  This is not cancelation, and will not necessarily result in
+   * any work being undone.  abort() should return a Promise which is resolved
+   * when the underlying operation has been aborted.  The returned Promise
+   * should never be rejected.
+   *
+   * @return {!Promise}
+   * @exportDoc
+   */
+  abort() {}
+
+
+  /**
+   * @param {function(boolean)} onFinal A callback to be invoked after the
+   *   operation succeeds or fails.  The boolean argument is true
+   *   if the operation succeeded and false if it failed.
+   * @return {!shaka.extern.IAbortableOperation.<T>} Returns this.
+   * @exportDoc
+   */
+  finally(onFinal) {}
+};

package/lib/dash/segment_template.js

@@ -85,7 +85,9 @@ shaka.dash.SegmentTemplate = class {
         },
       };
     } else if (info.segmentDuration) {
-      if (!isUpdate && context.adaptationSet.contentType !== 'image') {
+      if (!isUpdate &&
+          context.adaptationSet.contentType !== 'image' &&
+          context.adaptationSet.contentType !== 'text') {
         context.presentationTimeline.notifyMaxSegmentDuration(
             info.segmentDuration);
         context.presentationTimeline.notifyMinSegmentStartTime(
@@ -161,7 +163,9 @@ shaka.dash.SegmentTemplate = class {
         tsi.evict(availabilityStart);
       }
 
-      if (info.timeline && context.adaptationSet.contentType !== 'image') {
+      if (info.timeline &&
+          context.adaptationSet.contentType !== 'image' &&
+          context.adaptationSet.contentType !== 'text') {
         const timeline = info.timeline;
         context.presentationTimeline.notifyTimeRange(
             timeline,
@@ -1029,6 +1033,19 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     return ref;
   }
 
+  /**
+   * @override
+   */
+  forEachTopLevelReference(fn) {
+    this.fitTimeline();
+    for (let i = 0; i < this.getNumReferences(); i++) {
+      const reference = this.get(i + this.numEvicted_);
+      if (reference) {
+        fn(reference);
+      }
+    }
+  }
+
   /**
    * Fill in a specific template with values to get the segment uris
    *

package/lib/hls/hls_parser.js

@@ -3705,7 +3705,7 @@ shaka.hls.HlsParser = class {
     let aesKey = undefined;
 
     let discontinuitySequence = shaka.hls.Utils.getFirstTagWithNameAsNumber(
-        playlist.tags, 'EXT-X-DISCONTINUITY-SEQUENCE', 0);
+        playlist.tags, 'EXT-X-DISCONTINUITY-SEQUENCE', -1);
     const mediaSequenceNumber = shaka.hls.Utils.getFirstTagWithNameAsNumber(
         playlist.tags, 'EXT-X-MEDIA-SEQUENCE', 0);
     const skipTag = shaka.hls.Utils.getFirstTagWithName(

package/lib/media/adaptation_set_criteria.js

@@ -356,7 +356,14 @@ shaka.media.PreferenceBasedCriteria = class {
     if (hdrLevel == 'AUTO') {
       // Auto detect the ideal HDR level.
       if (window.matchMedia('(color-gamut: p3)').matches) {
-        hdrLevel = 'PQ';
+        const someHLG = variants.some((variant) => {
+          if (variant.video && variant.video.hdr &&
+              variant.video.hdr == 'HLG') {
+            return true;
+          }
+          return false;
+        });
+        hdrLevel = someHLG ? 'HLG' : 'PQ';
       } else {
         hdrLevel = 'SDR';
       }

package/lib/media/content_workarounds.js

@@ -176,7 +176,8 @@ shaka.media.ContentWorkarounds = class {
     // patched one, otherwise video element throws following error:
     // CHUNK_DEMUXER_ERROR_APPEND_FAILED: Sample encryption info is not
     // available.
-    if (shaka.util.Platform.isEdge() && shaka.util.Platform.isWindows()) {
+    if (shaka.util.Platform.isEdge() && shaka.util.Platform.isWindows() &&
+        !shaka.util.Platform.isXboxOne()) {
       const doubleInitSegment = new Uint8Array(initSegment.byteLength +
         modifiedInitSegment.byteLength);
       doubleInitSegment.set(modifiedInitSegment);

package/lib/media/drm_engine.js

@@ -9,7 +9,6 @@ goog.provide('shaka.media.DrmEngine');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.transmuxer.TransmuxerEngine');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.DrmUtils');
@@ -20,7 +19,6 @@ goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MapUtils');
-goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.ObjectUtils');
 goog.require('shaka.util.Platform');
 goog.require('shaka.util.Pssh');
@@ -41,9 +39,6 @@ shaka.media.DrmEngine = class {
     /** @private {?shaka.media.DrmEngine.PlayerInterface} */
     this.playerInterface_ = playerInterface;
 
-    /** @private {!Set.<string>} */
-    this.supportedTypes_ = new Set();
-
     /** @private {MediaKeys} */
     this.mediaKeys_ = null;
 
@@ -197,7 +192,6 @@ shaka.media.DrmEngine = class {
 
     // Break references to everything else we hold internally.
     this.currentDrmInfo_ = null;
-    this.supportedTypes_.clear();
     this.mediaKeys_ = null;
     this.storedPersistentSessions_ = new Map();
     this.config_ = null;
@@ -512,7 +506,14 @@ shaka.media.DrmEngine = class {
     this.video_ = video;
 
     this.eventManager_.listenOnce(this.video_, 'play', () => this.onPlay_());
-    if ('webkitCurrentPlaybackTargetIsWireless' in this.video_) {
+    if (this.video_.remote) {
+      this.eventManager_.listen(this.video_.remote, 'connect',
+          () => this.closeOpenSessions_());
+      this.eventManager_.listen(this.video_.remote, 'connecting',
+          () => this.closeOpenSessions_());
+      this.eventManager_.listen(this.video_.remote, 'disconnect',
+          () => this.closeOpenSessions_());
+    } else if ('webkitCurrentPlaybackTargetIsWireless' in this.video_) {
       this.eventManager_.listen(this.video_,
           'webkitcurrentplaybacktargetiswirelesschanged',
           () => this.closeOpenSessions_());
@@ -773,40 +774,6 @@ shaka.media.DrmEngine = class {
     return this.initialized_;
   }
 
-  /**
-   * Check if DrmEngine (as initialized) will likely be able to support the
-   * given content type.
-   *
-   * @param {string} contentType
-   * @return {boolean}
-   */
-  willSupport(contentType) {
-    // Edge 14 does not report correct capabilities.  It will only report the
-    // first MIME type even if the others are supported.  To work around this,
-    // we say that Edge supports everything.
-    //
-    // See https://github.com/shaka-project/shaka-player/issues/1495 for details.
-    if (shaka.util.Platform.isLegacyEdge()) {
-      return true;
-    }
-
-    contentType = contentType.toLowerCase();
-
-    if (shaka.util.Platform.isTizen() &&
-        contentType.includes('codecs="ac-3"')) {
-      // Some Tizen devices seem to misreport AC-3 support.  This works around
-      // the issue, by falling back to EC-3, which seems to be supported on the
-      // same devices and be correctly reported in all cases we have observed.
-      // See https://github.com/shaka-project/shaka-player/issues/2989 for
-      // details.
-      const fallback = contentType.replace('ac-3', 'ec-3');
-      return this.supportedTypes_.has(contentType) ||
-             this.supportedTypes_.has(fallback);
-    }
-
-    return this.supportedTypes_.has(contentType);
-  }
-
   /**
    * Returns the ID of the sessions currently active.
    *
@@ -907,25 +874,6 @@ shaka.media.DrmEngine = class {
     return Array.from(this.activeSessions_.keys());
   }
 
-
-  /**
-   * @param {shaka.extern.Stream} stream
-   * @param {string=} codecOverride
-   * @return {string}
-   * @private
-   */
-  static computeMimeType_(stream, codecOverride) {
-    const realMimeType = shaka.util.MimeUtils.getFullType(stream.mimeType,
-        codecOverride || stream.codecs);
-    const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
-    if (TransmuxerEngine.isSupported(realMimeType, stream.type)) {
-      // This will be handled by the Transmuxer, so use the MIME type that the
-      // Transmuxer will produce.
-      return TransmuxerEngine.convertCodecs(stream.type, realMimeType);
-    }
-    return realMimeType;
-  }
-
   /**
    * @param {!Map.<string, MediaKeySystemConfiguration>} configsByKeySystem
    *   A dictionary of configs, indexed by key system, with an iteration order
@@ -950,11 +898,6 @@ shaka.media.DrmEngine = class {
     this.destroyer_.ensureNotDestroyed();
 
     try {
-      // Get the set of supported content types from the audio and video
-      // capabilities. Avoid duplicates so that it is easier to read what is
-      // supported.
-      this.supportedTypes_.clear();
-
       // Store the capabilities of the key system.
       const realConfig = mediaKeySystemAccess.getConfiguration();
 
@@ -962,20 +905,6 @@ shaka.media.DrmEngine = class {
           'Got MediaKeySystemAccess with configuration',
           realConfig);
 
-      const audioCaps = realConfig.audioCapabilities || [];
-      const videoCaps = realConfig.videoCapabilities || [];
-
-      for (const cap of audioCaps) {
-        this.supportedTypes_.add(cap.contentType.toLowerCase());
-      }
-
-      for (const cap of videoCaps) {
-        this.supportedTypes_.add(cap.contentType.toLowerCase());
-      }
-
-      goog.asserts.assert(this.supportedTypes_.size,
-          'We should get at least one supported MIME type');
-
       if (variants.length) {
         this.currentDrmInfo_ = this.createDrmInfoByInfos_(
             mediaKeySystemAccess.keySystem,
@@ -1032,7 +961,6 @@ shaka.media.DrmEngine = class {
 
       // Don't rewrap a shaka.util.Error from earlier in the chain:
       this.currentDrmInfo_ = null;
-      this.supportedTypes_.clear();
       if (exception instanceof shaka.util.Error) {
         throw exception;
       }
@@ -1779,6 +1707,7 @@ shaka.media.DrmEngine = class {
     const testKeySystems = [
       'org.w3.clearkey',
       'com.widevine.alpha',
+      'com.widevine.alpha.experiment', // Widevine L1 in Windows
       'com.microsoft.playready',
       'com.microsoft.playready.hardware',
       'com.microsoft.playready.recommendation',
@@ -1803,6 +1732,7 @@ shaka.media.DrmEngine = class {
 
     const testRobustness = {
       'com.widevine.alpha': widevineRobustness,
+      'com.widevine.alpha.experiment': widevineRobustness,
       'com.microsoft.playready.recommendation': playreadyRobustness,
     };
 
@@ -2074,41 +2004,6 @@ shaka.media.DrmEngine = class {
     }));
   }
 
-  /**
-   * Check if a variant is likely to be supported by DrmEngine. This will err on
-   * the side of being too accepting and may not reject a variant that it will
-   * later fail to play.
-   *
-   * @param {!shaka.extern.Variant} variant
-   * @return {boolean}
-   */
-  supportsVariant(variant) {
-    /** @type {?shaka.extern.Stream} */
-    const audio = variant.audio;
-    /** @type {?shaka.extern.Stream} */
-    const video = variant.video;
-
-    if (audio && audio.encrypted) {
-      const audioContentType = shaka.media.DrmEngine.computeMimeType_(audio);
-      if (!this.willSupport(audioContentType)) {
-        return false;
-      }
-    }
-
-    if (video && video.encrypted) {
-      const videoContentType = shaka.media.DrmEngine.computeMimeType_(video);
-      if (!this.willSupport(videoContentType)) {
-        return false;
-      }
-    }
-
-    const keySystem = shaka.util.DrmUtils.keySystem(this.currentDrmInfo_);
-    const drmInfos = this.getVariantDrmInfos_(variant);
-
-    return drmInfos.length == 0 ||
-        drmInfos.some((drmInfo) => drmInfo.keySystem == keySystem);
-  }
-
   /**
    * Concat the audio and video drmInfos in a variant.
    * @param {shaka.extern.Variant} variant

package/lib/media/media_source_engine.js

@@ -149,8 +149,9 @@ shaka.media.MediaSourceEngine = class {
     /** @private {?number} */
     this.lastDuration_ = null;
 
-    /** @private {?shaka.util.TsParser} */
-    this.tsParser_ = null;
+    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
+                           !shaka.util.TsParser>} */
+    this.tsParsers_ = {};
 
     /** @private {?number} */
     this.firstVideoTimestamp_ = null;
@@ -178,6 +179,8 @@ shaka.media.MediaSourceEngine = class {
    * @return {!MediaSource}
    */
   createMediaSource(p) {
+    this.streamingAllowed_ = true;
+
     /** @type {!MediaSource} */
     let mediaSource;
 
@@ -188,11 +191,13 @@ shaka.media.MediaSourceEngine = class {
 
       this.eventManager_.listen(
           mediaSource, 'startstreaming', () => {
+            shaka.log.info('MMS startstreaming');
             this.streamingAllowed_ = true;
           });
 
       this.eventManager_.listen(
           mediaSource, 'endstreaming', () => {
+            shaka.log.info('MMS endstreaming');
             this.streamingAllowed_ = false;
           });
     } else {
@@ -437,7 +442,7 @@ shaka.media.MediaSourceEngine = class {
     // This object is owned by Player
     this.lcevcDec_ = null;
 
-    this.tsParser_ = null;
+    this.tsParsers_ = {};
     this.playerInterface_ = null;
   }
 
@@ -489,7 +494,12 @@ shaka.media.MediaSourceEngine = class {
         this.manifestType_ == shaka.media.ManifestParser.HLS &&
         !this.ignoreManifestTimestampsInSegmentsMode_;
 
-    this.tsParser_ = null;
+    this.tsParsers_ = {};
+    this.firstVideoTimestamp_ = null;
+    this.firstVideoReferenceStartTime_ = null;
+    this.firstAudioTimestamp_ = null;
+    this.firstAudioReferenceStartTime_ = null;
+    this.audioCompensation_ = new shaka.util.PublicPromise();
 
     for (const contentType of streamsByType.keys()) {
       const stream = streamsByType.get(contentType);
@@ -649,8 +659,7 @@ shaka.media.MediaSourceEngine = class {
    * @return {?number} The timestamp in seconds, or null if nothing is buffered.
    */
   bufferStart(contentType) {
-    if (this.reloadingMediaSource_ ||
-          !Object.keys(this.sourceBuffers_).length) {
+    if (!Object.keys(this.sourceBuffers_).length) {
       return null;
     }
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
@@ -668,7 +677,7 @@ shaka.media.MediaSourceEngine = class {
    * @return {?number} The timestamp in seconds, or null if nothing is buffered.
    */
   bufferEnd(contentType) {
-    if (this.reloadingMediaSource_) {
+    if (!Object.keys(this.sourceBuffers_).length) {
       return null;
     }
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
@@ -688,9 +697,6 @@ shaka.media.MediaSourceEngine = class {
    * @return {boolean}
    */
   isBuffered(contentType, time) {
-    if (this.reloadingMediaSource_) {
-      return false;
-    }
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     if (contentType == ContentType.TEXT) {
       return this.textEngine_.isBuffered(time);
@@ -709,9 +715,6 @@ shaka.media.MediaSourceEngine = class {
    * @return {number} The amount of time buffered ahead in seconds.
    */
   bufferedAheadOf(contentType, time) {
-    if (this.reloadingMediaSource_) {
-      return 0;
-    }
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     if (contentType == ContentType.TEXT) {
       return this.textEngine_.bufferedAheadOf(time);
@@ -732,9 +735,9 @@ shaka.media.MediaSourceEngine = class {
     const info = {
       total: this.reloadingMediaSource_ ? [] :
         TimeRangesUtils.getBufferedInfo(this.video_.buffered),
-      audio: this.reloadingMediaSource_ ? [] :
+      audio:
         TimeRangesUtils.getBufferedInfo(this.getBuffered_(ContentType.AUDIO)),
-      video: this.reloadingMediaSource_ ? [] :
+      video:
         TimeRangesUtils.getBufferedInfo(this.getBuffered_(ContentType.VIDEO)),
       text: [],
     };
@@ -757,6 +760,9 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   getBuffered_(contentType) {
+    if (this.reloadingMediaSource_) {
+      return null;
+    }
     try {
       return this.sourceBuffers_[contentType].buffered;
     } catch (exception) {
@@ -787,13 +793,12 @@ shaka.media.MediaSourceEngine = class {
    * @param {?shaka.media.SegmentReference} reference The segment reference
    *   we are appending, or null for init segments
    * @param {!string} mimeType
-   * @param {!number} timestampOffset
-   * @return {?number}
+   * @return {{timestamp: ?number, metadata: !Array.<shaka.extern.ID3Metadata>}}
    * @private
    */
-  getTimestampAndDispatchMetadata_(contentType, data, reference, mimeType,
-      timestampOffset) {
+  getTimestampAndDispatchMetadata_(contentType, data, reference, mimeType) {
     let timestamp = null;
+    let metadata = [];
 
     const uint8ArrayData = shaka.util.BufferUtils.toUint8(data);
     if (shaka.util.MimeUtils.RAW_FORMATS.includes(mimeType)) {
@@ -807,7 +812,7 @@ shaka.media.MediaSourceEngine = class {
           timestamp = Math.round(metadataTimestamp.data) / 1000;
         }
         /** @private {shaka.extern.ID3Metadata} */
-        const metadata = {
+        const id3Metadata = {
           cueTime: reference.startTime,
           data: uint8ArrayData,
           frames: frames,
@@ -815,7 +820,7 @@ shaka.media.MediaSourceEngine = class {
           pts: reference.startTime,
         };
         this.playerInterface_.onMetadata(
-            [metadata], /* offset= */ 0, reference.endTime);
+            [id3Metadata], /* offset= */ 0, reference.endTime);
       }
     } else if (mimeType.includes('/mp4') &&
         reference && reference.timestampOffset == 0 &&
@@ -845,23 +850,19 @@ shaka.media.MediaSourceEngine = class {
       }
     } else if (!mimeType.includes('/mp4') && !mimeType.includes('/webm') &&
         shaka.util.TsParser.probe(uint8ArrayData)) {
-      if (!this.tsParser_) {
-        this.tsParser_ = new shaka.util.TsParser();
+      if (!this.tsParsers_[contentType]) {
+        this.tsParsers_[contentType] = new shaka.util.TsParser();
       } else {
-        this.tsParser_.clearData();
+        this.tsParsers_[contentType].clearData();
       }
-      const tsParser = this.tsParser_.parse(uint8ArrayData);
+      const tsParser = this.tsParsers_[contentType].parse(uint8ArrayData);
       const startTime = tsParser.getStartTime(contentType);
       if (startTime != null) {
         timestamp = startTime;
       }
-      const metadata = tsParser.getMetadata();
-      if (metadata.length) {
-        this.playerInterface_.onMetadata(metadata, timestampOffset,
-            reference ? reference.endTime : null);
-      }
+      metadata = tsParser.getMetadata();
     }
-    return timestamp;
+    return {timestamp, metadata};
   }
 
   /**
@@ -890,7 +891,8 @@ shaka.media.MediaSourceEngine = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     if (contentType == ContentType.TEXT) {
-      if (this.sequenceMode_) {
+      if (this.manifestType_ == shaka.media.ManifestParser.HLS &&
+          reference.discontinuitySequence >= 0) {
         // This won't be known until the first video segment is appended.
         const offset = await this.textSequenceModeOffset_;
         this.textEngine_.setTimestampOffset(offset);
@@ -925,8 +927,8 @@ shaka.media.MediaSourceEngine = class {
       mimeType = this.transmuxers_[contentType].getOriginalMimeType();
     }
     if (reference) {
-      const timestamp = this.getTimestampAndDispatchMetadata_(
-          contentType, data, reference, mimeType, timestampOffset);
+      const {timestamp, metadata} = this.getTimestampAndDispatchMetadata_(
+          contentType, data, reference, mimeType);
       if (timestamp != null) {
         if (this.firstVideoTimestamp_ == null &&
             contentType == ContentType.VIDEO) {
@@ -984,10 +986,14 @@ shaka.media.MediaSourceEngine = class {
         const isBestSourceBufferForTimestamps =
             contentType == ContentType.VIDEO ||
             !(ContentType.VIDEO in this.sourceBuffers_);
-        if (this.sequenceMode_ && isBestSourceBufferForTimestamps) {
+        if (isBestSourceBufferForTimestamps) {
           this.textSequenceModeOffset_.resolve(timestampOffset);
         }
       }
+      if (metadata.length) {
+        this.playerInterface_.onMetadata(metadata, timestampOffset,
+            reference ? reference.endTime : null);
+      }
     }
     if (hasClosedCaptions && contentType == ContentType.VIDEO) {
       if (!this.textEngine_) {
@@ -1309,6 +1315,10 @@ shaka.media.MediaSourceEngine = class {
       this.textSequenceModeOffset_ = new shaka.util.PublicPromise();
     }
 
+    if (!this.sequenceMode_) {
+      return;
+    }
+
     // Queue an abort() to help MSE splice together overlapping segments.
     // We set appendWindowEnd when we change periods in DASH content, and the
     // period transition may result in overlap.
@@ -1847,6 +1857,48 @@ shaka.media.MediaSourceEngine = class {
         null);
   }
 
+  /**
+   * Returns the source buffer parameters
+   * @param {shaka.util.ManifestParserUtils.ContentType} contentType
+   * @return {?shaka.media.MediaSourceEngine.SourceBufferParams}
+   * @private
+   */
+  getSourceBufferParams_(contentType) {
+    if (!this.sourceBuffers_[contentType]) {
+      return null;
+    }
+    return {
+      timestampOffset: this.sourceBuffers_[contentType].timestampOffset,
+      appendWindowStart: this.sourceBuffers_[contentType].appendWindowStart,
+      appendWindowEnd: this.sourceBuffers_[contentType].appendWindowEnd,
+    };
+  }
+
+  /**
+   * Restore source buffer parameters
+   * @param {shaka.util.ManifestParserUtils.ContentType} contentType
+   * @param {?shaka.media.MediaSourceEngine.SourceBufferParams} params
+   * @private
+   */
+  restoreSourceBufferParams_(contentType, params) {
+    if (!params) {
+      return;
+    }
+
+    if (!this.sourceBuffers_[contentType]) {
+      shaka.log.warning('Attempted to restore a non-existent source buffer');
+      return;
+    }
+
+    this.sourceBuffers_[contentType].timestampOffset =
+      params.timestampOffset;
+    // `end` needs to be set before `start`
+    this.sourceBuffers_[contentType].appendWindowEnd =
+      params.appendWindowEnd;
+    this.sourceBuffers_[contentType].appendWindowStart =
+      params.appendWindowStart;
+  }
+
   /**
    * Resets the MediaSource and re-adds source buffers due to codec mismatch
    *
@@ -1907,7 +1959,6 @@ shaka.media.MediaSourceEngine = class {
       }
       await Promise.all(cleanup);
       this.transmuxers_ = {};
-      this.sourceBuffers_ = {};
 
       const previousDuration = this.mediaSource_.duration;
       this.mediaSourceOpen_ = new shaka.util.PublicPromise();
@@ -1938,6 +1989,7 @@ shaka.media.MediaSourceEngine = class {
           onSourceBufferAdded);
 
       for (const contentType of streamsByType.keys()) {
+        const previousParams = this.getSourceBufferParams_(contentType);
         const stream = streamsByType.get(contentType);
         // eslint-disable-next-line no-await-in-loop
         await this.initSourceBuffer_(contentType, stream, stream.codecs);
@@ -1947,6 +1999,8 @@ shaka.media.MediaSourceEngine = class {
         } else {
           this.queues_[contentType] = [];
         }
+
+        this.restoreSourceBufferParams_(contentType, previousParams);
       }
 
       // Fake a seek to catchup the playhead.
@@ -2234,3 +2288,12 @@ shaka.media.MediaSourceEngine.SourceBufferMode_ = {
  *   Callback to use when metadata arrives.
  */
 shaka.media.MediaSourceEngine.PlayerInterface;
+
+/**
+ * @typedef {{
+ *   timestampOffset: number,
+ *   appendWindowStart: number,
+ *   appendWindowEnd: number
+ * }}
+ */
+shaka.media.MediaSourceEngine.SourceBufferParams;