mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 06:48:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,621 Commits 80 Branches 104 Tags
4454ca0072f5853d524729eee75f75b8d5be71e0
Commit Graph

124 Commits

Author SHA1 Message Date
Isaac Connor
4454ca0072 Merge branch 'storageareas' into zma_to_thread 2018-05-20 10:39:14 -04:00
Isaac Connor
d3c95ea144 fix merges 2018-05-12 19:44:20 -04:00
Isaac Connor
f6139d33ed Merge branch 'storageareas' into zma_to_thread 2018-05-05 12:25:11 -04:00
Isaac Connor
61fe2a734b Add SIGHUP handler so that zmc reloads instead of dies 2018-04-25 09:38:18 -04:00
Isaac Connor
3b9f7b38c5 Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long. 2018-04-23 10:40:42 -04:00
Isaac Connor
609244857d google styleguide updates 2018-04-23 10:39:32 -04:00
Isaac Connor
9c0600cace Add a HUP Handler 2018-04-23 10:29:42 -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
cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04:00
Isaac
06fed41d5a whitespace 2018-04-06 23:21:47 +02:00
Isaac Connor
b9da309904 remove spaces 2018-04-05 11:33:09 -04:00
Isaac Connor
e7ec1086ea rework zmc delay code to be more readable and use few gettimeofday calls and be more efficient 2018-02-15 14:07:05 -05:00
Isaac Connor
b5e0745ac7 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:03 -05:00
Isaac Connor
a82e17ff4b Merge branch 'storageareas' into zma_to_thread 2018-02-12 17:16:33 -05:00
Isaac Connor
4f57a40cb6 Update Monitor_Status after connection lost and when exiting 2018-02-12 13:24:19 -05:00
Isaac Connor
d8e4b0abfb Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	scripts/zmwatch.pl.in
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	src/zmc.cpp
 2018-02-06 10:34:17 -05:00
Isaac Connor
310193791d add a 10 second sleep before reconneting 2018-02-04 11:54:11 -08:00
Isaac Connor
e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor
a1392bf613 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_mpeg.cpp
	src/zmc.cpp
 2018-02-02 14:23:26 -05:00
Isaac Connor
ba2c111762 restructure to keep trying to open the camera instead of exiting. 2018-01-31 14:32:48 -05:00
Isaac Connor
8c90a8a47a Fix Id => MonitorId in MonitorStatus 2018-01-29 23:06:59 -05:00
Isaac Connor
71263c525b :Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
 2018-01-24 11:55:32 -05:00
Isaac Connor
50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Isaac Connor
c3ab7d5269 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_packetqueue.cpp
	src/zma.cpp
 2018-01-10 14:24:46 -05:00
Isaac Connor
7d2becee21 add reload on HUP 2018-01-10 12:59:42 -05:00
Isaac Connor
212cd7e6c4 tidy ups 2017-12-15 10:46:43 -05:00
Isaac Connor
9a5371c371 don't exit on capture fail 2017-12-08 21:28:47 -05:00
APHW2 MFGENG
0cfc42b9fd some cleanups/fixes 2017-12-05 13:16:52 -08:00
Isaac Connor
0865201e1e seems to work 2017-12-01 07:26:34 -05:00
Isaac Connor
74650ebc70 simplify Analysis 2017-11-20 11:48:56 -05:00
Isaac Connor
cd596d49e3 fix local camera inputstream 2017-11-17 16:49:01 -05:00
Isaac Connor
57c8cdde63 Merge branch 'storageareas' into put_ffmpeg_into_event_wip 2017-11-14 02:45:34 -05:00
Isaac Connor
39b12057f2 add saveJPEGs to Events 2017-11-13 21:34:39 -05:00
Isaac Connor
ecd86b3fde cleanup 2017-11-12 15:18:39 -05:00
Isaac Connor
50d3b168fa wip 2017-11-12 11:50:07 -05:00
APHW2 MFGENG
d15d36f389 rework, compiles, won't open h264 2017-11-09 11:50:20 -08:00
Isaac Connor
0fbb473dd4 refactoring 2017-10-25 13:06:15 -07:00
Isaac Connor
cfaf10335b add Monitor status, capturrFPS and AnalysisFPS to processes 2017-10-24 16:08:31 -07:00
Isaac Connor
b30e8953dd starting to rough in adding a frame to zmpacket 2017-09-04 16:36:34 -04:00
Isaac Connor
b9c57028c8 Merge branch 'storageareas' into zma_to_thread 2017-09-04 15:29:52 -04:00
Isaac Connor
7d2453e7ac fix google code style 2017-09-04 15:28:23 -04:00
Isaac Connor
da74f8d533 initial turn zma into a thread 2017-07-10 19:37:55 -04:00
Isaac Connor
273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Isaac Connor
30455feef7 code style 2017-03-31 11:12:52 -04:00
Isaac Connor
a33a8402ef Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon 
Conflicts:
	src/zmf.cpp
	src/zms.cpp
 2017-03-24 12:14:16 -04:00
Kfir Itzhak
e02e033cc8 Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection 2017-03-19 02:05:01 +02:00
SteveGilvarry
e5b18ee213 Remove zmc -r argument as it does not seem to be implemented. 2017-03-18 23:25:14 +11:00
Isaac Connor
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
11b160b7d1 document code blocks 2016-11-03 16:44:03 -04:00