Commit Graph

351 Commits (master)

Author SHA1 Message Date
IgorA100 a16143aae9
Fix: Check for existence of "this.webrtc" before checking "close" method (MonitorStream.js)
In addition to #4407
Otherwise, there may be an error when switching start/stop quickly.
2025-08-05 19:02:06 +03:00
IgorA100 c962575d90
Fix: Correct stop of go2rtc. It is required to close the stream, not just disconnect (MonitorStream.js)
Otherwise, the stream may remain alive and there will be problems when switching players and parasitic network traffic is possible.
2025-08-05 12:33:34 +03:00
Isaac Connor 8e46bc0933
Merge pull request #4397 from IgorA100/patch-552676
Fix: Change stream channel for Player=Auto on Watch page
2025-08-04 12:09:44 -04:00
IgorA100 e89c608ec9
On error set 'current-mode'='ERROR' (video-stream.js) 2025-08-04 13:11:16 +03:00
IgorA100 cdfa0df471
Set the value of the "current-mode" attribute (video-stream.js)
Because it is much easier to track attribute changes than property changes
2025-08-04 13:08:55 +03:00
IgorA100 be84f309e7
Save the current mode in the variable "currentMode" (video-stream.js)
Relevant for the "Auto" mode
2025-08-03 23:11:05 +03:00
IgorA100 8cd9212660
Update video-stream.js 2025-08-03 18:19:11 +03:00
IgorA100 34c62f538c
Update MonitorStream.js 2025-08-03 12:02:20 +03:00
IgorA100 9f35ad6b53
Added method "updateStreamInfo()" (MonitorStream.js) 2025-08-03 12:00:35 +03:00
IgorA100 5869998636
Moving HTML code to "\includes\Monitor.php" (video-stream.js) 2025-08-03 00:57:25 +03:00
IgorA100 d2a51e77fc
When stopping, check MonitorStream.activePlayer instead of MonitorStream.player(MonitorStream.js)
This is due to the fact that in the "Auto" mode, MonitorStream.player will be empty!!!
2025-08-03 00:33:00 +03:00
IgorA100 b01cbd97d7
Fix: Actions when pressing the Play and Pause buttons (MonitorStream.js)
Since we can now change the player type on the viewing page, we need to analyze "MonitorStream.activePlayer" instead of "MonitorStream.RTSP2WebEnabled" and "MonitorStream.Go2RTCEnabled"
2025-07-30 20:03:02 +03:00
IgorA100 b28d6e2a7d
Fix: If "Janus" is disabled in the monitor settings, then set disabled in the list of players on the Watch page (MonitorStream.js) 2025-07-30 01:21:04 +03:00
IgorA100 f309d194f6
More correct stopping of the Janus player (MonitorStream.js) 2025-07-29 17:57:59 +03:00
Isaac Connor 8f8abb70d2 Handle option not existing and so referencing .disabled fails 2025-07-26 12:21:54 -04:00
Isaac Connor 1591df91b5
Merge pull request #4390 from IgorA100/patch-32796
Fix: RTSP2Web after closing "RTCPeerConnection" browser should not try to get object (MonitorStream.js)
2025-07-25 16:42:45 -04:00
Isaac Connor 6cf3a3e174
Merge pull request #4391 from IgorA100/patch-684425
Fix: Removed excessive logging, we use it only for debugging (MonitorStream.js)
2025-07-25 16:42:06 -04:00
IgorA100 9497938f5d
Fix: Removed excessive logging, we use it only for debugging (MonitorStream.js) 2025-07-25 21:10:41 +03:00
IgorA100 6d24ad8cfa
Fix: RTSP2Web after closing "RTCPeerConnection" browser should not try to get object (MonitorStream.js) 2025-07-25 20:52:05 +03:00
IgorA100 042496e9f2 The tooltip about player unavailability in <select> on Watch page now uses translation
'PlayerDisabledInMonitorSettings'  => 'The player is disabled in the monitor settings.',
2025-07-25 15:29:25 +03:00
IgorA100 42607c84d5
Missing semicolon (MonitorStream.js) 2025-07-25 14:16:55 +03:00
IgorA100 a01a06bd4d
Added the variable "activePlayer". It is necessary to understand which player is used in the "Auto" mode (MonitorStream.js) 2025-07-25 14:01:20 +03:00
IgorA100 989b4a8628
Fix: Missing semicolons (MonitorStream.js) 2025-07-24 23:50:35 +03:00
IgorA100 8da9cb3ba7
We will now manage player availability here (MonitorStream.js) 2025-07-24 23:41:49 +03:00
IgorA100 69a72700b9
Merge branch 'ZoneMinder:master' into patch-784062 2025-07-24 23:39:37 +03:00
IgorA100 ccaf00f842
Avoid JS errors when stopping go2rtc stream unsuccessfully (MonitorStream.js) 2025-07-24 19:00:24 +03:00
IgorA100 bded13752c
On Montage page StreamChannel is now always used from the monitor settings, as it was before (MonitorStream.js)
Added support for streamChannel = 'default' for Go2RTC
2025-07-24 16:50:46 +03:00
IgorA100 e00f8dc24b
The MonitorStream.start() method can now be passed both a numerical channel value and a string, including an empty one. (MonitorStream.js) 2025-07-24 16:24:04 +03:00
IgorA100 e588ad4e7a
Support switching between Primary & Secondary streams (MonitorStream.js)
To #4381
2025-07-23 18:10:01 +03:00
Isaac Connor 783974c4b4
Merge pull request #4376 from IgorA100/patch-771054
Fix: Run ResizeObserver for Go2RTC on Montage page
2025-07-22 19:46:22 -04:00
IgorA100 c683b14a89
Fix: tabs->space (MonitorStream.js) 2025-07-23 00:49:10 +03:00
IgorA100 de57d830e4
We do not use the document hiding/showing analysis from "video-rtc.js", because we have our own analysis (MonitorStream.js) 2025-07-23 00:47:23 +03:00
IgorA100 fc5e53d00f
Fix: Broken channel switching (MonitorStream.js)
You can't use "!streamChannel" in the condition, because "streamChannel = 0" will be true.
That is, we have channel 0 and channel 1.
In this case, if you don't pass anything to the "MonitorStream.start" method, then the default channel specified in the monitor settings is used.
If we want to use channel 0, we call it like this:
MonitorStream.start(0)
If the first one, then like this:
MonitorStream.start(1)
If the default one from the monitor settings, then like this:
MonitorStream.start()
2025-07-23 00:02:12 +03:00
IgorA100 afeeb5dca0
When using go2rtc, perform an Observe on the newly created <video-stream> element (MonitorStream.js) 2025-07-22 19:34:14 +03:00
IgorA100 0f40b28d3b
We don't need a delay when stopping (MonitorStream.js)
The delay is used in the VideoRTC.disconnectedCallback() method
Alternatively, you can add an optional argument "immediately" to the disconnectedCallback() method, but I did not edit video-rtc.js
2025-07-21 23:57:08 +03:00
IgorA100 c758aa6889
Correctly close go2rtc stream when executing "stop" command (MonitorStream.js)
This should be enough.
2025-07-21 23:40:40 +03:00
Isaac Connor 7c6aa9e539 Fix eslint 2025-07-21 10:17:25 -04:00
IgorA100 b2e0d696ba
Revert "if" (MonitorStream.js) 2025-07-21 12:47:31 +03:00
IgorA100 e8ef6d729e
Stream stopping fix for RTSP2Web and Go2Rtc (MonitorStream.js)
Flow stops for Go2Rtc require further adjustment.
2025-07-21 11:21:06 +03:00
IgorA100 fcfc58e6a8
Don't change "src" attribute when using RTSP2Web (MonitorStream.js) 2025-07-20 11:52:51 +03:00
IgorA100 51c2083ef6
Returned the conditions as they were before (MonitorStream.js) 2025-07-20 11:33:59 +03:00
IgorA100 394f90fb1f
Update MonitorStream.js 2025-07-20 02:01:49 +03:00
IgorA100 3c744084c2
Remove Timeout and perform "reject()" immediately at the moment of unsuccessful attempt to delete MSE buffer (MonitorStream.js) 2025-07-20 01:56:46 +03:00
IgorA100 09c2463f70
Fix: Correct switching of players (MonitorStream.js)
- When changing the player, set the correct value in "this.RTSP2WebType"
- Incorrect placement of brackets in the conditions when starting a stream
- When stopping "webrtc", clear "stream.srcObject"
- When executing ".stopMse", limit the promise wait time to 500ms and, in case of failure, execute reject()
2025-07-20 01:33:56 +03:00
Isaac Connor 4dfa260458 Fix eslint 2025-07-19 17:08:44 -04:00
Isaac Connor acce1217b3 Only do Rtsp2Web resyncing if we are using rtsp2web. Fixes restarts with go2rtc 2025-07-19 16:59:20 -04:00
Isaac Connor 4043c02d51 Clear img/src before calling stop so that we don't try to load a still image in kill 2025-07-18 18:23:36 -04:00
Isaac Connor b0d0021b71 Remove dead code 2025-07-18 18:23:12 -04:00
Isaac Connor 4fb00af91a Allow forcing stream mode 2025-07-18 18:21:42 -04:00
Isaac Connor 06636d58fb Show volume controls for rtsp2web to 2025-07-17 15:35:54 -04:00