mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-02-16 09:22:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,698 Commits 72 Branches 102 Tags
efbab4e2bcc1ef06c8ea89c8a5af48a2035fbf61
Commit Graph

590 Commits

Author SHA1 Message Date
Joe540
c9f04c9136 Support event_close_mode for record mode 
Support event_close_mode for record mode (with linked monitor)
 2020-05-01 19:10:23 -04:00
Isaac Connor
924841ae71 Merge pull request #2913 from connortechnology/fix_monitor_loading 
Fix monitor loading
 2020-04-18 17:49:34 -04:00
Selva Nair
2e7fad68d1 Properly compute video buffer length when analysis fps is set 
Currently the number of video frames kept in the buffer is set as the
pre_event_count. This falls short when the capture fps is larger
than the analysis fps. Fix by computing the retained video duration
as pre_event_count/analysis_fps

No change if analysis fps is not set.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
 2019-11-15 21:55:40 -05:00
Isaac Connor
369dd03909 remove errant i 2019-08-18 21:32:19 -04:00
Isaac Connor
503cf6cd24 More backticking of SQL 2019-08-17 14:37:19 -04:00
Isaac Connor
c7b6db9be7 Put backticks around all columns and tables in sql to deal with mysql 8 2019-08-14 16:18:21 -04:00
Isaac Connor
c1984ad7cb Fix problem calculating mem_size using an int from ImageSize. With camera resolutions going up, width*height*colour could exceed 32bits. So use a guarnteed 53bit type, which fixes the memsize calculations. Fixes #2682 2019-08-11 20:21:37 -04:00
Isaac Connor
14ed777eeb fix segfault when debbing is turned on for zma 2019-07-31 17:17:54 -04:00
Isaac Connor
48ad8d47fc Add capture_max_fps to monitor object instead of just calculating the delay. 2019-07-31 11:23:02 -04:00
Isaac Connor
d972ab6006 add min_section_length test to alarmed events that go unalarmed 2019-06-27 21:50:12 -04:00
Isaac Connor
3bd4486b65 Start event when alarm frames >= alarm_frame_count-1 because it is 1based. Add some debug. 2019-06-27 15:48:10 -04:00
Isaac Connor
434bbce954 Add loading decoder_hwaccel in Monitor 2019-06-25 15:34:17 -04:00
Isaac Connor
c3135accbb Make events close on a section length time boundary only if event_close_mode == CLOSE_TIME. When an alarm happens in event_close_mode==ALARM, close the continuous event regardless of the # of pre-event frames in the event. Add some debugging 2019-06-24 21:11:52 -04:00
Isaac Connor
2d80283844 simplify some logic in Analyze and prevent segfault when we close continuous event to start alarm event 2019-06-24 13:13:46 -04:00
Isaac Connor
6ed0074077 End continuous events on alarm (#2644) 
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it

* Spacing, google code style and tabs to spaces

* add update script to add MinSectionLength

* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
 2019-06-24 11:29:00 -04:00
Isaac Connor
0a8b7c24db don't check for alarmed zones to record stats for unless we are alarmed 2019-05-24 10:52:31 -04:00
Isaac Connor
3888d140a8 Merge branch 'master' into storageareas 2019-05-17 10:16:29 -04:00
Mitch Capper
eb005e8b9c FIFO support for zoneminder zone debugging (#2594) 
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
 2019-05-16 15:37:03 -04:00
Isaac Connor
c257fb46f6 Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas 2019-05-13 10:34:45 -04:00
Isaac Connor
aada171440 clean up some logic in Analyse 2019-05-12 09:35:48 -04:00
Isaac Connor
3a7b49560a spacing 2019-05-06 12:16:06 -04:00
Isaac Connor
9469ce8c71 Merge branch 'section_length_when_modect' into storageareas 2019-05-06 10:50:41 -04:00
Isaac Connor
9ef912f2ba add missing new event status info 2019-05-06 10:50:12 -04:00
Isaac Connor
aaf4665909 Merge branch 'section_length_when_modect' into storageareas 2019-05-03 09:41:41 -04:00
Isaac Connor
f6b6daafab close and reopen event when we hit section_length 2019-05-03 09:41:29 -04:00
Isaac Connor
626342f00e Merge branch 'master' into storageareas 2019-04-26 10:44:00 -04:00
Pliable Pixels
ea7c38ceff Alarm cause fix (#2582) 
* move alarm cause code to when the alarm flag is set

* formatting

* added temp info log

* char* not string in log

* merged alarm clause into info message about alarm

* add a comma only if there are more active zones

* JB tweak to slightly optimize leading comma processing
 2019-04-24 13:55:57 -04:00
Isaac Connor
eb76cd87bb Revert "Alarm cause fix (#2580)" (#2581) 
This reverts commit 6923382485.
 2019-04-17 13:53:11 -04:00
Pliable Pixels
6923382485 Alarm cause fix (#2580) 
* move alarm cause code to when the alarm flag is set

* formatting

* added temp info log

* char* not string in log
 2019-04-17 13:33:38 -04:00
Isaac Connor
22adb243ec Fix crash when reporting an event longer than section length when event was just closed so event is null. 2019-04-16 11:50:41 -04:00
Isaac Connor
2ff1e7ed6d Fix crash when reporting an event longer than section length when event was just closed so event is null. 2019-04-16 11:30:18 -04:00
Isaac Connor
98a9c68b8b spacing and code documentation 2019-04-15 17:54:30 -04:00
Isaac Connor
f28af7b729 store diag_path in the object and initialize them in constructor instead of constantly checking to see if they have been initialized in DetectMotion. Also use a string instead of a static char[MAX_PATH]. Also split it into diag_path_r and diag_path_d to fix the bug that only diag_path_r would ever get created and would be overwritten by the delta image. 2019-04-15 13:26:55 -04:00
Isaac Connor
93f0a03d8b spacing and code comments 2019-04-15 12:55:28 -04:00
Isaac Connor
69f812f5cc force section end when seconds % section_length == 0 which is the old behaviour. 2019-04-09 19:42:24 -04:00
Isaac Connor
acb9070b04 Add a warning when an event exceeds section length 2019-03-25 12:33:30 -04:00
Isaac Connor
6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Isaac Connor
baba438ce1 use image_count when reporting earlier than fps_report_interval 2019-02-16 11:49:28 -05:00
Isaac Connor
9f588d5758 prevent returning infinity from GetFPS 2019-01-21 13:00:10 -05:00
Isaac Connor
d068d019fb turn section_length into seconds instead of frames 2019-01-15 11:34:17 -05:00
Isaac Connor
f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor
751c312609 fix non-ascii char 2018-12-29 09:56:33 -05:00
Isaac Connor
32c88a3a41 Update status as well as fps when updating fps 2018-12-27 13:50:17 -05:00
Isaac Connor
db6d943854 If failure in connect, close the fd before returning 2018-12-27 11:53:21 -05:00
Isaac Connor
b87ae53a83 merge debug lines and correct spacing 2018-12-27 11:50:43 -05:00
Isaac Connor
1d371b7a17 Fix small memleak of linked_monitors not getting freed on Monitor destruction. Fix unlocking db mutex before logging 2018-12-20 13:41:57 -05:00
Isaac Connor
bc5f8d0d8d rework pts/dts of audio stream. Spacing. Fix crash 2018-12-04 18:23:08 -05:00
Isaac Connor
4272225a17 Merge branch 'master' into h265 2018-11-30 16:42:16 -05:00
Isaac Connor
251ccc0ba9 remove extra () 2018-11-26 16:20:52 -05:00
Isaac Connor
b291c06035 Working zms h265 playing. 2018-11-19 16:45:56 -05:00