hls.js 1.5.7-0.canary.10021 → 1.5.7-0.canary.10023

package/dist/hls.mjs

@@ -512,7 +512,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.7-0.canary.10021"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.7-0.canary.10023"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -8064,40 +8064,29 @@ class BufferHelper {
    * Return true if `media`'s buffered include `position`
    */
   static isBuffered(media, position) {
-    try {
-      if (media) {
-        const buffered = BufferHelper.getBuffered(media);
-        for (let i = 0; i < buffered.length; i++) {
-          if (position >= buffered.start(i) && position <= buffered.end(i)) {
-            return true;
-          }
+    if (media) {
+      const buffered = BufferHelper.getBuffered(media);
+      for (let i = buffered.length; i--;) {
+        if (position >= buffered.start(i) && position <= buffered.end(i)) {
+          return true;
         }
       }
-    } catch (error) {
-      // this is to catch
-      // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
-      // This SourceBuffer has been removed from the parent media source
     }
     return false;
   }
   static bufferInfo(media, pos, maxHoleDuration) {
-    try {
-      if (media) {
-        const vbuffered = BufferHelper.getBuffered(media);
+    if (media) {
+      const vbuffered = BufferHelper.getBuffered(media);
+      if (vbuffered.length) {
         const buffered = [];
-        let i;
-        for (i = 0; i < vbuffered.length; i++) {
+        for (let i = 0; i < vbuffered.length; i++) {
           buffered.push({
             start: vbuffered.start(i),
             end: vbuffered.end(i)
           });
         }
-        return this.bufferedInfo(buffered, pos, maxHoleDuration);
+        return BufferHelper.bufferedInfo(buffered, pos, maxHoleDuration);
       }
-    } catch (error) {
-      // this is to catch
-      // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
-      // This SourceBuffer has been removed from the parent media source
     }
     return {
       len: 0,
@@ -8109,14 +8098,7 @@ class BufferHelper {
   static bufferedInfo(buffered, pos, maxHoleDuration) {
     pos = Math.max(0, pos);
     // sort on buffer.start/smaller end (IE does not always return sorted buffered range)
-    buffered.sort(function (a, b) {
-      const diff = a.start - b.start;
-      if (diff) {
-        return diff;
-      } else {
-        return b.end - a.end;
-      }
-    });
+    buffered.sort((a, b) => a.start - b.start || b.end - a.end);
     let buffered2 = [];
     if (maxHoleDuration) {
       // there might be some small holes between buffer time range
@@ -8183,7 +8165,7 @@ class BufferHelper {
    */
   static getBuffered(media) {
     try {
-      return media.buffered;
+      return media.buffered || noopBuffered;
     } catch (e) {
       logger.log('failed to get media.buffered', e);
       return noopBuffered;
@@ -10399,7 +10381,9 @@ class BaseStreamController extends TaskLoop {
     this.log('Reset loading state');
     this.fragCurrent = null;
     this.fragPrevious = null;
-    this.state = State.IDLE;
+    if (this.state !== State.STOPPED) {
+      this.state = State.IDLE;
+    }
   }
   resetStartWhenNotLoaded(level) {
     // if loadedmetadata is not set, it means that first frag request failed
@@ -16736,7 +16720,9 @@ class AudioStreamController extends BaseStreamController {
       this.fragmentTracker.removeFragment(waitingData.frag);
       this.waitingData = null;
       this.waitingVideoCC = -1;
-      this.state = State.IDLE;
+      if (this.state !== State.STOPPED) {
+        this.state = State.IDLE;
+      }
     }
   }
   resetLoadingState() {
@@ -16876,26 +16862,25 @@ class AudioStreamController extends BaseStreamController {
       this.removeUnbufferedFrags(fragCurrent.start);
     }
     this.resetLoadingState();
-    // destroy useless transmuxer when switching audio to main
-    if (!altAudio) {
-      this.resetTransmuxer();
-    } else {
-      // switching to audio track, start timer if not already started
-      this.setInterval(TICK_INTERVAL$2);
-    }
 
     // should we switch tracks ?
     if (altAudio) {
       this.switchingTrack = data;
       // main audio track are handled by stream-controller, just do something if switching to alt audio track
-      this.state = State.IDLE;
       this.flushAudioIfNeeded(data);
+      if (this.state !== State.STOPPED) {
+        // switching to audio track, start timer if not already started
+        this.setInterval(TICK_INTERVAL$2);
+        this.state = State.IDLE;
+        this.tick();
+      }
     } else {
+      // destroy useless transmuxer when switching audio to main
+      this.resetTransmuxer();
       this.switchingTrack = null;
       this.bufferedTrack = data;
-      this.state = State.STOPPED;
+      this.clearInterval();
     }
-    this.tick();
   }
   onManifestLoading() {
     this.fragmentTracker.removeAllFragments();
@@ -17812,7 +17797,7 @@ class SubtitleStreamController extends BaseStreamController {
     } else {
       this.mediaBuffer = null;
     }
-    if (currentTrack) {
+    if (currentTrack && this.state !== State.STOPPED) {
       this.setInterval(TICK_INTERVAL$1);
     }
   }
@@ -28713,7 +28698,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.7-0.canary.10021";
+    return "1.5.7-0.canary.10023";
   }
 
   /**