mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-09 17:36:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,118 Commits 80 Branches 104 Tags
5a6e700c456176fe2eedc4065caaf9725caae00a
Commit Graph

530 Commits

Author SHA1 Message Date
Isaac Connor
251ccc0ba9 remove extra () 2018-11-26 16:20:52 -05:00
Isaac Connor
a95a012fa5 fix #2302 2018-11-12 11:56:18 -05:00
Isaac Connor
ee168bf427 Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's. 2018-09-23 16:49:06 -04:00
Isaac Connor
c70fb2f195 When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4 2018-09-10 17:11:16 -04:00
Isaac Connor
ea86cb1181 Add debugging line to try to figure out starttime in the future problem 2018-06-15 10:16:28 -04:00
Isaac Connor
b7129578c1 fix case where pre_event_count=0 and analysis_fps is set because there are no pre_event_buffers 2018-05-24 10:59:15 -04:00
Isaac Connor
5df2fbfff2 fix logic to handle no pre_event frames 2018-05-15 15:53:25 -04:00
Isaac Connor
4ca77fdd69 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-05-15 12:44:36 -04:00
Isaac Connor
98b2a3f6f0 improve structure/spacing 2018-05-15 12:44:24 -04:00
Isaac Connor
d9fff848e7 change Groups to a vector, add GroupNames function 2018-05-12 14:37:26 -07:00
Isaac Connor
0a5980ce2e Fix prealarmcount > alarm_frames. If Alarm frames is 1 and PreEventCount == 0, then the old line would have evaluated to true. By making it > alarm_count instead of >= alarm_count-1, we get the same behaviour for non-zero preevent counts, and also since alarm_frames >= 1 always, we handle the preeventcount=0 case. 2018-05-11 12:18:24 -04:00
Isaac Connor
1cd7b73114 turn off closing event in a separate thread, add Groups 2018-05-02 12:20:01 -07:00
Isaac Connor
d46c06d201 remove extra event=NULL and spaces 2018-05-01 12:19:46 -04:00
Isaac Connor
a4da624f4c break out of loops when zm-terminate is set 2018-04-27 13:20:38 -07:00
Isaac Connor
8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Isaac Connor
184596ed4b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-25 04:29:35 -04:00
Isaac Connor
20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Andy Bauer
678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor
cc525b2397 Output more detailed shared mem size info 2018-04-24 11:41:54 -04:00
Isaac Connor
5f7d404a0c spacing & style. Put locking around db accesses in RealoadLinkedMonitors 2018-04-23 16:24:15 -04:00
Isaac Connor
56186a42ef change signal_check_points to a per-monitor variable instead of parts of config. Only call SignalCheck if signal_check_points is > 0 2018-04-19 10:10:14 -04:00
Isaac Connor
eb21a5113e Add a debug line in SignaCheck function 2018-04-19 09:34:14 -04:00
Isaac Connor
fd1c69d48a switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:51:20 -04:00
Isaac Connor
3b0282f6ec Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-17 12:32:10 -04:00
Isaac Connor
0198ac832d improve logging around loss of signal and lock around static sql 2018-04-17 12:30:58 -04:00
Isaac Connor
34111251d9 Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error. 2018-04-17 07:02:52 -07:00
Isaac Connor
f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor
8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac Connor
c766c1ddd1 spacing cleanup 2018-04-12 10:28:22 -04:00
Isaac Connor
71d5984eb0 delete stream after use 2018-04-12 10:26:18 -04:00
Isaac
64cfb39043 do an initial fps report early on 2018-04-06 23:21:22 +02:00
Isaac Connor
ec5f955d26 more db locking 2018-04-05 11:30:14 -04:00
Isaac Connor
dfc35721f9 ensure that sections are always > section_length 2018-04-03 07:03:12 -07:00
Isaac Connor
a5b77a59d3 allow 0 pre_event_count 2018-03-29 12:35:03 -04:00
Isaac Connor
b22911f554 wait to closeEvent on monitor shutdown 2018-03-28 14:03:56 -04:00
Isaac Connor
b8a792cfb7 whitespace google code style 2018-03-27 11:04:40 -04:00
Isaac Connor
bcc7011871 update sql loading code in Reload, which will automatically do the db locking 2018-03-27 10:04:19 -04:00
Isaac Connor
11cf3ce482 whitespace 2018-03-22 11:33:24 -04:00
Isaac Connor
ea38f7cca4 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-15 11:43:15 -04:00
Isaac Connor
27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Isaac Connor
6f3d16fe10 label_format can be null 2018-03-13 12:06:03 -07:00
Isaac Connor
cefd00d1ea load User and Pass as well 2018-03-13 14:50:41 -04:00
Pliable Pixels
704ccaee73 2059 alarm cause (#2060) 
* added alarm_cause as a test

* initial attempt to integrate with notes

* testing sizeof

* add zone labels

* fixed typo

* fixed typo

* comments and formatting

* Downgraded invalid attribute to error

* Removed Error downgrade. Instead do a undefined check on field params

* Added help text
 2018-03-12 19:38:12 -04:00
Isaac Connor
7fb1c8921b reorder functions to put them in a better order 2018-03-09 07:50:47 -05:00
Isaac Connor
dcf7c4fdde rework loading Monitor using consistent db query 2018-03-09 07:23:40 -05:00
Isaac Connor
91c9714e43 cleanup 2018-03-02 18:26:21 -08:00
Isaac Connor
28342b907b add a thread for deleting the event. This is because writing out the final frames of an mp4 can take a long time, during which we are not analyzing. 2018-03-01 19:22:22 -08:00
Isaac Connor
3586825c90 fix preevent_count==0 causing div/0 2018-02-26 17:08:05 -08:00
Isaac Connor
e3802954f7 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-23 19:01:46 -05:00
Isaac Connor
a231f500ec better debug, whitespace 2018-02-23 19:01:42 -05:00