d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
302189a65e
Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it.
2020-08-06 10:11:00 -04:00
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
1f889bd086
def don't use linesize when allocating share images
2020-07-24 15:26:48 -04:00
0e9da28a97
Don't pass linesize to shared images. Shared images have to have a contiguous chunk of memory.
2020-07-24 12:48:38 -04:00
e9681fcdcf
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:31:12 -04:00
e3a2099ca8
fix crash because we weren't setting alarm status
2020-07-23 16:08:35 -04:00
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
785087022d
Clear PerAlarmFrames on shutdown
2020-07-20 21:09:07 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
5c844f9cae
remove extra space
2020-07-20 10:22:40 -04:00
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
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
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
916d1ed59e
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-07 16:15:23 -04:00
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
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
acf8a30434
Merge branch 'release-1.34'
2020-07-07 09:22:56 -04:00
533876f313
rewrite code to use fewer lines. No logic change.
2020-07-07 09:16:42 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
e137e1dacf
Don't consult EVENT_CLOSE_MODE if mode is RECORD
2020-06-26 19:30:35 -04:00
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
4d020bab56
spacing
2020-06-22 10:39:29 -04:00
d92772343a
Merge branch 'release-1.34'
2020-05-14 12:02:50 -04:00
16e7ca5a51
failure opening a monitor should not be fatal.
2020-05-14 12:01:24 -04:00
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
e21ffbea7d
Merge branch 'fix_zms'
2020-04-26 18:43:39 -04:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
924841ae71
Merge pull request #2913 from connortechnology/fix_monitor_loading
...
Fix monitor loading
2020-04-18 17:49:34 -04:00
d0c36c9888
Merge pull request #2913 from connortechnology/fix_monitor_loading
...
Fix monitor loading
2020-04-17 10:26:03 -04:00
b504110825
Correct loading monitor values from db
2020-04-16 17:54:20 -04:00
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
156728c9b6
Use preprocessors to ensure libvnc monitor is only built when libvnc is found
2020-03-26 00:08:00 -07:00
1d3ad05bb5
Start implementing VNC
2020-03-25 23:21:34 -07:00
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
369dd03909
remove errant i
2019-08-18 21:32:19 -04:00
503cf6cd24
More backticking of SQL
2019-08-17 14:37:19 -04:00
c7b6db9be7
Put backticks around all columns and tables in sql to deal with mysql 8
2019-08-14 16:18:21 -04:00
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
14ed777eeb
fix segfault when debbing is turned on for zma
2019-07-31 17:17:54 -04:00
48ad8d47fc
Add capture_max_fps to monitor object instead of just calculating the delay.
2019-07-31 11:23:02 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
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
434bbce954
Add loading decoder_hwaccel in Monitor
2019-06-25 15:34:17 -04:00
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
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
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
Isaac Connor
Isaac Connor
Andrew Bauer
Joe540
hax0kartik
Selva Nair