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

2593 Commits

Author SHA1 Message Date
Isaac Connor abb6d4f7d9 fixup some logic, remove redundant call to clearQueue, increase first_video_packet_index when clearing video frames from front in queuePacket 2018-08-17 16:06:03 -04:00
Isaac Connor 53eae61883 Mostly spacing, but simplified logic removing assumption that local cameras give keyframes. They might not in future. 2018-08-17 16:05:02 -04:00
Isaac Connor 376e15b763 trylock was interesting for debugging, but really logging should wait for the lock 2018-08-17 16:04:12 -04:00
Isaac Connor 96a1ac14e8 Don't do all the event notes stuff if notes is empty 2018-08-17 16:02:40 -04:00
Isaac Connor 4297d39df6 spacing, code style, remove useless debug logging 2018-08-11 18:49:48 -04:00
Isaac Connor b2c9c2961d spacing, code style, remove useless debug logging 2018-08-11 18:49:30 -04:00
Isaac Connor 979b31ffc3 Merge branch 'storageareas' into zma_to_thread 2018-08-11 10:08:30 -04:00
Isaac Connor cf5eab4dbc Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2018-08-09 12:50:08 -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
Isaac Connor 8792190f75 use 0 for return code when exiting cleanly 2018-05-25 14:21:41 -04:00
Isaac Connor dd8e4da9ba google code style 2018-05-25 14:21:06 -04:00
Isaac Connor 52de6ef7ea delete authenticator when destructing. reduce memleak 2018-05-25 14:20:54 -04:00
Isaac Connor e831c1563d pretty the code structure 2018-05-24 10:59:26 -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 dc5ccd04ef Update thumbnail with high scoring image. 2018-05-22 11:31:03 -04:00
Isaac Connor 4454ca0072 Merge branch 'storageareas' into zma_to_thread 2018-05-20 10:39:14 -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 038c5f4e1a log the log line not the uninitialized sql 2018-05-14 13:57:26 -04:00
Isaac Connor da8a232f01 Merge branch 'storageareas' into zma_to_thread 2018-05-12 19:45:48 -04:00
Isaac Connor d3c95ea144 fix merges 2018-05-12 19:44:20 -04:00
Isaac Connor 945825cdcb Google code style, fix join() in that we weren't using the delimitere parameter 2018-05-12 14:37:41 -07:00
Isaac Connor d9fff848e7 change Groups to a vector, add GroupNames function 2018-05-12 14:37:26 -07:00