hls.js 1.6.0-beta.1.0.canary.10826 → 1.6.0-beta.2.0.canary.10828

package/dist/hls.light.mjs

@@ -401,7 +401,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.6.0-beta.1.0.canary.10826"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10828"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9356,12 +9356,8 @@ class BufferController extends Logger {
     const trackNames = transferredTracks ? Object.keys(transferredTracks) : null;
     const trackCount = trackNames ? trackNames.length : 0;
     const mediaSourceOpenCallback = () => {
-      if (this.media) {
-        var _this$mediaSource2;
-        const readyState = (_this$mediaSource2 = this.mediaSource) == null ? void 0 : _this$mediaSource2.readyState;
-        if (readyState === 'open' || readyState === 'ended') {
-          this._onMediaSourceOpen();
-        }
+      if (this.media && this.mediaSourceOpenOrEnded) {
+        this._onMediaSourceOpen();
       }
     };
     if (transferredTracks && trackNames && trackCount) {
@@ -9423,6 +9419,11 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
       mediaSourceOpenCallback();
     }
   }
+  get mediaSourceOpenOrEnded() {
+    var _this$mediaSource2;
+    const readyState = (_this$mediaSource2 = this.mediaSource) == null ? void 0 : _this$mediaSource2.readyState;
+    return readyState === 'open' || readyState === 'ended';
+  }
   onMediaDetaching(event, data) {
     const transferringMedia = !!data.transferMedia;
     this.transferData = this.overrides = undefined;
@@ -9443,18 +9444,23 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
         });
         this.resetQueue();
       } else {
-        if (mediaSource.readyState === 'open') {
+        if (this.mediaSourceOpenOrEnded) {
+          const open = mediaSource.readyState === 'open';
           try {
             const sourceBuffers = mediaSource.sourceBuffers;
             for (let i = sourceBuffers.length; i--;) {
-              sourceBuffers[i].abort();
+              if (open) {
+                sourceBuffers[i].abort();
+              }
               mediaSource.removeSourceBuffer(sourceBuffers[i]);
             }
-            // endOfStream could trigger exception if any sourcebuffer is in updating state
-            // we don't really care about checking sourcebuffer state here,
-            // as we are anyway detaching the MediaSource
-            // let's just avoid this exception to propagate
-            mediaSource.endOfStream();
+            if (open) {
+              // endOfStream could trigger exception if any sourcebuffer is in updating state
+              // we don't really care about checking sourcebuffer state here,
+              // as we are anyway detaching the MediaSource
+              // let's just avoid this exception to propagate
+              mediaSource.endOfStream();
+            }
           } catch (err) {
             this.warn(`onMediaDetaching: ${err.message} while calling endOfStream`);
           }
@@ -9603,7 +9609,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
     if (this.sourceBufferCount) {
       return;
     }
-    if (this.mediaSource !== null && this.mediaSource.readyState === 'open') {
+    if (this.mediaSourceOpenOrEnded) {
       this.checkPendingTracks();
     }
   }
@@ -9806,7 +9812,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
         });
       },
       onError: error => {
-        var _this$mediaSource4, _this$media;
+        var _this$media;
         // in case any error occured while appending, put back segment in segments table
         const event = {
           type: ErrorTypes.MEDIA_ERROR,
@@ -9824,7 +9830,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
           // QuotaExceededError: http://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror
           // let's stop appending any segments, and report BUFFER_FULL_ERROR error
           event.details = ErrorDetails.BUFFER_FULL_ERROR;
-        } else if (error.code === DOMException.INVALID_STATE_ERR && ((_this$mediaSource4 = this.mediaSource) == null ? void 0 : _this$mediaSource4.readyState) === 'open' && !((_this$media = this.media) != null && _this$media.error)) {
+        } else if (error.code === DOMException.INVALID_STATE_ERR && this.mediaSourceOpenOrEnded && !((_this$media = this.media) != null && _this$media.error)) {
           // Allow retry for "Failed to execute 'appendBuffer' on 'SourceBuffer': This SourceBuffer is still processing" errors
           event.errorAction = createDoNothingErrorAction(true);
         } else if (error.name === TRACK_REMOVED_ERROR_NAME) {
@@ -10323,8 +10329,8 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
     operation.onStart();
   }
   onSBUpdateEnd(type) {
-    var _this$mediaSource5;
-    if (((_this$mediaSource5 = this.mediaSource) == null ? void 0 : _this$mediaSource5.readyState) === 'closed') {
+    var _this$mediaSource4;
+    if (((_this$mediaSource4 = this.mediaSource) == null ? void 0 : _this$mediaSource4.readyState) === 'closed') {
       this.resetBuffer(type);
       return;
     }
@@ -10336,8 +10342,8 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
     this.shiftAndExecuteNext(type);
   }
   onSBUpdateError(type, event) {
-    var _this$mediaSource6;
-    const error = new Error(`${type} SourceBuffer error. MediaSource readyState: ${(_this$mediaSource6 = this.mediaSource) == null ? void 0 : _this$mediaSource6.readyState}`);
+    var _this$mediaSource5;
+    const error = new Error(`${type} SourceBuffer error. MediaSource readyState: ${(_this$mediaSource5 = this.mediaSource) == null ? void 0 : _this$mediaSource5.readyState}`);
     this.error(`${error}`, event);
     // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error
     // SourceBuffer errors are not necessarily fatal; if so, the HTMLMediaElement will fire an error event
@@ -19166,7 +19172,7 @@ class GapController extends Logger {
   }
 }
 
-const version = "1.6.0-beta.1.0.canary.10826";
+const version = "1.6.0-beta.2.0.canary.10828";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js