Isaac Connor
e3a2099ca8
fix crash because we weren't setting alarm status
2020-07-23 16:08:35 -04:00
Isaac Connor
f217ab54a3
When event_close_mode == CLOSE_ALARM and so we want to close the recording and start a new one, don't do it when alarm_frame_count > 1 until alarm_frames > alarm_frame_count. I believe this fixes a mem leak
2020-07-21 16:17:46 -04:00
Isaac Connor
785087022d
Clear PerAlarmFrames on shutdown
2020-07-20 21:09:07 -04:00
Isaac Connor
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
Isaac Connor
5c844f9cae
remove extra space
2020-07-20 10:22:40 -04:00
Isaac Connor
d849ee54a4
Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894
2020-07-16 15:47:01 -04:00
Isaac Connor
3658c3b589
Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894
2020-07-16 15:36:26 -04:00
Isaac Connor
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
Isaac Connor
916d1ed59e
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-07 16:15:23 -04:00
Isaac Connor
af74ecac4c
Pass along the image linesize to Image constructors so that Image knows about the requirement for it to be 32byte aligned.
2020-07-07 16:14:38 -04:00
Isaac Connor
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
Isaac Connor
acf8a30434
Merge branch 'release-1.34'
2020-07-07 09:22:56 -04:00
Isaac Connor
533876f313
rewrite code to use fewer lines. No logic change.
2020-07-07 09:16:42 -04:00
Andrew Bauer
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
Isaac Connor
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
Isaac Connor
e137e1dacf
Don't consult EVENT_CLOSE_MODE if mode is RECORD
2020-06-26 19:30:35 -04:00
Isaac Connor
728f41fe9c
Log @debug when a linked monitor is disconnected. Use ZM_MAX_RESTART_DELAY instead of hard coded 60 seconds before next reconnect attempt
2020-06-23 16:56:35 -04:00
Isaac Connor
4d020bab56
spacing
2020-06-22 10:39:29 -04:00
Isaac Connor
d92772343a
Merge branch 'release-1.34'
2020-05-14 12:02:50 -04:00
Isaac Connor
16e7ca5a51
failure opening a monitor should not be fatal.
2020-05-14 12:01:24 -04:00
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
e21ffbea7d
Merge branch 'fix_zms'
2020-04-26 18:43:39 -04:00
Isaac Connor
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -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
Isaac Connor
d0c36c9888
Merge pull request #2913 from connortechnology/fix_monitor_loading
...
Fix monitor loading
2020-04-17 10:26:03 -04:00
Isaac Connor
b504110825
Correct loading monitor values from db
2020-04-16 17:54:20 -04:00
Joe540
657a353c34
Support event_close_mode for record mode
...
Support event_close_mode for record mode (with linked monitor)
2020-04-12 20:42:43 -04:00
hax0kartik
156728c9b6
Use preprocessors to ensure libvnc monitor is only built when libvnc is found
2020-03-26 00:08:00 -07:00
hax0kartik
1d3ad05bb5
Start implementing VNC
2020-03-25 23:21:34 -07: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
