ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,035 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

196 Commits

Author SHA1 Message Date
Isaac Connor 30b5612691 fix case of sql 2019-09-28 12:57:00 -04:00
Isaac Connor c8934dac7f Remove useless debug 2019-09-17 10:30:00 -04:00
Isaac Connor 505a041c88 Don't add a final db frame to the event, because there is no jpg for the frame. I don't know why this code was originally added. 2019-08-28 10:17:23 -04:00
Isaac Connor ee80b086af log the # of db entries being written before doing the writing so that we know the # being written 2019-06-10 14:13:21 -04:00
Isaac Connor 50436c5ea1 Correct debug line listing how many frames are being written to db 2019-06-10 13:59:01 -04:00
Isaac Connor ebc9a77c9d When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of ! 2019-06-10 12:57:57 -04:00
Isaac Connor a16d29740c Fix final frame of event having same id as the second last 2019-06-06 13:49:01 -04:00
Isaac Connor f719dd9acc always commit buffered db_frames when we have a new max score image or alarm cause image 2019-04-07 10:29:02 -04:00
Isaac Connor bc62493096 Increase sql buffer space because we are using path strings that are PATH_MAX size. 2019-04-04 12:55:35 -04:00
Isaac Connor f6d5038586 we only use event_file if we are writing out a jpg, so only generate the event_file string if we are writing out jpgs 2019-04-04 12:37:25 -04:00
Isaac Connor 271937f005 store the snapshot_file and alarm_file strings in the boject during construction so that we don't have to do it everytime we write out an image 2019-04-04 12:28:08 -04:00
Isaac Connor c626b0fb8e if adding a closing frame, queue it with the rest of the frames so they get written all at once. Queue 20 frames instead of 10 2019-02-19 12:00:17 -05:00
Isaac Connor 89c9a28614 Merge branch 'master' into storageareas 2018-12-14 12:25:06 -05:00
Isaac Connor ad4f131284 Must unlock before logging 2018-12-14 12:22:10 -05:00
Isaac Connor 0bfe1007c8 Merge branch 'master' into storageareas 2018-12-14 10:16:08 -05:00
Isaac Connor 1a05e777c0 fix path not being constructed properly for shallow event storage 2018-12-14 08:54:29 -05:00
Andrew Bauer 22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm 
Save first alarm
 2018-12-11 09:35:40 -06:00
Isaac Connor ab9081e1bf create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db. 2018-12-05 13:18:21 -05:00
Isaac Connor 87140ecdb5 white space and quiet warning 2018-11-17 10:39:42 -05:00
Pliable Pixels 01a57222d3 keep track if we have written alarmed frame incase savejpeg is off 2018-11-12 12:43:20 -05:00
Isaac Connor 89cd7ceaf8 Whitespace, extra parentheses, google code style 2018-09-23 16:47:06 -04:00
Isaac Connor c8b10b2e3b factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason. 2018-09-19 19:50:26 -04:00
Isaac Connor cc417cf3e7 reverse order of tests to be more efficient 2018-09-11 13:19:33 -04:00
Isaac Connor a0e67da51d Improve loging around writing out analysis frames 2018-08-02 15:40:33 -04:00
Isaac Connor e831c1563d pretty the code structure 2018-05-24 10:59:26 -04:00
Isaac Connor dc5ccd04ef Update thumbnail with high scoring image. 2018-05-22 11:31:03 -04:00
Isaac Connor 375af59657 use unsigned for formatting 2018-05-04 09:58:22 -04:00
Isaac Connor 6d5e46e91f whitspace 2018-05-03 13:54:05 -04:00
Isaac Connor d8b461806a fix StartTime in the future log 2018-05-02 11:37:54 -04:00
Isaac Connor 2845f891bc Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-30 10:12:41 -04:00
Isaac Connor e55846e716 Log start_time when its > Now 2018-04-30 10:12:34 -04:00
Isaac Connor a4da624f4c break out of loops when zm-terminate is set 2018-04-27 13:20:38 -07:00
Andrew Bauer 35dcedb2ad
fix ftbs on el7 
adds compiler support for PRIu64
 2018-04-21 20:55:21 -05:00
Isaac Connor e56cf0b31c switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:57:19 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 2af539e916 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-12 11:39:30 -04:00
Isaac Connor 3b7992a39b converity scan fixes, and close the .mp4 after updating the db record. 2018-04-12 10:22:46 -04:00
Isaac Connor db0dac6eb2 Don't use static sql when multiple threads might be using it 2018-04-10 13:06:36 -07:00
Isaac Connor 9fde052d39 merge 2018-04-03 14:41:32 -07:00
Isaac Connor 2107e5b223 whitespace 2018-03-23 12:50:53 -04:00
Isaac Connor ede13ac41b put all db access after finishing encoding, because we don 
't care when they happen, and we need the encoding done.
 2018-03-02 18:25:20 -08:00
Isaac Connor 1bc6e40fbc add mutex locking around mysql functions so that we can go multi-threaded 2018-03-01 19:20:52 -08:00
Isaac Connor c9bc5a8cd8 if given timestamp is in the future, reset it, it is likely invalid 2018-01-31 14:33:20 -05:00
Isaac Connor 218e34a079 Can only have 6 digitals, not 8 2018-01-30 11:23:09 -05:00
Isaac Connor 5a3d0b944e Detect invalid delta_time and don't exit on failed mysql 2018-01-26 12:21:12 -05:00
Isaac Connor 9284e26512 get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot. 2018-01-13 15:15:14 -05:00
Isaac Connor 2922a86d23 fixes to new Storage Schemes code 2017-12-19 11:01:03 -05:00
Isaac Connor 8a8001f14a fix missingc_str() 2017-12-18 13:25:24 -05:00
Isaac Connor 705a98276f change StorageScheme to Scheme 2017-12-18 13:17:43 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00