Isaac Connor
08d82fb86a
use nullptr instead of 0 when init'ing event
2020-12-15 18:25:17 -05:00
Isaac Connor
f77292e6cc
Move the decoding_enabled logic to constructor to save a few cycles
2020-12-10 16:23:08 -05:00
Isaac Connor
7f72d5399f
add decoding_enabled and DecodingEnabled function
2020-12-10 14:05:46 -05:00
Isaac Connor
36b5702c50
Increase LinkedMonitor debugging. Fix LinkedMonitors. Fixes #3091
2020-12-05 19:36:44 -05:00
Isaac Connor
4d33667a85
Merge branch 'release-1.34'
2020-12-05 16:51:42 -05:00
Bluemax
d8993931da
Improve group permissions (mode 660)
...
Make /dev/shm files 660.
2020-12-02 21:27:00 +01:00
Isaac Connor
03f033cf36
cleanup MOnitor destructor. Most of the freeing is done in disconnect now. Fixes zms crash
2020-11-19 16:39:14 -05:00
Isaac Connor
634a3dbe81
fix crashes/memleaks when waiting for a zmc process to start. Fix other memleaks
2020-11-19 10:43:02 -05:00
Isaac Connor
6542072334
fix logic causing segfault instead of waiting for zmc. Remove trailing whitespaces
2020-11-18 09:56:13 -05:00
Isaac Connor
d2a203014f
rename diagpipe-r so that we don't have to create directories in SOCKS_DIR
2020-11-13 17:05:03 -05:00
Isaac Connor
08a8155b47
Implement a Monitor::disconnect function. Fix Fatals during connect and cleanup Analysis Monitor code to wait around for zmc. Handle zmc going away gracefully. Fixes a slow zma startup due to zmc not being setup yet.
2020-11-13 12:27:51 -05:00
Isaac Connor
de74a15ab1
Move diag_fifo pipes in SOCKS_DIR instead of assigned Storage area. Storage areas could be a fs that cannot handle sockets or fifos like NFS.
2020-11-12 11:53:51 -05:00
Isaac Connor
f91dcc9b60
declar rc as int
2020-11-11 20:05:47 -05:00
Isaac Connor
9636a76ccf
drop db lock before reporting mysql_errors
2020-11-11 17:42:29 -05:00
Isaac Connor
27f336975c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-05 18:12:43 -05:00
Isaac Connor
33f58add11
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:49:47 -05:00
Isaac Connor
296f6af7fb
Remove dirty hack that sets EndTime from monitor. It can get set in event destructor
2020-11-01 17:15:42 -05:00
Isaac Connor
617a1faa99
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
2020-10-19 13:25:26 -04:00
Isaac Connor
eefbed04c1
Add debugging for min_section_length keeping us in ALERT
2020-10-19 13:24:30 -04:00
Isaac Connor
df2f5f814b
fix case in mocord where cause would not contain motion
2020-10-19 13:24:08 -04:00
Isaac Connor
cc24df9593
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
2020-10-19 13:23:40 -04:00
Isaac Connor
ae506d94fa
Improve log line telling why we are going into alarm
2020-10-11 10:01:11 -04:00
Isaac Connor
2f2562a876
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
2020-10-08 16:46:30 -04:00
Isaac Connor
71686fc1f2
fix case in mocord where cause would not contain motion
2020-10-08 15:50:12 -04:00
Isaac Connor
419a03db25
Add debugging for min_section_length keeping us in ALERT
2020-10-05 12:11:39 -04:00
Isaac Connor
283f224a95
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
2020-10-05 09:19:48 -04:00
Peter Keresztes Schmidt
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Isaac Connor
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
Isaac Connor
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
1f889bd086
def don't use linesize when allocating share images
2020-07-24 15:26:48 -04:00
Isaac Connor
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
Isaac Connor
e9681fcdcf
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:31:12 -04:00
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
