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

68 Commits

Author SHA1 Message Date
Isaac Connor c6d19b3ecf whitespace issue 2014-08-21 11:14:38 -04:00
m-bene 26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
mastertheknife aef9ab2f00 Removed NumCoords entirely from zm_zone.cpp 2013-09-24 07:41:37 +03:00
mastertheknife ac7f7f08a7 Fix some compilation warnings 2013-09-24 07:31:02 +03:00
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak e413042cdb Fixed a longtime bug in my version that caused distorted analysis images in some setups. 2012-04-01 13:03:18 +03:00
Kfir Itzhak 8e9ccfe1ec Removed the now unused SSE2 AlarmedPixels code. 2012-02-01 07:33:21 +02:00
Kfir Itzhak d7e9c6ad5c Analysis image finally working! 2012-02-01 07:33:21 +02:00
Kfir Itzhak e217e99562 1) Fixed wrong alarm colour in analysis images. 
2) Added GCC's target attribute to remove the need for -msse2.
 2012-02-01 07:33:21 +02: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 66f5d7c2f1 Added #defines to control the inclusion of the SSE code. 2012-02-01 07:33:21 +02:00
Kfir Itzhak ca57ae6438 1) Fixed and refinished the JPEG and MJPEG capture palettes support. 
2) Added the SSE2 alarmedpixels code, although its unused at the moment.
3) Small changes in libjpeg interaction.
4) Small other changes.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak eeaed7ccd3 Some small changes 
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
   To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 1afe0bbf42 1) Added back the colour SSE2 delta algorithms 
2) Modified SSE algorithms to use one less register
3) Fixed AlarmedPixels motion detection
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 642a1bfdb2 1) RTSP support for direct capture and target colorspace. 
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
 2012-02-01 07:33:20 +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
Kfir Itzhak 5c418133bf Lots accomplished! 
1) Delta and blend SSE and standard alogirthms inside
2) Changed event streaming to use sendfile() syscall if available
3) Direct memory capture (Less memcpys required)
4) Added macros for BGR24 and RGB32(and its variants) formats
5) Modified Monitors database table to add a target colorspace option
6) Changed most image buffer allocations to be on 16 byte boundary, work still in progress
7) Added Target colorspace instead of the old colours selection. this one also visible to local cameras
8) Replacing Y deltas option with ZM_CPU_EXTENSIONS
9) Added SSE detection code
10) Changed some code to make linking success with inlining enabled.
11) Some other changes and work still in progress for some listed above
 2012-02-01 07:33:20 +02:00
stan a90ae4f19f Added additional info to exceptional polygon message 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3328 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-26 15:48:21 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:22:35 +00:00
stan cd16c91ccd Tweaked zone image dumping. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-05-27 12:18:43 +00:00
stan 10b01a5062 Added Panic level for debug with stack dump. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2975 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 10:01:46 +00:00
stan 034f37cf4b Applied contributed patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-25 18:03:46 +00:00
stan e6041e24a7 Uppdated copyright headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:33:23 +00:00
stan ee44d4b274 Updated debug format 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 14:43:47 +00:00
stan 799ee78675 Bug 471 - Compiler warnings, sorted out types and general format tidying 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2357 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-03-13 13:36:12 +00:00
stan 2c09dbeeb9 Bug 410 - Added in detection suspension if motion overloaded. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2132 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-06-05 14:12:14 +00:00
stan 79ca312388 Bug 292 - Added more checks on zone polygons. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1966 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-08 12:46:23 +00:00
stan 131ed30d7a Bug 260 - Added average pixel difference to statistics 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1910 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-31 15:34:16 +00:00
stan b420c2ebd2 Bug 266 - Fixed crash, added support for displaying fle cameras and polygons. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1850 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-21 18:02:46 +00:00
stan 235dde1a80 Updated copyright statement. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1829 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-17 10:56:30 +00:00
stan 0ed47d42af Added code to blank out parts of diff image outside of zone. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1656 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-05 12:23:53 +00:00
stan 89b9b59803 Added pre-emptive blob recycling and optimised out some pixel blanking. Added alarm mid points on all check methods. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1648 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-02 10:16:31 +00:00
stan 7468286725 Further mods to improve polygonal blob detection. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1640 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-01 16:34:20 +00:00
stan 65f7cf09b5 Bug 216 - Zone polygons 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1630 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-29 17:51:06 +00:00
stan af85fd6916 Renamed variables and added blob overflow code. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1540 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-03 10:48:50 +00:00
stan f089f28bd4 Added simplified direct config interface. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1406 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-05-16 09:27:06 +00:00
stan 264c23d687 Updated copyright statement 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1360 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-02-24 14:40:14 +00:00
stan 3649417b27 Merged in PTZ control feature. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1355 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-02-24 10:43:29 +00:00
stan 24fdf468b6 Changed monitor events directory to be keyed by id. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1095 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-09-07 08:45:00 +00:00
stan a7e0fcef41 Allows filters of 1 or less size. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1083 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-08-11 15:20:09 +00:00
stan a89845780c Fixed extra blob problem and rearranged debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1059 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-05-05 16:22:37 +00:00
stan b508b2a5ce Changed strcpy to strncpy, sprintf to snprintf and query parameter checks to avoid vulnerabilities. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1017 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-04-19 16:02:17 +00:00
stan 2465a916b2 Fixed problem with debug images ending up as analysis images. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1003 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-30 11:05:47 +00:00
stan 4dfdf8f00b Changed extraneous Info messages to be Error, Debug or removed. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@975 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-17 10:28:07 +00:00
stan de93828672 Made zone %ges relate to the zone and not the monitor. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@914 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-04 13:16:18 +00:00
stan 2fe2c2a5ee Fixed max pix threshold check bug and check_method SQL error. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@859 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 23:16:35 +00:00
stan 571798f879 Merged in alarm checking scope feature. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@855 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 20:02:41 +00:00
stan 626d91fd29 Merged in fast deltas and other optimisations. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@854 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 19:53:10 +00:00