Log error and detach if MediaSource 'sourceopen' is interrupted (#5206)

video-dev · Feb 7, 2023 · bf49dd2 · bf49dd2
1 parent 9e33ff0
commit bf49dd2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/controller/buffer-controller.ts b/src/controller/buffer-controller.ts
@@ -159,6 +159,7 @@ export default class BufferController implements ComponentAPI {
       media.src = self.URL.createObjectURL(ms);
       // cache the locally generated object url
       this._objectUrl = media.src;
+      media.addEventListener('emptied', this._onMediaEmptied);
     }
   }
 
@@ -188,6 +189,7 @@ export default class BufferController implements ComponentAPI {
       // 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);
         }
@@ -785,11 +787,12 @@ export default class BufferController implements ComponentAPI {
 
   // Keep as arrow functions so that we can directly reference these functions directly as event listeners
   private _onMediaSourceOpen = () => {
-    const { hls, media, mediaSource } = this;
+    const { media, mediaSource } = this;
     logger.log('[buffer-controller]: Media source opened');
     if (media) {
+      media.removeEventListener('emptied', this._onMediaEmptied);
       this.updateMediaElementDuration();
-      hls.trigger(Events.MEDIA_ATTACHED, { media });
+      this.hls.trigger(Events.MEDIA_ATTACHED, { media });
     }
 
     if (mediaSource) {
@@ -807,6 +810,15 @@ export default class BufferController implements ComponentAPI {
     logger.log('[buffer-controller]: Media source ended');
   };
 
+  private _onMediaEmptied = () => {
+    const { media, _objectUrl } = this;
+    if (media && media.src !== _objectUrl) {
+      logger.error(
+        `Media element src was set while attaching MediaSource (${_objectUrl} > ${media.src})`
+      );
+    }
+  };
+
   private _onSBUpdateStart(type: SourceBufferName) {
     const { operationQueue } = this;
     const operation = operationQueue.current(type);

diff --git a/tests/unit/controller/buffer-controller-operations.ts b/tests/unit/controller/buffer-controller-operations.ts
@@ -61,6 +61,8 @@ class MockMediaElement {
   public currentTime: number = 0;
   public duration: number = Infinity;
   public textTracks: any[] = [];
+  addEventListener() {}
+  removeEventListener() {}
 }
 
 const queueNames: Array<SourceBufferName> = ['audio', 'video'];