handle switch stream properly

tyrelltle · Dec 3, 2022 · ca32f5a · ca32f5a
1 parent bb601d8
commit ca32f5a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/lib/media/segment_prefetch.js b/lib/media/segment_prefetch.js
@@ -65,6 +65,12 @@ shaka.media.SegmentPrefetch = class {
     const logPrefix = shaka.media.SegmentPrefetch.logPrefix_(
         this.stream_,
     );
+    if (!this.stream_.segmentIndex) {
+      shaka.log.info(
+          logPrefix, 'missing segmentIndex',
+      );
+      return;
+    }
     const currTime = segmentIterator.current().startTime;
     const maxTime = Math.max(currTime, this.prefetchPosTime_);
     const it = this.stream_.segmentIndex.getIteratorForTime(maxTime);
@@ -122,6 +128,14 @@ shaka.media.SegmentPrefetch = class {
     return op;
   }
 
+  /**
+   * Clear all segment data.
+   * @public
+   */
+  clearAll() {
+    this.clearWithinRange(0, 0);
+  }
+
   /**
    * Clear prefetched segment data within given time range.
    * @param {number} startTime
@@ -148,24 +162,27 @@ shaka.media.SegmentPrefetch = class {
   }
 
   /**
-   * Clear all segment data.
+   * Reset the prefetchLimit and clear all internal states.
+   * Called by StreamingEngine when configure() was called.
+   * @param {number} prefetchLimit
    * @public
    */
-  clearAll() {
-    this.clearWithinRange(0, 0);
+  resetLimit(prefetchLimit) {
+    if (prefetchLimit !== this.prefetchLimit_) {
+      this.clearAll();
+      this.prefetchLimit_ = prefetchLimit;
+    }
   }
 
   /**
-   * Reset the prefetchLimit and clear all internal states.
-   * Called by StreamingEngine when configure() was called.
-   * @param {number} prefetchLimit.
+   * Called by Streaming Engine when switching variant.
+   * @param {shaka.extern.Stream} stream
    * @public
    */
-  reset(prefetchLimit) {
-    if (prefetchLimit !== this.prefetchLimit_) {
+  switchStream(stream) {
+    if (stream && stream !== this.stream_) {
       this.clearAll();
-      this.prefetchLimit_ = prefetchLimit;
-      this.prefetchPosTime_ = 0;
+      this.stream_ = stream;
     }
   }
 

diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
@@ -171,12 +171,12 @@ shaka.media.StreamingEngine = class {
     const autoReset = true;
     this.failureCallbackBackoff_ =
         new shaka.net.Backoff(failureRetryParams, autoReset);
-    
+
     // Allow configuring the segment prefetch in middle of the playback.
     for (const type of this.mediaStates_.keys()) {
       const state = this.mediaStates_.get(type);
       if (state.segmentPrefetch) {
-        state.segmentPrefetch.reset(config.segmentPrefetchLimit);
+        state.segmentPrefetch.resetLimit(config.segmentPrefetchLimit);
       } else {
         state.segmentPrefetch = this.createSegmentPrefetch_(state.stream);
       }
@@ -450,6 +450,10 @@ shaka.media.StreamingEngine = class {
       return;
     }
 
+    if (mediaState.segmentPrefetch) {
+      mediaState.segmentPrefetch.switchStream(stream);
+    }
+
     if (stream.type == ContentType.TEXT) {
       // Mime types are allowed to change for text streams.
       // Reinitialize the text parser, but only if we are going to fetch the
@@ -2123,7 +2127,8 @@ shaka.media.StreamingEngine = class {
       const duration = this.playerInterface_.mediaSourceEngine.getDuration();
       if (mediaState.segmentPrefetch) {
         mediaState.segmentPrefetch.clearWithinRange(
-            presentationTime + safeMargin, duration,
+            presentationTime + safeMargin,
+            duration,
         );
       }
       await this.playerInterface_.mediaSourceEngine.remove(
@@ -2140,11 +2145,17 @@ shaka.media.StreamingEngine = class {
             mediaState.type);
       }
     }
+
+    if (mediaState.segmentPrefetch) {
+      mediaState.segmentPrefetch.clearAll();
+    }
+
     this.destroyer_.ensureNotDestroyed();
 
     shaka.log.debug(logPrefix, 'cleared buffer');
     mediaState.clearingBuffer = false;
     mediaState.endOfStream = false;
+
     this.scheduleUpdate_(mediaState, 0);
   }