Destroy hls instance.

Novage · Dec 12, 2023 · 810a228 · 810a228
1 parent fd9c638
commit 810a228
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/p2p-media-loader-demo/src/App.tsx b/p2p-media-loader-demo/src/App.tsx
@@ -260,6 +260,10 @@ function App() {
   const createNewPlayer = () => {
     setHttpLoadedGlob(0);
     setP2PLoadedGlob(0);
+
+    (window as unknown as ExtendedWindow).videoPlayer?.destroy?.();
+    hlsInstance.current?.destroy();
+    void shakaInstance.current?.destroy();
     switch (playerType) {
       case "hls-dplayer":
         initHlsDPlayer(streamUrl);

diff --git a/packages/p2p-media-loader-hlsjs/src/engine.ts b/packages/p2p-media-loader-hlsjs/src/engine.ts
@@ -34,11 +34,7 @@ export class Engine {
 
   initHLSEvents(hls: Hls) {
     if (this._hlsInstance === hls) return;
-
-    if (this._hlsInstance) {
-      this.updateHlsEventsHandlers("unregister");
-      this.updateMediaElementEventHandlers("unregister");
-    }
+    if (this._hlsInstance) this.destroy();
     this._hlsInstance = hls;
     this.updateHlsEventsHandlers("register");
     this.updateMediaElementEventHandlers("unregister");
@@ -157,6 +153,7 @@ export class Engine {
     return class PlaylistLoader extends PlaylistLoaderBase {
       constructor(config: HlsConfig) {
         super(config);
+        if (engine._hlsInstance) return;
         const hlsInstance = engine.hlsInstanceGetter?.();
         if (hlsInstance) engine.initHLSEvents(hlsInstance);
       }