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

2429 Commits

Author SHA1 Message Date
Isaac Connor 5eec7e00c5 Merge branch 'master' into storageareas 2018-09-09 14:09:52 -04:00
Isaac Connor a296b2b777 fix crash when savind audio on ffmpeg 2.8 2018-09-09 14:01:03 -04:00
Isaac Connor e4c87ce256 Merge branch 'master' into storageareas 2018-09-09 11:36:52 -04:00
Isaac Connor d945e2ba54 Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork. 2018-09-09 11:34:12 -04:00
Isaac Connor fe1e17d097 Capture can reasonably return -1 for EOF. 2018-09-05 11:16:17 -04:00
Isaac Connor 14b5fc3660 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-31 18:43:29 -04:00
Isaac Connor df3da6dd93 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-08-30 14:53:39 -04:00
Isaac Connor 0eaa539dc6 ZM_SWAP_PATH may not exist, so always try to create it 2018-08-30 14:53:27 -04:00
Isaac Connor f2d4739838 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-24 17:11:39 -04:00
Isaac Connor 4be2a0501c Merge branch 'master' into storageareas 2018-08-22 17:22:54 -04:00
Isaac Connor d296d59625 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-22 16:34:29 -04:00
vajonam d97eea886a fix scoring algorithim, to use max_alarm_size when specified instead of the size of the zone. (#2186) 2018-08-22 12:58:26 -04:00
Isaac Connor 90eda0b88b spacing, remove extra parenthesis 2018-08-22 11:14:00 -04:00
Isaac Connor 871e3807e6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-17 12:57:27 -04:00
Isaac Connor 3ab542199c Merge branch 'master' into storageareas 2018-08-13 11:17:04 -04:00
Isaac Connor 17a02d66f7 google code style 2018-08-11 13:35:37 -04:00
Andrew Bauer 3dc424282b Support quoting config variables (#2175) 
* allow handling of quotes in config files

* copy paste error

* surround zm_arptool in quotes
 2018-08-11 12:56:16 -04:00
Isaac Connor 3b86d9255b adjust some spacing 2018-08-10 11:16:27 -04:00
Isaac Connor 744884203c adjust some spacing 2018-08-10 11:16:20 -04:00
Isaac Connor a335eb66de remove some extra braces 2018-08-10 11:16:04 -04:00
Isaac Connor f2525253bb spacing, remove excess parenthesis etc 2018-08-10 11:15:51 -04:00
Isaac Connor 185586ecd4 we must try to create the SOCK_DIR because nowadays systemd is chrooting processes and PATH_SOCKS may not exist 2018-08-10 11:15:15 -04:00
Isaac Connor 97a6a28182 You should just mkdir and handle EEXIST because stating first is a race condition 2018-08-10 11:14:41 -04:00
Isaac Connor 3962c52288 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-09 11:23:37 -04:00
Isaac Connor 9f183f5df7 google code style, improve debugging, add bandwidth code 2018-08-09 11:23:13 -04:00
Isaac Connor a44df858be Merge branch 'master' into storageareas 2018-08-02 15:40:44 -04:00
Isaac Connor a0e67da51d Improve loging around writing out analysis frames 2018-08-02 15:40:33 -04:00
Isaac Connor 50c7eec0ff Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-02 05:25:53 -04:00
Isaac Connor 246070793b Fix crash in zma dur to images array not being allocated when analysis_fps not being set 2018-07-31 13:36:03 -04:00
Isaac Connor 908f81c6ef Add some more debug 2018-07-31 13:22:52 -04:00
Isaac Connor 639717eb7b If mysql gets restarted, and there is no change in fps, then the monitor_status record never gets updated. So just always update it. 2018-07-31 12:07:57 -04:00
Isaac Connor 61e7136857 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-07-12 17:03:21 -04:00
Isaac Connor d3034670a0 Merge branch 'master' into storageareas 2018-07-10 11:03:33 -04:00
Isaac Connor 974e42a610 spacing 2018-07-09 13:07:49 -04:00
Isaac Connor dd479c9e55 remove () around return 2018-07-04 14:50:47 -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 a594a1b6f1 Merge branch 'master' into storageareas 2018-06-15 09:45:11 -04:00
Isaac Connor 593209edd2 turn off passthrough for remote rtsp as it doesn't work at this time. 2018-06-14 13:28:05 -04:00
Isaac Connor a745790541 Use 1 for successful return from CaptureAndRecord 2018-06-14 13:27:46 -04:00
Isaac Connor 8450d532b4 Add STDC_FORMAT_MACROS and include cinttypes so that PRIu64 works on centos7 2018-06-14 12:24:58 -04:00
Isaac Connor 09dae432ce Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-06-09 12:19:50 -04:00
Isaac Connor 934ce654f9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-06-08 15:21:43 -04:00
Isaac Connor 794c6b641c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-06-04 14:59:56 -04:00
Andrew Bauer b071aaad7b
Merge pull request #2111 from connortechnology/recursive_mutex 
Implement a RecursiveMutex class which is an explicit Recursive Mutex…
 2018-06-02 17:30:21 -05:00
Isaac Connor 173121b645 Merge branch 'recursive_mutex' into storageareas 2018-06-01 11:30:08 -04:00
Isaac Connor 87d9fc447e google code style 2018-06-01 11:27:53 -04:00
Isaac Connor 316dbb5eb8 Implement a RecursiveMutex class which is an explicit Recursive Mutex. Change the db mutex to a recursive Mutex 2018-06-01 11:27:35 -04:00
Isaac Connor 64d5f180c8 add Disconnect to Close 2018-05-26 13:03:13 -04:00
Isaac Connor 84db1be31d add version test to get rid of deprecation warning for refcounted_frames 2018-05-26 13:01:51 -04:00
Isaac Connor 39db8136b3 move pre_event_images init to constructor, getting rid of static_undef tests. Initialize timestamps to 0. Clean up some logic in Analyze 2018-05-26 13:01:30 -04:00