mediaController : pause fragment loading during buffer flush

dailymotion · Feb 2, 2016 · 523b177 · 523b177
1 parent e0be290
commit 523b177
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/controller/mse-media-controller.js b/src/controller/mse-media-controller.js
@@ -14,6 +14,7 @@ const State = {
   ERROR : 'ERROR',
   STARTING : 'STARTING',
   IDLE : 'IDLE',
+  PAUSED : 'PAUSED',
   KEY_LOADING : 'KEY_LOADING',
   FRAG_LOADING : 'FRAG_LOADING',
   FRAG_LOADING_WAITING_RETRY : 'FRAG_LOADING_WAITING_RETRY',
@@ -145,6 +146,8 @@ class MSEMediaController extends EventHandler {
     switch(this.state) {
       case State.ERROR:
         //don't do anything in error state to avoid breaking further ...
+      case State.PAUSED:
+        //don't do anything in paused state either ...
         break;
       case State.STARTING:
         // determine load level
@@ -636,6 +639,7 @@ class MSEMediaController extends EventHandler {
     this.fragCurrent = null;
     // flush everything
     this.hls.trigger(Event.BUFFER_FLUSHING, {startOffset: 0, endOffset: Number.POSITIVE_INFINITY});
+    this.state = State.PAUSED;
     // increase fragment load Index to avoid frag loop loading error after buffer flush
     this.fragLoadIdx += 2 * this.config.fragLoadingLoopThreshold;
     // speed up switching, trigger timer function
@@ -667,6 +671,7 @@ class MSEMediaController extends EventHandler {
     // flush buffer preceding current fragment (flush until current fragment start offset)
     // minus 1s to avoid video freezing, that could happen if we flush keyframe of current video ...
       this.hls.trigger(Event.BUFFER_FLUSHING, {startOffset: 0, endOffset: currentRange.start - 1});
+      this.state = State.PAUSED;
     }
     if (!this.media.paused) {
       // add a safety delay of 1s
@@ -688,6 +693,7 @@ class MSEMediaController extends EventHandler {
       if (nextRange) {
         // flush position is the start position of this new buffer
         this.hls.trigger(Event.BUFFER_FLUSHING, {startOffset: nextRange.start, endOffset: Number.POSITIVE_INFINITY});
+        this.state = State.PAUSED;
         // if we are here, we can also cancel any loading/demuxing in progress, as they are useless
         var fragCurrent = this.fragCurrent;
         if (fragCurrent && fragCurrent.loader) {