hls.js 1.5.8-0.canary.10052 → 1.5.8-0.canary.10055

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.8-0.canary.10052"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.8-0.canary.10055"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -4524,11 +4524,10 @@ class ID3TrackController {
     this.media = data.media;
   }
   onMediaDetaching() {
-    if (!this.id3Track) {
-      return;
+    if (this.id3Track) {
+      clearCurrentCues(this.id3Track);
+      this.id3Track = null;
     }
-    clearCurrentCues(this.id3Track);
-    this.id3Track = null;
     this.media = null;
     this.dateRangeCuesAppended = {};
   }
@@ -18760,34 +18759,34 @@ class BufferController extends Logger {
         mediaSource.removeEventListener('startstreaming', this._onStartStreaming);
         mediaSource.removeEventListener('endstreaming', this._onEndStreaming);
       }
+      this.mediaSource = null;
+      this._objectUrl = null;
+    }
 
-      // Detach properly the MediaSource from the HTMLMediaElement as
-      // suggested in https://github.com/w3c/media-source/issues/53.
-      if (media) {
-        media.removeEventListener('emptied', this._onMediaEmptied);
-        if (_objectUrl) {
-          self.URL.revokeObjectURL(_objectUrl);
-        }
+    // Detach properly the MediaSource from the HTMLMediaElement as
+    // suggested in https://github.com/w3c/media-source/issues/53.
+    if (media) {
+      media.removeEventListener('emptied', this._onMediaEmptied);
+      if (_objectUrl) {
+        self.URL.revokeObjectURL(_objectUrl);
+      }
 
-        // clean up video tag src only if it's our own url. some external libraries might
-        // hijack the video tag and change its 'src' without destroying the Hls instance first
-        if (this.mediaSrc === _objectUrl) {
-          media.removeAttribute('src');
-          if (this.appendSource) {
-            removeSourceChildren(media);
-          }
-          media.load();
-        } else {
-          this.warn('media|source.src was changed by a third party - skip cleanup');
+      // clean up video tag src only if it's our own url. some external libraries might
+      // hijack the video tag and change its 'src' without destroying the Hls instance first
+      if (this.mediaSrc === _objectUrl) {
+        media.removeAttribute('src');
+        if (this.appendSource) {
+          removeSourceChildren(media);
         }
+        media.load();
+      } else {
+        this.warn('media|source.src was changed by a third party - skip cleanup');
       }
-      this.mediaSource = null;
       this.media = null;
-      this._objectUrl = null;
-      this.bufferCodecEventsExpected = this._bufferCodecEventsTotal;
-      this.pendingTracks = {};
-      this.tracks = {};
     }
+    this.bufferCodecEventsExpected = this._bufferCodecEventsTotal;
+    this.pendingTracks = {};
+    this.tracks = {};
     this.hls.trigger(Events.MEDIA_DETACHED, undefined);
   }
   onBufferReset() {
@@ -21997,7 +21996,7 @@ class TimelineController {
     hls.off(Events.SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
     hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
     // @ts-ignore
-    this.hls = this.config = null;
+    this.hls = this.config = this.media = null;
     this.cea608Parser1 = this.cea608Parser2 = undefined;
   }
   initCea608Parsers() {
@@ -22160,6 +22159,7 @@ class TimelineController {
       delete captionsTracks[trackName];
     });
     this.nonNativeCaptionsTracks = {};
+    this.media = null;
   }
   onManifestLoading() {
     // Detect discontinuity in video fragment (CEA-608) parsing
@@ -22820,9 +22820,11 @@ class FPSController {
   }
   registerListeners() {
     this.hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    this.hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
   }
   unregisterListeners() {
     this.hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    this.hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
   }
   destroy() {
     if (this.timer) {
@@ -22844,6 +22846,9 @@ class FPSController {
       this.timer = self.setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod);
     }
   }
+  onMediaDetaching() {
+    this.media = null;
+  }
   checkFPS(video, decodedFrames, droppedFrames) {
     const currentTime = performance.now();
     if (decodedFrames) {
@@ -24823,7 +24828,7 @@ class CMCDController {
     // @ts-ignore
     this.hls = this.config = this.audioBuffer = this.videoBuffer = null;
     // @ts-ignore
-    this.onWaiting = this.onPlaying = null;
+    this.onWaiting = this.onPlaying = this.media = null;
   }
   onMediaAttached(event, data) {
     this.media = data.media;
@@ -24960,7 +24965,7 @@ class CMCDController {
    * Get the buffer length for a media type in milliseconds
    */
   getBufferLength(type) {
-    const media = this.hls.media;
+    const media = this.media;
     const buffer = type === CmObjectType.AUDIO ? this.audioBuffer : this.videoBuffer;
     if (!buffer || !media) {
       return NaN;
@@ -27962,8 +27967,8 @@ class StreamController extends BaseStreamController {
     if (media) {
       media.removeEventListener('playing', this.onMediaPlaying);
       media.removeEventListener('seeked', this.onMediaSeeked);
-      this.videoBuffer = null;
     }
+    this.videoBuffer = null;
     this.fragPlaying = null;
     if (this.gapController) {
       this.gapController.destroy();
@@ -28714,7 +28719,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.8-0.canary.10052";
+    return "1.5.8-0.canary.10055";
   }
 
   /**