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

package/dist/hls.js

@@ -644,7 +644,7 @@
       // 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.10054");
+        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();
@@ -4766,11 +4766,10 @@
       this.media = data.media;
     };
     _proto.onMediaDetaching = function 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 = {};
     };
@@ -19300,34 +19299,34 @@
           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);
     };
     _proto.onBufferReset = function onBufferReset() {
@@ -22578,7 +22577,7 @@
       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;
     };
     _proto.initCea608Parsers = function initCea608Parsers() {
@@ -22733,6 +22732,7 @@
         delete captionsTracks[trackName];
       });
       this.nonNativeCaptionsTracks = {};
+      this.media = null;
     };
     _proto.onManifestLoading = function onManifestLoading() {
       // Detect discontinuity in video fragment (CEA-608) parsing
@@ -23399,9 +23399,11 @@
     };
     _proto.registerListeners = function registerListeners() {
       this.hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+      this.hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     };
     _proto.unregisterListeners = function unregisterListeners() {
       this.hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+      this.hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     };
     _proto.destroy = function destroy() {
       if (this.timer) {
@@ -23423,6 +23425,9 @@
         this.timer = self.setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod);
       }
     };
+    _proto.onMediaDetaching = function onMediaDetaching() {
+      this.media = null;
+    };
     _proto.checkFPS = function checkFPS(video, decodedFrames, droppedFrames) {
       var currentTime = performance.now();
       if (decodedFrames) {
@@ -25458,7 +25463,7 @@
       // @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;
     };
     _proto.onMediaAttached = function onMediaAttached(event, data) {
       this.media = data.media;
@@ -25595,7 +25600,7 @@
      * Get the buffer length for a media type in milliseconds
      */;
     _proto.getBufferLength = function getBufferLength(type) {
-      var media = this.hls.media;
+      var media = this.media;
       var buffer = type === CmObjectType.AUDIO ? this.audioBuffer : this.videoBuffer;
       if (!buffer || !media) {
         return NaN;
@@ -28621,8 +28626,8 @@
       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();
@@ -30220,7 +30225,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.8-0.canary.10054";
+        return "1.5.8-0.canary.10055";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -1070,6 +1070,7 @@ export declare class FPSController implements ComponentAPI {
     protected unregisterListeners(): void;
     destroy(): void;
     protected onMediaAttaching(event: Events.MEDIA_ATTACHING, data: MediaAttachingData): void;
+    private onMediaDetaching;
     checkFPS(video: HTMLVideoElement, decodedFrames: number, droppedFrames: number): void;
     checkFPSInterval(): void;
 }