fix: Don't clear the buffer when disable a stream (#6931)

shaka-project · Jul 1, 2024 · 53a1147 · 53a1147
1 parent 190fa3f
commit 53a1147
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
@@ -613,6 +613,10 @@ shaka.media.StreamingEngine = class {
               }
             });
       }
+    } else {
+      if (!mediaState.performingUpdate && !mediaState.updateTimer) {
+        this.scheduleUpdate_(mediaState, 0);
+      }
     }
 
     this.makeAbortDecision_(mediaState).catch((error) => {

diff --git a/lib/player.js b/lib/player.js
@@ -6476,7 +6476,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (hasVariantUpdate) {
       // Reconsider re-enabled variant for ABR switching.
       this.chooseVariantAndSwitch_(
-          /* clearBuffer= */ true, /* safeMargin= */ undefined,
+          /* clearBuffer= */ false, /* safeMargin= */ undefined,
           /* force= */ false, /* fromAdaptation= */ false);
     }
   }
@@ -6937,7 +6937,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       // Update abr manager variants and switch to recover playback
       this.chooseVariantAndSwitch_(
-          /* clearBuffer= */ true, /* safeMargin= */ safeMargin,
+          /* clearBuffer= */ false, /* safeMargin= */ safeMargin,
           /* force= */ true, /* fromAdaptation= */ false);
       return true;
     }