fix: Evict text buffer when unload the text stream (#7360)

shaka-project · Sep 24, 2024 · 5b6652f · 5b6652f
1 parent 43314a1
commit 5b6652f
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
@@ -148,6 +148,9 @@ shaka.media.StreamingEngine = class {
 
     /** @private {number} */
     this.playRangeEnd_ = Infinity;
+
+    /** @private {?shaka.media.StreamingEngine.MediaState_} */
+    this.lastTextMediaStateBeforeUnload_ = null;
   }
 
   /** @override */
@@ -380,6 +383,8 @@ shaka.media.StreamingEngine = class {
     if (state) {
       this.cancelUpdate_(state);
       this.abortOperations_(state).catch(() => {});
+      this.lastTextMediaStateBeforeUnload_ =
+          this.mediaStates_.get(ContentType.TEXT);
       this.mediaStates_.delete(ContentType.TEXT);
     }
     this.currentTextStream_ = null;
@@ -476,6 +481,7 @@ shaka.media.StreamingEngine = class {
    * @param {shaka.extern.Stream} textStream
    */
   async switchTextStream(textStream) {
+    this.lastTextMediaStateBeforeUnload_ = null;
     this.currentTextStream_ = textStream;
 
     if (!this.startupComplete_) {
@@ -2539,6 +2545,9 @@ shaka.media.StreamingEngine = class {
     const startTime =
         this.playerInterface_.mediaSourceEngine.bufferStart(mediaState.type);
     if (startTime == null) {
+      if (this.lastTextMediaStateBeforeUnload_ == mediaState) {
+        this.lastTextMediaStateBeforeUnload_ = null;
+      }
       shaka.log.v2(logPrefix,
           'buffer behind okay because nothing buffered:',
           'presentationTime=' + presentationTime,
@@ -2573,6 +2582,11 @@ shaka.media.StreamingEngine = class {
 
     this.destroyer_.ensureNotDestroyed();
     shaka.log.v1(logPrefix, 'evicted ' + overflow + ' seconds');
+
+    if (this.lastTextMediaStateBeforeUnload_) {
+      await this.evict_(this.lastTextMediaStateBeforeUnload_, presentationTime);
+      this.destroyer_.ensureNotDestroyed();
+    }
   }