Isaac Connor
bfbe47b7cc
Merge pseudo:sandbox/ZoneMinder into ai_server
2026-01-31 19:45:37 -05:00
Isaac Connor
eae89025ee
refactor: rename RTSP2WebStream to StreamChannel
...
Rename applies to Go2RTC, Janus, and RTSP2Web streaming options.
Update enum values from Primary/Secondary to Restream/CameraDirectPrimary/CameraDirectSecondary.
- Add db migration zm_update-1.37.79.sql to rename column and migrate data
- Update C++ enum StreamChannelOption and member stream_channel
- Update PHP getStreamChannelOptions() method
- Update all JavaScript references
- Auto-select CameraDirectPrimary when Restream option becomes disabled
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2026-01-31 19:37:08 -05:00
Isaac Connor
02685bff7e
Pick up missed update for Restream and RTSP_User
2026-01-31 18:54:14 -05:00
Isaac Connor
4596b27c19
Add Restream to go2rtc options
2026-01-30 15:06:26 -05:00
Isaac Connor
9389fddf72
Merge remote-tracking branch 'upstream/master' into ai_server
2026-01-29 18:50:59 -05:00
Isaac Connor
3bd34ad3db
Merge remote-tracking branch 'upstream/master' into ai_server
2026-01-29 14:20:35 -05:00
Isaac Connor
010959c9d4
fix: only show monitor edit button if user has edit permission
...
The edit button overlay on the montage view stream is now conditionally
displayed based on the user's edit permission for that monitor.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2026-01-29 13:56:03 -05:00
Ben Dailey
c80542343a
Remove Preview Rate Control. Disable BuiltIn Video controls.
2026-01-29 11:18:30 -05:00
Isaac Connor
a530109492
Merge remote-tracking branch 'upstream/master' into ai_server
2026-01-02 12:53:51 -05:00
Isaac Connor
e6c5bdb85d
Use modern string interpolation style
2025-12-22 19:43:05 -05:00
Isaac Connor
4fa20ef716
Merge branch 'master' into ai_server
2025-12-19 17:14:00 -05:00
Isaac Connor
254fd58c40
Use css style= to set width of video tag, and if height is specified, also set it. Fixes streams not having height.
2025-12-19 12:03:29 -05:00
Isaac Connor
6c2ad8d906
Use the same code for ImageStill and for ImageStream. Use ImageStream when mode == paused. Fixes #4491
2025-12-19 11:10:32 -05:00
Isaac Connor
7f87eb3e9e
Merge remote-tracking branch 'upstream/master' into ai_server
2025-10-30 07:52:02 -04:00
Isaac Connor
736610d349
Simplify monitor state html, mostly to include the stream-info into the part that gets hidden with the other state info
2025-10-29 12:15:32 -04:00
Isaac Connor
9932c1f690
Add missing EncoderHWAccel fields
2025-10-27 09:40:06 -04:00
Isaac Connor
b8168403f0
Merge remote-tracking branch 'upstream/master' into ai_server
2025-10-22 09:53:23 -04:00
Isaac Connor
ecd37ae6c7
Revert change to assign 4 streams per port. It caused more trouble than it was worth
2025-10-16 12:13:53 -04:00
Isaac Connor
83800e8753
Test for existend of type in defaults to avoid warning
2025-10-10 13:26:57 -04:00
Isaac Connor
c1fe4a620a
Merge remote-tracking branch 'upstream/master' into ai_server
2025-10-10 13:07:10 -04:00
Isaac Connor
b5a10ca1ce
Add +1 because we will now use 30000 instead of 30001.. so some existing configs may break.
2025-10-09 11:01:08 -04:00
Isaac Connor
1fc27261e1
Add initial_scale property
2025-10-07 21:02:30 -04:00
Isaac Connor
756f197098
Merge remote-tracking branch 'upstream/master' into ai_server
2025-10-03 12:40:34 -04:00
Isaac Connor
e04d38f83e
When using MIN_SPREAMING_PORT, divide by 5 so we get 5 streams per port
2025-10-01 21:01:29 -04:00
Isaac Connor
2a9b7d1f61
Merge remote-tracking branch 'upstream/master' into ai_server
2025-10-01 09:24:16 -04:00
Isaac Connor
3373fb71aa
Simply zms option let's just assume that that we can stream
2025-09-25 17:36:13 -04:00
Isaac Connor
5982229369
Merge remote-tracking branch 'upstream/master' into ai_server
2025-09-25 08:55:48 -04:00
Isaac Connor
fe323e0aff
Add DefaultPlayer support in getStreamSrc
2025-09-24 14:05:58 -04:00
Isaac Connor
063ec36106
Add DefaultPlayer to Monitor object
2025-09-24 09:54:19 -04:00
Isaac Connor
a0cc82b490
Merge branch 'master' into ai_server
2025-09-06 11:30:48 -04:00
Isaac Connor
edf87d6463
Move stream-info off the video stream down to where the monitor status info is.
2025-09-05 09:35:53 -04:00
Isaac Connor
28044f4fad
Merge branch 'master' into ai_server
2025-08-20 16:47:25 -04:00
Isaac Connor
7bf2fb8fce
Convert OutputCodec from int to varchar OutputCodecName. ffmpeg has different values for codec_id for different versions of ffmpeg. So just use the codec name instead.
2025-08-20 15:59:02 -04:00
Isaac Connor
2de116e8e4
Rough in restream in UI
2025-08-07 14:27:09 -04:00
Isaac Connor
c66c691280
Merge branch 'master' into ai_server
2025-08-04 20:02:25 -04:00
IgorA100
66322e03f1
Chore: Extra semicolon (Monitor.php)
2025-08-04 20:52:51 +03:00
IgorA100
bfda588214
Transferring HTML code from video-stream.js (Monitor.php)
2025-08-03 01:03:33 +03:00
Isaac Connor
15996c4c8b
Merge branch 'master' into ai_server
2025-07-23 18:17:29 -04:00
Isaac Connor
8be098cb89
Remove player stuff from streamMode as it doesn't belong.
2025-07-22 13:03:38 -04:00
Isaac Connor
835a3d74e3
Revert "Remove getStreamMode which was actually getPlayer and should just be replaced by a monitor field for defaultPlayer."
...
This reverts commit c05ee7e43c
2025-07-22 13:02:43 -04:00
Isaac Connor
c05ee7e43c
Remove getStreamMode which was actually getPlayer and should just be replaced by a monitor field for defaultPlayer.
2025-07-21 08:06:51 -04:00
Isaac Connor
1cdc96e1c9
Merge branch 'master' into ai_server
2025-06-29 00:56:38 -04:00
Isaac Connor
68fa95d468
Move getStreamModeMonitors to monitor->getSTreamMode. Add Volume/Mute. Change behaviour of Play/Pause to only show one of them at a time.
2025-06-26 15:05:03 -04:00
Isaac Connor
fee01f9c9b
Add Go2RTC support to monitor
2025-06-26 14:57:06 -04:00
Isaac Connor
90b93e8849
Only include video tag if janus or rtsp2web. go2rtc will create it's own video stream in js
2025-06-09 15:21:35 -04:00
Isaac Connor
6109f0d420
Merge branch 'add_go2rtc' into ai_server
2025-06-09 12:25:08 -04:00
Isaac Connor
82330c249b
Just use go2rtc provided video-stream.js and video-rtc.js method of doing webrtc etc.
2025-06-09 11:47:38 -04:00
Isaac Connor
06c1d953d5
Fix streaming mode returned by getStreamMode
2025-06-05 14:44:29 -04:00
Isaac Connor
2cdfa0695d
Alter what getStreamMode returns to include the player and stream type
2025-05-12 17:50:10 -04:00
Isaac Connor
7c7c6b771a
ADd Go2RTC fields. Move getStreamModeMonitor into the monitor object
2025-05-11 17:43:02 -04:00
