From ec49506e1b1108330c979853f92c7df01762d05d Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Sun, 28 Jun 2026 23:32:40 +0300
Subject: [PATCH 01/11] When broadcasting a stream in an unsupported RTSP2Web
 format (for example, H265), select the next player (MonitorStream.js)

---
 web/js/MonitorStream.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 865a53bc45..7b53dcf660 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -2336,7 +2336,8 @@ function mseListenerSourceopen(context, videoEl, url) {
         const msg = `WebSocket MSE for a video object ID=${context.id} codec '${mimeCodec}' not supported. Monitor '${context.name}' ID=${context.id} not starting.`;
         console.log(msg);
         context.getElement().before(document.createTextNode(msg));
-        context.stop();
+        context.streamErrorRegistration();
+        context.selectNextPlayer(context.player);
         context.RTSP2WebType = null; // Avoid repeated restarts
         return;
       }

From 99c90fd3f2ffd21a9b2c8f846b2f2f416d4de99b Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Mon, 29 Jun 2026 00:01:42 +0300
Subject: [PATCH 02/11] Select next player only for "Auto" mode
 (MonitorStream.js)

---
 web/js/MonitorStream.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 7b53dcf660..2f0cd3d1b0 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -2336,9 +2336,14 @@ function mseListenerSourceopen(context, videoEl, url) {
         const msg = `WebSocket MSE for a video object ID=${context.id} codec '${mimeCodec}' not supported. Monitor '${context.name}' ID=${context.id} not starting.`;
         console.log(msg);
         context.getElement().before(document.createTextNode(msg));
-        context.streamErrorRegistration();
-        context.selectNextPlayer(context.player);
         context.RTSP2WebType = null; // Avoid repeated restarts
+        if (this.selectedPlayer) {
+          context.stop();
+        } else {
+          // Select next player only for "Auto" mode
+          context.streamErrorRegistration();
+          context.selectNextPlayer(context.player);
+        }
         return;
       }
 

From 1dd51495085773dd429da2d7c38f9b8b429f6713 Mon Sep 17 00:00:00 2001
From: IgorA100 <igor101@front.ru>
Date: Tue, 7 Jul 2026 19:05:58 +0300
Subject: [PATCH 03/11] - More accurate player switching for mode=Auto and
 mode=go2rtc and more comprehensive error handling. - Added
 getCountStreamErrors() and resetCountStreamErrors() methods. - On the Montage
 page, run hls.js without parsing RTSP2WebType == "HLS" because we use
 automatic player switching, and even if we don't use the HLS type by default,
 the player may switch to HLS when using RTSP2Web. - Added
 waitingWebrtcPlayback to video-stream.js to detect the start of RTC playback.
 If we receive a 'webrtc/candidate' candidate, the next step is to start
 playback. We wait 3 seconds, and if the video hasn't loaded, we log the error
 and switch to another player. - Error logging in video-stream.js occurs via
 errorHandling() and allows us to display a text message in the video display
 block. - Before logging errors, we change monitorStream.player to a specific
 go2rtc_webrtc or go2rtc_mse player, since we don't have just "go2rtc" in the
 list of players to switch to. - We'll simplify getting monitorStream: instead
 of looking for the parent liveStream and getting its ID, we'll directly
 request getMonitorStream(stringToNumber(this.id)) - Go2RTC errors now
 generate the onErrorGo2RTC event. - Added the ability to display text
 information (typically used to inform about errors) in the block where the
 stream is displayed. The class for the block is ".info-text" - We no longer
 need the changes made in
 https://github.com/ZoneMinder/zoneminder/commit/8b9546df3315c171d0fd8f0f6886a68119e7d951
 - this.started = false; In this.stop() in MonitorStream.js we will move it
 higher in the code so that when stopping, the correct state of the stream is
 already set.

---
 web/js/MonitorStream.js             | 195 ++++++++++++++++++----------
 web/js/video-stream.js              |  94 +++++++++-----
 web/skins/classic/css/base/skin.css |   8 ++
 web/skins/classic/js/skin.js        |  36 ++++-
 web/skins/classic/views/montage.php |   2 +-
 5 files changed, 233 insertions(+), 102 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 1f4a3b6ba5..ef54980c54 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -59,6 +59,7 @@ function MonitorStream(monitorData) {
     request: 'stream',
     connkey: this.connKey
   };
+  this.limitCountErrors = 2;
   this.playerPriority = {
     1: { // This setting should always be priority #1.
       name: 'default',
@@ -75,11 +76,11 @@ function MonitorStream(monitorData) {
       countErrors: 0,
       durationErrors: 0
     },
-    //4: {
-    //  name: 'go2rtc_hls', // Doesn't work for live viewing.
-    //  countErrors: 0,
-    //  durationErrors: 0
-    //},
+    100: {
+      name: 'go2rtc_hls', // Doesn't work for live viewing. But it's required for error counting. Let's set the priority after ZMS, i.e., in theory, with Mode=Auto, it will never be selected.
+      countErrors: 0,
+      durationErrors: 0
+    },
     5: {
       name: 'rtsp2web_webrtc',
       countErrors: 0,
@@ -218,7 +219,8 @@ function MonitorStream(monitorData) {
 
     }
 
-    this.selectedPlayer = p;
+    //this.selectedPlayer = p;
+    this.selectedPlayer = $j('#player').val(); // Selected player in the browser
     // Let's clear out the errors
     for (const key in this.playerPriority) {
       this.playerPriority[key]['countErrors'] = 0;
@@ -536,6 +538,8 @@ function MonitorStream(monitorData) {
     );
     this.handlerEventListener['errorStream'] = manageEventListener.addEventListener(stream, 'error',
         (e) => {
+          clearTimeout(this.mseWaitingErrorReset);
+          console.warn(`Stream playback error for monitor ID=${this.id}.`, `ERROR: ${e.srcElement.error.message}`, e);
           this.writeTextInfoBlock("Error");
           this.streamErrorRegistration();
           this.restart(this.currentChannelStream);
@@ -543,40 +547,9 @@ function MonitorStream(monitorData) {
     );
   };
 
-  // When a go2rtc player connects but the source video codec cannot be decoded by
-  // this browser (e.g. an H.265 camera viewed in Chrome, which supports HEVC over
-  // neither WebRTC nor MSE), go2rtc negotiates the video track as inactive and sends
-  // only audio. The <video> then "plays" audio with no picture and stays at 0x0, so
-  // the normal 'error' handler never fires and the player hangs on "Loading...".
-  // Watch for a decoded video frame; if none arrives in time, treat it as a playback
-  // failure and fall back to the next player (ultimately ZMS MJPEG).
-  this.NO_VIDEO_TIMEOUT = 8000;
-  this.noVideoWatchdog = null;
-
-  this.clearNoVideoWatchdog = function() {
-    if (this.noVideoWatchdog) {
-      clearTimeout(this.noVideoWatchdog);
-      this.noVideoWatchdog = null;
-    }
-  };
-
-  this.startNoVideoWatchdog = function() {
-    this.clearNoVideoWatchdog();
-    const self = this;
-    this.noVideoWatchdog = setTimeout(function() {
-      self.noVideoWatchdog = null;
-      if (!self.started || -1 === self.activePlayer.indexOf('go2rtc')) return;
-      const v = self.getAVStream();
-      if (v && v.videoWidth > 0 && v.videoHeight > 0) return; // video is decoding fine
-      console.warn(`Monitor ID=${self.id}: player "${self.player}" connected but produced no video within ${self.NO_VIDEO_TIMEOUT}ms (the source video codec is likely unsupported by this browser, e.g. H.265). Falling back to the next player.`);
-      self.updateStreamInfo('', 'No video - trying next player');
-      self.streamErrorRegistration();
-      self.selectNextPlayer(self.player);
-    }, this.NO_VIDEO_TIMEOUT);
-  };
-
   this.start = function(streamChannel = 'default') {
     this.writeTextInfoBlock("Loading...");
+    this.removeText();
     if (streamChannel === null || streamChannel === '' || currentView == 'montage') streamChannel = 'default';
     // Normalize channel name for internal tracking
     if (streamChannel == 'default') {
@@ -690,6 +663,34 @@ function MonitorStream(monitorData) {
     return currentInfoBlock;
   };
 
+  this.showText = function(text) {
+    const blockId = "infoText-"+this.id;
+    let block = document.getElementById(blockId);
+    if (!block) {
+      block = document.createElement('span');
+      block.id = blockId;
+      block.classList.add("info-text");
+      this.getElement().parentElement.prepend(block);
+    }
+    if (text !== "" && block.textContent !== text) {
+      if (block.textContent !== "") {
+        // The text already existed, we need to add a new one.
+        block.appendChild(document.createElement('br'));
+        block.appendChild(document.createTextNode(text));
+      } else {
+        block.textContent = text;
+      }
+    }
+  };
+
+  this.removeText = function() {
+    const blockId = "infoText-"+this.id;
+    let block = document.getElementById(blockId);
+    if (block) {
+      block.textContent = '';
+    }
+  };
+
   this.stop = function() {
     manageEventListener.removeEventListener(this.handlerEventListener['killStream']);
     manageEventListener.removeEventListener(this.handlerEventListener['playStream']);
@@ -706,6 +707,8 @@ function MonitorStream(monitorData) {
       console.warn(`! ${dateTimeToISOLocal(new Date())} Stream for ID=${this.id} has already stopped.`);
       return;
     }
+    this.started = false;
+
     if (-1 !== this.activePlayer.indexOf('zms')) {
       this.writeTextInfoBlock("Stopped", {showImg: false});
     } else {
@@ -714,7 +717,6 @@ function MonitorStream(monitorData) {
     console.debug(`! ${dateTimeToISOLocal(new Date())} Stream for ID=${this.id} STOPPING`);
     this.statusCmdTimer = clearInterval(this.statusCmdTimer);
     this.streamCmdTimer = clearInterval(this.streamCmdTimer);
-    this.clearNoVideoWatchdog();
     this.mediaStream = this.audioTrack = this.videoTrack = null;
 
     if (-1 !== this.activePlayer.indexOf('zms')) {
@@ -763,7 +765,7 @@ function MonitorStream(monitorData) {
     }
     if (this.audioMotion && this.audioMotion.stop) this.audioMotion.stop();
     this.activePlayer = '';
-    this.started = false;
+    //this.started = false;
   };
 
   this.stopMse = function() {
@@ -851,10 +853,28 @@ function MonitorStream(monitorData) {
 
   this.restart = function(channelStream = "default", delay = 200) {
     this.stop();
-    const this_ = this;
-    setTimeout(function() {// During the downtime, the monitor may have already started to work.
-      if (!this_.started) this_.start(channelStream);
-    }, delay);
+    const countErrors = this.getCountStreamErrors(this.player);
+    if (countErrors < this.limitCountErrors) {
+      setTimeout(function(self) {// During the downtime, the monitor may have already started to work.
+        if (!self.started) self.start(channelStream);
+      }, delay, this);
+    } else {
+      if (typeof streamCmdStop === 'function') {
+        // Let's set the correct state for the player control buttons (for example, on the Watch page)
+        streamCmdStop();
+      }
+
+      if (-1 !== this.player.indexOf('zms')) {
+        this.writeTextInfoBlock("Error", {showImg: false});
+      } else {
+        this.writeTextInfoBlock("Error");
+      }
+      this.resetCountStreamErrors(this.player);
+      const msg = `Out of ${this.limitCountErrors} consecutive attempts to start a stream for monitor ID=${this.id} using player "${this.player}", none were successful. The stream has been stopped.`
+      console.warn(msg);
+      this.showText(msg);
+
+    }
   };
 
   this.pause = function() {
@@ -1751,7 +1771,6 @@ function MonitorStream(monitorData) {
 
       if (typeof observerMontage !== 'undefined') observerMontage.observe(stream);
       this.activePlayer = 'go2rtc';
-      this.startNoVideoWatchdog();
     } else {
       alert("ZM_GO2RTC_PATH is empty. Go to Options->System and set ZM_GO2RTC_PATH accordingly.");
     }
@@ -1938,20 +1957,15 @@ function MonitorStream(monitorData) {
     if (!currentPlayer) currentPlayer = this.player;
     if (!currentPlayer) currentPlayer = this.player = this.defaultPlayer;
 
-    let countErrors = 0;
-    for (const key in this.playerPriority) {
-      if (-1 !== currentPlayer.indexOf(this.playerPriority[key]['name'])) {
-        countErrors = parseInt(this.playerPriority[key]['countErrors'], 10);
-        if (countErrors > 0) console.debug(`${countErrors} playback errors found for player "${currentPlayer}"`);
-      }
-    }
+    const countErrors = this.getCountStreamErrors(currentPlayer);
+    if (countErrors > 0) console.debug(`${countErrors} playback errors found for player "${currentPlayer}"`);
 
     if ((currentPlayer && countErrors === 0) || (this.selectedPlayer && this.selectedPlayer === currentPlayer)) { // selectedPlayer pins only when it matches the active selection
       if (this.Go2RTCEnabled && (-1 !== currentPlayer.indexOf('go2rtc'))) {
         this.select_go2rtc(streamChannel);
-      } else if (this.janusEnabled && (-1 !== currentPlayer.indexOf('janus'))) {
+      } else if (this.janusEnabled && (-1 !== currentPlayer.indexOf('janus')) && streamChannel.toLowerCase().indexOf("primary") > -1 && this.selectedPlayer !== 'go2rtc') { // To avoid confusion, since Janus can only work with the first channel & selectedPlayer !== "Go2RTC Auto"
         this.select_janus(streamChannel);
-      } else if (this.RTSP2WebEnabled && (-1 !== currentPlayer.indexOf('rtsp2web'))) {
+      } else if (this.RTSP2WebEnabled && (-1 !== currentPlayer.indexOf('rtsp2web')) && this.selectedPlayer !== 'go2rtc') {
         this.select_rtsp2web(streamChannel);
       } else if (-1 !== currentPlayer.indexOf('zms')) {
         this.select_zms();
@@ -1994,6 +2008,7 @@ function MonitorStream(monitorData) {
           if (nextName.indexOf('go2rtc') !== -1 && !this.Go2RTCEnabled) continue;
           if (nextName.indexOf('rtsp2web') !== -1 && !this.RTSP2WebEnabled) continue;
           if (nextName.indexOf('janus') !== -1 && !this.janusEnabled) continue;
+          if (this.selectedPlayer === 'go2rtc' && nextName.indexOf('go2rtc') === -1 && nextName.indexOf('zms') === -1 ) continue;
           if (parseInt(this.playerPriority[nextKey]['countErrors'], 10) === 0) {
             this.player = nextName;
             this.restart(this.currentChannelStream);
@@ -2012,6 +2027,28 @@ function MonitorStream(monitorData) {
       this.restart(this.currentChannelStream);
     }
   };
+
+  this.getCountStreamErrors = function (player) {
+    if (!player) return;
+    let countErrors = 0;
+    for (const key in this.playerPriority) {
+      if (-1 !== player.indexOf(this.playerPriority[key]['name'])) {
+        countErrors = parseInt(this.playerPriority[key]['countErrors'], 10);
+        break;
+      }
+    }
+    return countErrors;
+  };
+
+  this.resetCountStreamErrors = function (player) {
+    if (!player) return;
+    for (const key in this.playerPriority) {
+      if (-1 !== player.indexOf(this.playerPriority[key]['name'])) {
+        this.playerPriority[key]['countErrors'] = 0;
+        break;
+      }
+    }
+  };
 } // end class MonitorStream
 
 /* +++ Janus */
@@ -2090,6 +2127,7 @@ async function attachVideo(monitorStream) {
           monitorStream.restart(monitorStream.currentChannelStream);
         }
         monitorStream.updateStreamInfo('', ''); //JANUS
+        monitorStream.resetCountStreamErrors(monitorStream.activePlayer);
         //getTracksFromStream(monitorStream); //JANUS
       }
     },
@@ -2237,7 +2275,7 @@ function startRTSP2WebPlay(videoEl, url, stream) {
         }
       },
       error: function(xhr, status, error) {
-        console.warn('Error request localDescription:', error, xhr.responseText);
+        console.warn('RTSP2Web_webrtc Error request localDescription:', error, xhr.responseText);
         stream.updateStreamInfo('', 'Error'); //WEBRTC
         stream.streamErrorRegistration();
         stream.restart(stream.currentChannelStream);
@@ -2314,9 +2352,12 @@ function mseListenerSourceopen(context, videoEl, url) {
     console.log(`${dateTimeToISOLocal(new Date())} WebSocket MSE CLOSED for a video object ID=${context.id}.`);
   };
   context.wsMSE.onerror = function(event) {
-    console.warn(`${dateTimeToISOLocal(new Date())} WebSocket MSE ERROR for a video object ID=${context.id}:`, event);
-    context.streamErrorRegistration();
-    if (context.started) context.restart();
+    // Firefox will display error 1006 when closing the socket. There's likely a problem with RTSP2Web.
+    console.warn(`${dateTimeToISOLocal(new Date())} WebSocket MSE ERROR for a video object ID=${context.id} [stream status: ${(context.started) ? "started" : "stopped"}]:`, event);
+    if (context.started) {
+      context.streamErrorRegistration();
+      context.restart(context.currentChannelStream);
+    }
   };
   context.wsMSE.onmessage = function(event) {
     if (!context.mse || (context.mse && context.mse.readyState !== "open")) return;
@@ -2334,8 +2375,8 @@ function mseListenerSourceopen(context, videoEl, url) {
         console.log(`WebSocket MSE for a video object ID=${context.id} codec used: ${mimeCodec}`);
       } else {
         const msg = `WebSocket MSE for a video object ID=${context.id} codec '${mimeCodec}' not supported. Monitor '${context.name}' ID=${context.id} not starting.`;
-        console.log(msg);
-        context.getElement().before(document.createTextNode(msg));
+        console.warn(msg);
+        context.showText(msg);
         context.RTSP2WebType = null; // Avoid repeated restarts
         if (this.selectedPlayer) {
           context.stop();
@@ -2358,7 +2399,7 @@ function mseListenerSourceopen(context, videoEl, url) {
 }
 
 function startMsePlay(context, videoEl, url) {
-  console.log('startMsePlay');
+  console.log(`startMsePlay for monitor with ID=${context.id}`);
   var startPermitted = true;
   if (!context.MSEBufferCleared) {
     startPermitted = false;
@@ -2373,15 +2414,20 @@ function startMsePlay(context, videoEl, url) {
   if (startPermitted) {
     clearTimeout(context.waitingStart);
   } else {
-    context.waitingStart = setTimeout(function() {
-      startMsePlay(context, videoEl, url);
-    }, 100);
+    context.waitingStart = setTimeout(function(_context) {
+      if (context.started) startMsePlay(context, videoEl, url);
+    }, 100, context);
     return;
   }
 
   context.mse = new MediaSource();
   videoEl.onplay = (event) => {
-    context.updateStreamInfo('', ''); //MSE
+    context.mseWaitingErrorReset = setTimeout(function(self) {
+      // If the video is in H.265, the browser may start playing (even if it doesn't support H.265) and an error may immediately appear.
+      // You need to wait a bit before resetting the error. This will allow for more accurate error counting.
+      self.updateStreamInfo('', ''); //MSE
+      self.resetCountStreamErrors(context.activePlayer);
+    }, 500, context);
     //getTracksFromStream(context); //MSE
     context.streamStartTime = (Date.now() / 1000).toFixed(2);
     if (videoEl.buffered.length > 0 && videoEl.currentTime < videoEl.buffered.end(videoEl.buffered.length - 1) - 0.1) {
@@ -2412,6 +2458,25 @@ function startMsePlay(context, videoEl, url) {
     videoEl.src = window.URL.createObjectURL(context.mse);
   }
   $j('#delay'+context.id).removeClass('hidden');
+
+  // This is necessary if the browser doesn't allow automatic playback with sound.
+  const self = this;
+  videoEl.play().then(() => {
+    console.debug("RTSP2Web type MSE started playing the video stream successfully.");
+  })
+      .catch((er) => {
+        if (er.name === 'NotAllowedError' && !videoEl.muted) {
+          videoEl.muted = true;
+          videoEl.play().then(() => {
+            console.debug(self.activePlayer + " video player started playing after muting");
+         })
+              .catch((retryError) => {
+                console.warn(retryError);
+              });
+        } else {
+          console.warn(er);
+        }
+      });
 }
 
 function pushMsePacket(videoEl, context) {
diff --git a/web/js/video-stream.js b/web/js/video-stream.js
index 26929ed11f..8e60595785 100644
--- a/web/js/video-stream.js
+++ b/web/js/video-stream.js
@@ -47,13 +47,11 @@ class VideoStream extends VideoRTC {
     }
 
     onplay() {
-        const liveStream = this.closest('[id ^= "liveStream"]');
         const container = document.getElementById('monitor-thumb-overlay');
-        if (liveStream) {
-            const monitorStream = getMonitorStream(stringToNumber(liveStream.id));
-            if (monitorStream) {
-                monitorStream.streamStartTime = (Date.now() / 1000).toFixed(2);
-            }
+        const monitorStream = getMonitorStream(stringToNumber(this.id));
+        if (monitorStream) {
+            monitorStream.streamStartTime = (Date.now() / 1000).toFixed(2);
+            monitorStream.resetCountStreamErrors(this.activePlayer);
         }
 
         if (container) {
@@ -86,19 +84,27 @@ class VideoStream extends VideoRTC {
     onopen() {
         console.debug('stream.onopen');
         const result = super.onopen();
+        if (result !== undefined) {
+            // An available player mode should return.An available player mode should return.
+            if ((!("length" in result)) || (("length" in result) && !result.length)) {
+                this.errorHandling(this.mode, `Playback using Go2RTC in mode "${this.mode}" is not possible.`);
+            }
+        } else {
+            // TODO: Something needs to be done, but what exactly?
+            console.warn(`stream.onopen returned RESULT=UNDEFINED for monitor with ID=${stringToNumber(this.id)} and mode="${this.mode}"`);
+        }
 
         this.onmessage['stream'] = msg => {
             console.debug('stream.onmessge', msg);
             switch (msg.type) {
                 case 'error':
                     this.divError = msg.value;
-                    const liveStream = this.closest('[id ^= "liveStream"]');
-                    if (liveStream) {
-                        const monitorStream = getMonitorStream(stringToNumber(liveStream.id));
-                        if (monitorStream) {
-                            monitorStream.streamErrorRegistration();
-                            monitorStream.restart(monitorStream.currentChannelStream);
-                        }
+                    if (msg.value.indexOf("webrtc") > -1) {
+                        this.errorHandling("webrtc");
+                    } else if (msg.value.indexOf("mse") > -1) {
+                        this.errorHandling("mse");
+                    } else if (msg.value.indexOf("hls") > -1) {
+                        this.errorHandling("hls");
                     }
                     break;
                 case 'mse':
@@ -106,11 +112,21 @@ class VideoStream extends VideoRTC {
                 case 'mp4':
                 case 'mjpeg':
                     this.divMode = msg.type.toUpperCase();
-                    //this.getTracksFromStream();
+                    const monitorStream = getMonitorStream(stringToNumber(this.id));
+                    if (monitorStream) {
+                        monitorStream.player = "go2rtc_" + msg.type;
+                    }
+                    break;
+                case 'webrtc/candidate':
+                    if (!this.waitingWebrtcPlayback) {
+                        // webrtc/candidate can be multiple times, we only need one
+                        this.waitingWebrtcPlayback = setTimeout(function(self) {
+                            self.errorHandling("webrtc", 'No video - trying next player');
+                        }, 3000, this);
+                    }
                     break;
             }
         };
-
         return result;
     }
 
@@ -120,26 +136,25 @@ class VideoStream extends VideoRTC {
     }
 
     onerror(ev) {
-        console.debug('stream.onerror');
-        const liveStream = this.closest('[id ^= "liveStream"]');
-        if (liveStream) {
-            const monitorStream = getMonitorStream(stringToNumber(liveStream.id));
-            if (monitorStream && monitorStream.started) {
-                monitorStream.streamErrorRegistration();
-                monitorStream.restart(monitorStream.currentChannelStream);
-            }
+        clearTimeout(this.waitingWebrtcPlayback);
+        this.waitingWebrtcPlayback = null;
+        console.debug('stream.onerror', ev);
+        const monitorStream = getMonitorStream(stringToNumber(this.id));
+        if (monitorStream && monitorStream.started) {
+            errorHandling(this.mode);
         }
         super.onerror(ev);
     }
 
     onpcvideo(ev) {
+        clearTimeout(this.waitingWebrtcPlayback);
+        this.waitingWebrtcPlayback = null;
         console.debug('stream.onpcvideo');
         super.onpcvideo(ev);
 
         if (this.pcState !== WebSocket.CLOSED) {
             this.divMode = 'RTC';
         }
-        //this.getTracksFromStream();
     }
 
     pause() {
@@ -148,19 +163,28 @@ class VideoStream extends VideoRTC {
     close() {
         this.video.pause();
     }
-/*
-    getTracksFromStream() {
-        const liveStream = this.closest('[id ^= "liveStream"]');
-        if (liveStream) {
-            const monitorStream = getMonitorStream(stringToNumber(liveStream.id));
-            if (monitorStream) {
-                setTimeout(function() { //It takes time for full playback to complete, otherwise you may not receive the tracks. This is especially true for MSE.
-                    getTracksFromStream(monitorStream);
-                }, 500);
-            }
+
+    errorHandling(currentMode, message = null) {
+        const monitorStream = getMonitorStream(stringToNumber(this.id));
+        if (monitorStream) {
+            monitorStream.player = "go2rtc_" + currentMode;
+            monitorStream.streamErrorRegistration();
+            monitorStream.restart(monitorStream.currentChannelStream);
+            monitorStream.writeTextInfoBlock("Error");
+            if (message) monitorStream.showText(message);
         }
+
+        this.dispatchEvent(
+            new CustomEvent('go2rtc.events.error', {
+                detail: {
+                    mode: currentMode,
+                    message: message
+                },
+                bubbles: true,
+                cancelable: false
+            })
+        );
     }
-*/
 }
 
 customElements.define('video-stream', VideoStream);
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index 04bd550c2f..59664cc1d3 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -1822,6 +1822,14 @@ input.masked-input.unmasked {
   opacity : 0;
 }
 
+.info-text {
+  position: relative;
+  display: block;
+  z-index: 10001;
+  color: #212529;
+  background-color: beige;
+}
+
 /* +++ This block should always be located at the end! */
 .hidden {
     display: none;
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 132892c332..03dcd51985 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -1522,12 +1522,22 @@ function createGo2rtcStream(container, img, src, mid, fallbackToMjpeg) {
     url.search = 'src=' + mid + '_' + channel;
 
     const stream = document.createElement('video-stream');
+    stream.handlerEventListener = {};
     stream.style.cssText = 'width: 100%; height: 100%; display: block;';
     stream.background = true;
     stream.muted = getCookie('zmWatchMuted') === 'true';
     stream.src = url.href;
     container.appendChild(stream);
 
+    stream.handlerEventListener['go2rtc.events.error'] = manageEventListener.addEventListener(stream, 'go2rtc.events.error',
+      (e) => {
+        console.debug('Go2RTC playback error:', e.detail);
+        clearTimeout(stream._fallbackTimer);
+        stream.remove();
+        fallbackToMjpeg();
+      }
+    );
+
     const attachPlayListener = function() {
       const innerVideo = stream.querySelector('video');
       if (!innerVideo) return false;
@@ -1888,6 +1898,7 @@ function thumbnail_onmouseout(event) {
 
 function cleanupVideoStream(videoStream) {
   if (!videoStream) return;
+  manageEventListener.removeEventListener(videoStream.handlerEventListener['go2rtc.events.error']);
   if (videoStream._fallbackTimer) clearTimeout(videoStream._fallbackTimer);
   videoStream.close();
 }
@@ -3273,7 +3284,30 @@ async function getTracksFromStream(videoFeedStream) {
 
   }
 
-  connectAudioMotion(mid);
+  // We'll determine whether we need a video track or just an audio track.
+  // When playing H.265, the video may not be decoded, but the audio track will play.
+  const selectorWhatDisplay = document.getElementById('whatDisplay');
+  const monitorStream = getMonitorStream(mid);
+  const defaultWhatDisplay = (typeof eventData !== 'undefined') ? eventData.whatDisplay : (monitorStream) ? monitorStream.whatDisplay : null;
+
+  let videoTrackRequired = true;
+  if (!selectorWhatDisplay || (-1 !== selectorWhatDisplay.value.toLowerCase().indexOf('default'))) { // Default monitor settings
+    if (defaultWhatDisplay && (-1 === defaultWhatDisplay.toLowerCase().indexOf('video'))) videoTrackRequired = false;
+  } else {
+    if (-1 === selectorWhatDisplay.value.toLowerCase().indexOf('video')) videoTrackRequired = false;
+  }
+
+  if (!videoFeedStream.videoTrack ) {
+    monitorStream.updateStreamInfo('', 'Video track missing');
+    monitorStream.writeTextInfoBlock("Video track missing", {showImg: false});
+  }
+  if (!videoFeedStream.videoTrack && videoTrackRequired && (!videoFeedStream.selectedPlayer || videoFeedStream.selectedPlayer === "go2rtc")) {
+    // Switch to a different player only when mode=Auto
+    videoFeedStream.streamErrorRegistration();
+    videoFeedStream.restart(videoFeedStream.currentChannelStream);
+  } else {
+    connectAudioMotion(mid);
+  }
 }
 
 const waitUntil = (condition, timeout = 0) => {
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index ec175df964..74512f693e 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -213,7 +213,7 @@
   }
   $monitor = $monitors[] = new ZM\Monitor($row);
 
-  if ( $monitor->RTSP2WebEnabled() and $monitor->RTSP2WebType == "HLS") {
+  if ($monitor->RTSP2WebEnabled()) {
     $need_hls = true;
   }
   if ($monitor->JanusEnabled()) {

From a584dc4af22c304343008dadb09ce2fbe35c3e0c Mon Sep 17 00:00:00 2001
From: IgorA100 <igor101@front.ru>
Date: Tue, 7 Jul 2026 19:15:55 +0300
Subject: [PATCH 04/11] Fix ESLint

---
 web/js/MonitorStream.js      | 11 +++++------
 web/skins/classic/js/skin.js | 12 ++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index ef54980c54..223fb4bc2f 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -685,7 +685,7 @@ function MonitorStream(monitorData) {
 
   this.removeText = function() {
     const blockId = "infoText-"+this.id;
-    let block = document.getElementById(blockId);
+    const block = document.getElementById(blockId);
     if (block) {
       block.textContent = '';
     }
@@ -870,10 +870,9 @@ function MonitorStream(monitorData) {
         this.writeTextInfoBlock("Error");
       }
       this.resetCountStreamErrors(this.player);
-      const msg = `Out of ${this.limitCountErrors} consecutive attempts to start a stream for monitor ID=${this.id} using player "${this.player}", none were successful. The stream has been stopped.`
+      const msg = `Out of ${this.limitCountErrors} consecutive attempts to start a stream for monitor ID=${this.id} using player "${this.player}", none were successful. The stream has been stopped.`;
       console.warn(msg);
       this.showText(msg);
-
     }
   };
 
@@ -2028,7 +2027,7 @@ function MonitorStream(monitorData) {
     }
   };
 
-  this.getCountStreamErrors = function (player) {
+  this.getCountStreamErrors = function(player) {
     if (!player) return;
     let countErrors = 0;
     for (const key in this.playerPriority) {
@@ -2040,7 +2039,7 @@ function MonitorStream(monitorData) {
     return countErrors;
   };
 
-  this.resetCountStreamErrors = function (player) {
+  this.resetCountStreamErrors = function(player) {
     if (!player) return;
     for (const key in this.playerPriority) {
       if (-1 !== player.indexOf(this.playerPriority[key]['name'])) {
@@ -2469,7 +2468,7 @@ function startMsePlay(context, videoEl, url) {
           videoEl.muted = true;
           videoEl.play().then(() => {
             console.debug(self.activePlayer + " video player started playing after muting");
-         })
+          })
               .catch((retryError) => {
                 console.warn(retryError);
               });
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 03dcd51985..f112658799 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -1530,12 +1530,12 @@ function createGo2rtcStream(container, img, src, mid, fallbackToMjpeg) {
     container.appendChild(stream);
 
     stream.handlerEventListener['go2rtc.events.error'] = manageEventListener.addEventListener(stream, 'go2rtc.events.error',
-      (e) => {
-        console.debug('Go2RTC playback error:', e.detail);
-        clearTimeout(stream._fallbackTimer);
-        stream.remove();
-        fallbackToMjpeg();
-      }
+        (e) => {
+          console.debug('Go2RTC playback error:', e.detail);
+          clearTimeout(stream._fallbackTimer);
+          stream.remove();
+          fallbackToMjpeg();
+        }
     );
 
     const attachPlayListener = function() {

From 1afdd22ea1d372c73e950cf3f7fe1a266cc05d9c Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Tue, 7 Jul 2026 21:54:44 +0300
Subject: [PATCH 05/11] Of course, use context.selectedPlayer instead of
 this.selectedPlayer (an annoying typo when copying/pasting)

---
 web/js/MonitorStream.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 223fb4bc2f..5c1007901b 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -2377,7 +2377,7 @@ function mseListenerSourceopen(context, videoEl, url) {
         console.warn(msg);
         context.showText(msg);
         context.RTSP2WebType = null; // Avoid repeated restarts
-        if (this.selectedPlayer) {
+        if (context.selectedPlayer) {
           context.stop();
         } else {
           // Select next player only for "Auto" mode

From c7ed3e692dbcdd196850de8e69f6975d169e3a14 Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Tue, 7 Jul 2026 22:22:03 +0300
Subject: [PATCH 06/11] Return "this.started = false;" to where it was before

---
 web/js/MonitorStream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 5c1007901b..33b032ddbd 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -707,7 +707,7 @@ function MonitorStream(monitorData) {
       console.warn(`! ${dateTimeToISOLocal(new Date())} Stream for ID=${this.id} has already stopped.`);
       return;
     }
-    this.started = false;
+    //this.started = false;
 
     if (-1 !== this.activePlayer.indexOf('zms')) {
       this.writeTextInfoBlock("Stopped", {showImg: false});
@@ -765,7 +765,7 @@ function MonitorStream(monitorData) {
     }
     if (this.audioMotion && this.audioMotion.stop) this.audioMotion.stop();
     this.activePlayer = '';
-    //this.started = false;
+    this.started = false;
   };
 
   this.stopMse = function() {

From 9827cffc013c7f0eed3d2c2ae383ae6b5422b8e5 Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Thu, 9 Jul 2026 16:41:38 +0300
Subject: [PATCH 07/11] Run this.updateStreamInfo('', 'Error') if the critical
 number of errors is reached when restarting the stream.

---
 web/js/MonitorStream.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 60a8615f4d..146fb1e049 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -868,6 +868,7 @@ function MonitorStream(monitorData) {
       } else {
         this.writeTextInfoBlock("Error");
       }
+      this.updateStreamInfo('', 'Error');
       this.resetCountStreamErrors(this.player);
       const msg = `Out of ${this.limitCountErrors} consecutive attempts to start a stream for monitor ID=${this.id} using player "${this.player}", none were successful. The stream has been stopped.`;
       console.warn(msg);

From 26657a59385176c4cbc86be95a352a59b97a3498 Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Thu, 9 Jul 2026 21:59:25 +0300
Subject: [PATCH 08/11] Lost context

---
 web/js/video-stream.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/js/video-stream.js b/web/js/video-stream.js
index 8e60595785..9d795dcd49 100644
--- a/web/js/video-stream.js
+++ b/web/js/video-stream.js
@@ -141,7 +141,7 @@ class VideoStream extends VideoRTC {
         console.debug('stream.onerror', ev);
         const monitorStream = getMonitorStream(stringToNumber(this.id));
         if (monitorStream && monitorStream.started) {
-            errorHandling(this.mode);
+            this.errorHandling(this.mode);
         }
         super.onerror(ev);
     }

From dcdf4c1ec90cc893944ca82823f1b8068437ee4e Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Thu, 23 Jul 2026 20:24:21 +0300
Subject: [PATCH 09/11] When switching to the MJPEG player in the event of a
 go2rtc error, clear the go2rtc.events.error listener.

---
 web/skins/classic/js/skin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 0caa26f1fa..337e2b8254 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -1588,6 +1588,7 @@ function createGo2rtcStream(container, img, src, mid, fallbackToMjpeg) {
         (e) => {
           console.debug('Go2RTC playback error:', e.detail);
           clearTimeout(stream._fallbackTimer);
+          manageEventListener.removeEventListener(stream.handlerEventListener['go2rtc.events.error']);
           stream.remove();
           fallbackToMjpeg();
         }

From f3497b3997dc6efa63ee2f40333139c53880c0fc Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Thu, 23 Jul 2026 20:38:25 +0300
Subject: [PATCH 10/11] Removed duplicate text in the comment and replaced the
 erroneous "this" with "monitorStream"

---
 web/js/video-stream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/js/video-stream.js b/web/js/video-stream.js
index 9d795dcd49..7232512ced 100644
--- a/web/js/video-stream.js
+++ b/web/js/video-stream.js
@@ -51,7 +51,7 @@ class VideoStream extends VideoRTC {
         const monitorStream = getMonitorStream(stringToNumber(this.id));
         if (monitorStream) {
             monitorStream.streamStartTime = (Date.now() / 1000).toFixed(2);
-            monitorStream.resetCountStreamErrors(this.activePlayer);
+            monitorStream.resetCountStreamErrors(monitorStream.activePlayer);
         }
 
         if (container) {
@@ -85,7 +85,7 @@ class VideoStream extends VideoRTC {
         console.debug('stream.onopen');
         const result = super.onopen();
         if (result !== undefined) {
-            // An available player mode should return.An available player mode should return.
+            // An available player mode should return.
             if ((!("length" in result)) || (("length" in result) && !result.length)) {
                 this.errorHandling(this.mode, `Playback using Go2RTC in mode "${this.mode}" is not possible.`);
             }

From ea756c7d03231f54b82edc9501d0da7e797a076a Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Thu, 23 Jul 2026 20:50:16 +0300
Subject: [PATCH 11/11] Minor corrections

---
 web/js/MonitorStream.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 8fcee66083..4a28ce21f1 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -539,7 +539,8 @@ function MonitorStream(monitorData) {
     this.handlerEventListener['errorStream'] = manageEventListener.addEventListener(stream, 'error',
         (e) => {
           clearTimeout(this.mseWaitingErrorReset);
-          console.warn(`Stream playback error for monitor ID=${this.id}.`, `ERROR: ${e.srcElement.error.message}`, e);
+          const mediaErrorMsg = e?.target?.error?.message || e?.srcElement?.error?.message || 'Unknown media error';
+          console.warn(`Stream playback error for monitor ID=${this.id}.`, `ERROR: ${mediaErrorMsg}`, e);
           this.writeTextInfoBlock("Error");
           this.streamErrorRegistration();
           this.restart(this.currentChannelStream);
@@ -2065,7 +2066,7 @@ function MonitorStream(monitorData) {
   };
 
   this.getCountStreamErrors = function(player) {
-    if (!player) return;
+    if (!player) return 0;
     let countErrors = 0;
     for (const key in this.playerPriority) {
       if (-1 !== player.indexOf(this.playerPriority[key]['name'])) {
@@ -2496,7 +2497,7 @@ function startMsePlay(context, videoEl, url) {
   $j('#delay'+context.id).removeClass('hidden');
 
   // This is necessary if the browser doesn't allow automatic playback with sound.
-  const self = this;
+  const self = context;
   videoEl.play().then(() => {
     console.debug("RTSP2Web type MSE started playing the video stream successfully.");
   })