Fix IE11 smooth switch stuck in PARSING state

Fix demo Timeline media buffers in IE11
video-dev · Apr 1, 2021 · 22d983a · 22d983a
1 parent d4c5ffc
commit 22d983a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/demo/chart/timeline-chart.ts b/demo/chart/timeline-chart.ts
@@ -435,7 +435,7 @@ export class TimelineChart {
           sourceBuffer,
         })
       );
-      sourceBuffer.onupdate = () => {
+      sourceBuffer.addEventListener('update', () => {
         try {
           replaceTimeRangeTuples(sourceBuffer.buffered, data);
         } catch (error) {
@@ -445,7 +445,7 @@ export class TimelineChart {
         }
         replaceTimeRangeTuples(media.buffered, mediaBufferData);
         this.update();
-      };
+      });
     });
 
     if (trackTypes.length === 0) {

diff --git a/src/controller/base-stream-controller.ts b/src/controller/base-stream-controller.ts
@@ -312,10 +312,12 @@ export default class BaseStreamController
           return;
         }
         this.fragLoadError = 0;
+        const state = this.state;
         if (this.fragContextChanged(frag)) {
           if (
-            this.state === State.FRAG_LOADING ||
-            this.state === State.BACKTRACKING
+            state === State.FRAG_LOADING ||
+            state === State.BACKTRACKING ||
+            (!this.fragCurrent && state === State.PARSING)
           ) {
             this.fragmentTracker.removeFragment(frag);
             this.state = State.IDLE;

diff --git a/src/controller/buffer-controller.ts b/src/controller/buffer-controller.ts
@@ -398,7 +398,7 @@ export default class BufferController implements ComponentAPI {
             browser is able to evict some data from sourcebuffer. Retrying can help recover.
           */
           if (this.appendError > hls.config.appendErrorMaxRetry) {
-            logger.log(
+            logger.error(
               `[buffer-controller]: Failed ${hls.config.appendErrorMaxRetry} times to append segment in sourceBuffer`
             );
             event.fatal = true;

diff --git a/src/controller/stream-controller.ts b/src/controller/stream-controller.ts
@@ -470,11 +470,11 @@ export default class StreamController
 
   private abortCurrentFrag() {
     const fragCurrent = this.fragCurrent;
+    this.fragCurrent = null;
     if (fragCurrent?.loader) {
       fragCurrent.loader.abort();
     }
     this.nextLoadPosition = this.getLoadPosition();
-    this.fragCurrent = null;
   }
 
   protected flushMainBuffer(startOffset: number, endOffset: number) {