Correctly stop RTSP2Web Type HLS when executing "MonitorStream.stop()…

…" (MonitorStream.js) 1. Correctly stop RTSP2Web Type HLS when executing "MonitorStream.stop()" 2. Merged with Fix: Stop RTSP2Web Type HLS when stream stops ZoneMinder#4214
IgorA100 · Feb 2, 2025 · 234b21d · 234b21d
1 parent 4eff84b
commit 234b21d
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
@@ -12,6 +12,9 @@ function MonitorStream(monitorData) {
   this.RTSP2WebEnabled = monitorData.RTSP2WebEnabled;
   this.RTSP2WebType = monitorData.RTSP2WebType;
   this.webrtc = null;
+  this.hls = null;
+  this.mse = null;
+  this.wsMSE = null;
   this.mseStreamingStarted = false;
   this.mseQueue = [];
   this.mseSourceBuffer = null;
@@ -272,9 +275,9 @@ function MonitorStream(monitorData) {
           }
           */
           if (Hls.isSupported()) {
-            const hls = new Hls();
-            hls.loadSource(hlsUrl.href);
-            hls.attachMedia(videoEl);
+            this.hls = new Hls();
+            this.hls.loadSource(hlsUrl.href);
+            this.hls.attachMedia(videoEl);
           } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
             videoEl.src = hlsUrl.href;
           }
@@ -349,6 +352,15 @@ function MonitorStream(monitorData) {
     if (this.webrtc) {
       this.webrtc.close();
       this.webrtc = null;
+    } else if (this.hls) {
+      this.hls.destroy();
+      this.hls = null;
+    } else if (this.wsMSE) {
+      this.mse.endOfStream();
+      this.wsMSE.close();
+      this.wsMSE = null;
+      this.mseStreamingStarted = false;
+      this.mseSourceBuffer = null;
     }
   };
 
@@ -683,6 +695,7 @@ function MonitorStream(monitorData) {
         } // end if have a new auth hash
       } // end if has state
     } else {
+      if (!this.started) return;
       console.error(respObj.message);
       // Try to reload the image stream.
       if (stream.src) {
@@ -1034,14 +1047,14 @@ function startRTSP2WebPlay(videoEl, url, stream) {
 }
 
 function startMsePlay(context, videoEl, url) {
-  const mse = new MediaSource();
-  mse.addEventListener('sourceopen', function() {
-    const ws = new WebSocket(url);
-    ws.binaryType = 'arraybuffer';
-    ws.onopen = function(event) {
+  context.mse = new MediaSource();
+  context.mse.addEventListener('sourceopen', function() {
+    context.wsMSE = new WebSocket(url);
+    context.wsMSE.binaryType = 'arraybuffer';
+    context.wsMSE.onopen = function(event) {
       console.log('Connect to ws');
     };
-    ws.onmessage = function(event) {
+    context.wsMSE.onmessage = function(event) {
       const data = new Uint8Array(event.data);
       if (data[0] === 9) {
         let mimeCodec;
@@ -1051,15 +1064,15 @@ function startMsePlay(context, videoEl, url) {
         } else {
           console.log("Browser too old. Doesn't support TextDecoder");
         }
-        context.mseSourceBuffer = mse.addSourceBuffer('video/mp4; codecs="' + mimeCodec + '"');
+        context.mseSourceBuffer = context.mse.addSourceBuffer('video/mp4; codecs="' + mimeCodec + '"');
         context.mseSourceBuffer.mode = 'segments';
         context.mseSourceBuffer.addEventListener('updateend', pushMsePacket, videoEl, context);
       } else {
         readMsePacket(event.data, videoEl, context);
       }
     };
   }, false);
-  videoEl.src = window.URL.createObjectURL(mse);
+  videoEl.src = window.URL.createObjectURL(context.mse);
 }
 
 function pushMsePacket(videoEl, context) {