mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 14:53:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,250 Commits 80 Branches 104 Tags
9a5371c3717cac86b4b2a9eae02b0bda7b4730ab
Commit Graph

98 Commits

Author SHA1 Message Date
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
Isaac Connor
2b37999cd5 Merge branch 'fix_zm_image_memleak' into storageareas 2016-10-07 11:39:03 -04:00
Isaac Connor
006fcad10a move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:35:14 -04:00
Isaac Connor
37a4c67ae6 move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:33:25 -04:00
Isaac Connor
81c0b28786 fix call to setStartTime 2016-09-15 11:43:08 -04:00
Isaac Connor
8f33ed6ca6 introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started. 2016-09-15 11:16:05 -04:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Andrew Bauer
4deb0d53c8 Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
Isaac Connor
a534e66437 Add version to the startup log line 2015-06-08 10:24:40 -04:00
Emmanuel Papin
7811354d92 Move iostream inclusion in zm.h and declare explicitely the namespace for cout 2015-05-29 23:22:20 +02:00
Isaac Connor
21915eb92c Merge branch 'master' into freebsd_fixes 2015-03-31 11:06:53 -04:00
Isaac Connor
2e10263b64 Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1 2015-03-04 16:34:31 -05:00
Isaac Connor
c7dc157f4d FreeBSD fix 2015-02-24 09:22:55 -05:00
Isaac Connor
6f42f1c6d8 add version command line argument to zmc 2015-01-06 20:49:33 -05:00
Isaac Connor
56b1a50b2b revert 2015-01-03 14:07:18 -05:00
Isaac Connor
af570259d1 got these swapped, should be the other way around 2015-01-03 13:59:23 -05:00
Isaac Connor
e460c6f448 BSD uses some different includes, these are from FreeBSD ports 2015-01-01 17:18:12 -05:00
Isaac Connor
48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Emmanuel Papin
73b25a1de0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches 2014-11-29 03:39:05 +01:00
manupap1
b2d3daaa65 Fix a mismatch free in zmc binary 2014-11-15 13:10:19 +01:00
manupap1
b4732e4750 Close logger and database on exit 2014-11-14 22:17:44 +01:00
Isaac Connor
9016e30f92 BSD uses /dev/bktr0 instead of /dev/video. This is actually pulled FreeBSD ports. 2014-11-13 14:47:07 -05:00
Kfir Itzhak
cd154e86f2 Remove accidently committed planned crash code in src/zmc.cpp 2013-10-07 02:44:56 +03:00
Kfir Itzhak
0bb2ee7efc More signal improvements: 
1) Cleaner code
2) Fixed the path displayed in the addr2line line
3) Improved dependency checking for backtrace
4) Few more improvements
 2013-10-07 02:37:50 +03:00
Kfir Itzhak
28e06e935b 1) Fixed blob motion detection issues. 
2) Some more progress towards getting analysis images working.
3) Fixed possible log corruption because of ssedetect().
 2012-02-01 07:33:21 +02:00
Kfir Itzhak
4a59761bcc Getting closer and closer everyday. 
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
 2012-02-01 07:33:20 +02:00
stan
6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00