mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-24 08:41:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,301 Commits 80 Branches 104 Tags
a047cedd47ef629cf14fdff6ab26b49eaae03fcf
Commit Graph

20301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Connor
a047cedd47 Initialize Poll_Trigger_State(false), 
+  Event_Poller_Healthy(false),
 2022-04-20 09:10:46 -04:00
Isaac Connor
0501f464c5 Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari 2022-04-19 19:30:27 -04:00
Isaac Connor
1561ad140a Merge branch 'master' into fix_viewing 2022-04-19 17:09:02 -04:00
Isaac Connor
ff46f78ab4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-19 17:08:19 -04:00
Isaac Connor
5672b2c195 Try out options to improve latency 2022-04-19 17:08:16 -04:00
Isaac Connor
91a5642edc merge 2022-04-19 17:07:20 -04:00
Isaac Connor
b519e3b388 spacing, default to fixed when appropriate, include state html if not website 2022-04-19 17:06:34 -04:00
Isaac Connor
3885d853f9 Don't need to use a random start on watch 2022-04-19 17:05:41 -04:00
Isaac Connor
aedfca22d6 reorg code a bit. Implement setting width & height in REQUEST 2022-04-19 16:59:11 -04:00
Isaac Connor
4393d2b9de Add CMD_STOP, convert to consts 2022-04-19 16:58:33 -04:00
Isaac Connor
61bdcc53ab add debugging and put back code in setLayout to call setScale. Add onclick to navbar elements to stop streaming when clicked. 2022-04-19 16:58:17 -04:00
Isaac Connor
4785954140 Add comments to scaleToFit 2022-04-19 16:57:30 -04:00
Isaac Connor
c171c47d58 Don't remove fixed 2022-04-19 16:56:40 -04:00
Isaac Connor
21716e994b Keep better track of timers. Add img_onerror to report when image breaks. setScale is a mess. Add some more code to guess image scale. Browser can't handle 4k jpeg streams. scaling is a must. 2022-04-19 16:56:21 -04:00
Isaac Connor
1eaeccc564 Handle zones not being set in options 2022-04-19 12:31:43 -04:00
Isaac Connor
4154731f13 test for ctx->sw_pix_fmt being AV_PIX_FMT_NONE before trying to do do hwdevice transfer 2022-04-18 18:06:05 -04:00
Isaac Connor
f8366864b5 Remove dead code 2022-04-18 18:05:32 -04:00
Isaac Connor
29cea83a4a Log the device that the error is happening for 2022-04-18 18:05:13 -04:00
Isaac Connor
510983c2e4 Add support for v4l2 input types in ffmpeg_camera. 2022-04-18 18:04:46 -04:00
Isaac Connor
bd501b38ca Include libavdevice so that we can use v4l2 inputs in ffmpeg monitor type. 2022-04-18 18:04:25 -04:00
Isaac Connor
fe6663fa39 Fix skipping based on Function instead of Capturing. 2022-04-18 18:03:50 -04:00
Isaac Connor
53805079b6 If no device specified, look in /dev/ for video devices and specify them to zmu. Fix use of undefined host var 2022-04-18 15:56:14 -04:00
Isaac Connor
01ab1c2535 Fix errors when sorting by EndDateTime. 2022-04-13 17:18:59 -04:00
Isaac Connor
5de88b8f9e zmwatch.pl can work if Decoding == Keyframes Only 2022-04-13 16:35:17 -04:00
Isaac Connor
2ff16e002b fix eslint 2022-04-12 14:04:35 -04:00
Isaac Connor
6548983f39 Make JANUS options full width and left-align things 2022-04-12 14:01:48 -04:00
Isaac Connor
43fbd7d709 Ensure rate is an integer when coming from cookie. Remove commented out rate display. 2022-04-11 09:46:47 -04:00
Isaac Connor
df61f50724 Make monitor video centered 2022-04-10 18:55:37 -04:00
Isaac Connor
0cc2a78aec add some relative positioning so that everything works. Move svg styling into .css 2022-04-10 18:55:16 -04:00
Isaac Connor
7b5ee86ee8 Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css 2022-04-10 18:54:01 -04:00
Isaac Connor
a1f0ac2e48 width=auto,height=auto,scale=fixed operates the same as scale=auto. Don't set height. Height is ONLY set when a specific height is chosen. Which may go away for an aspect ratio dropdown instead. 2022-04-10 17:30:34 -04:00
Isaac Connor
e8391ad0be Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container. 2022-04-10 17:28:38 -04:00
Isaac Connor
b339dc2686 img scaling has been moved to MonitorStream.js 2022-04-10 17:27:12 -04:00
Isaac Connor
2c0a9528b3 Fix behaviour of layout,width,height scale etc. Height is a special case, it works differently than the rest. Use MonitorStream.js functions for setting the width/height and scale of the zms url. The img is always 100% width and height, everything is set in the containing divs. 2022-04-10 17:26:23 -04:00
Isaac Connor
88665a68f5 Don't warn about not being able to keep up to maxfps 2022-04-10 13:09:55 -04:00
Isaac Connor
37d0b6e606 Add some basic sanity checks for width & height == 0 2022-04-07 19:38:43 -04:00
Isaac Connor
a58111fa46 Rough in an onclick handler for the monitor tabs so that we can store the selected tab value 2022-04-07 13:17:02 -04:00
Isaac Connor
0fc6ffe359 Use non-minified chosen.js because we made changes. 2022-04-07 13:15:15 -04:00
Isaac Connor
229f159069 If the select is hidden, it will have 0 width. So instead return 100% 2022-04-07 13:14:58 -04:00
Isaac Connor
2b1aa90b8e Implement last_dts[] because next_dts[] isn't actually useful. This fixes another ffmpeg deprecation problem by keep our own copy of cur_dts 2022-04-07 13:12:34 -04:00
Isaac Connor
55efd859c3 If deleting don't bother queuing 2022-04-07 13:11:56 -04:00
Isaac Connor
e9f248def7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 14:58:52 -04:00
Isaac Connor
10383d775a Fix on-change-this to data-on-change-this and remove an extra /tr 2022-04-06 14:58:42 -04:00
Isaac Connor
8de0ef9d30 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:39:23 -04:00
Isaac Connor
641613fe48 echo the scp command so we can cutnpaste it later 2022-04-06 10:39:19 -04:00
Isaac Connor
906951e450 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:37:10 -04:00
Isaac Connor
0e337cd8bf Remove support for Cambozola which no longer works or is needed. 2022-04-06 10:37:02 -04:00
Isaac Connor
1e6f34235c replace cur_dts mangling with use of our next_dts array 2022-04-06 09:59:13 -04:00
Isaac Connor
1f5d7866f7 Merge @alabamatoys' work to add focus controls 2022-04-06 09:03:27 -04:00
Isaac Connor
d696714fb4 add a workflow to build debian packages on release 2022-04-05 10:19:33 -04:00