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

119 Commits

Author SHA1 Message Date
Qu Wenruo 0b9853e1d4 ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts 
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.

Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
 2017-03-12 22:00:46 +08:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06: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
Andrew Bauer 75a98601ef fix jpeg buffer too small 2016-07-03 14:59:05 -05:00
Isaac Connor 8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Robin Daermann d1343df920 Change colour of privacy zones from black to dark grey 2015-08-26 07:45:45 +02:00
Robin Daermann 5b465194f8 Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
Robin Daermann 8f9ed96585 First try to implement blacken areas for monitors 2015-08-20 14:20:41 +02:00
Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Robin Daermann 3368d4f474 Removed untranslated "Font size" from language files, corrected white 
space and make font size a const int
 2015-08-10 15:35:19 +02:00
Robin Daermann 7f3a07f21b Add label size to monitor options (database and backend part) 
This commit bumps version to 1.28.101 because of database schema change
 2015-08-10 15:35:18 +02:00
Robin Daermann 5a0d0ca5a3 Made large font selectable by a constant 2015-08-06 17:42:52 +02:00
Robin Daermann c733fec476 First (working) steps for adding large timestamp to images 2015-08-06 14:43:10 +02:00
Linwood-F 72a92ee9d5 Add exif to jpg images saved 2015-07-23 19:34:39 -04:00
Kfir Itzhak 069552321f Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation 2013-11-01 13:31:37 +02:00
mastertheknife 5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03:00
Kfir Itzhak 0fe55a18bf Something useable :) 
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
 2012-07-15 17:30:37 +03:00
Kfir Itzhak f27b424503 Much more progress! 
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
 2012-07-13 20:11:16 +03:00
Kfir Itzhak 8f0ec42ba2 First work on adding built-in deinterlacing to ZM. 2012-07-13 20:11:16 +03:00
Kfir Itzhak 8d304972f1 Fix compile error caused by the previous commit. 2012-02-09 13:10:48 +02:00
Kfir Itzhak d7e9c6ad5c Analysis image finally working! 2012-02-01 07:33:21 +02:00
Kfir Itzhak 8ac3dda54b 1) Removal of the ZM_LOCAL_BGR_INVERT option. 
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 11029d57b6 Small code fixes 2012-02-01 07:33:20 +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 33119c6dc5 1) Added image size requirements to ensure proper alignment 
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
 2012-02-01 07:33:20 +02:00
Kfir Itzhak c3ecdd00e0 1) Relocated conversion functions and tables to zm_image.cpp 
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other 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 beffdab035 Improved fast image blending somewhat and changed image class to use generic typedefs rather than libjpeg ones. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3301 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 11:18:41 +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 c65b50e312 Minor header sort out and libz no longer mandatory. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2809 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-20 12:39:29 +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 aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +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 60880b2edd Bug 455 - Corrected duplicate parameter name in function declaration. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2305 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 22:44:19 +00:00
stan 50cc4d980f Bug 411 - Merged in DVR functionality. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2175 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-29 18:11:09 +00:00
stan 1b8269f233 Merged in changes for enhanced showtext. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2062 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 11:34:53 +00:00
stan 8a49cf7e12 Bug 329 - Removed asserts and replaced with proper debug/errors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1967 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-08 12:46:53 +00:00
stan d4e16016ba Bug 264 - Added support for zipped raw images. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1847 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-20 15:27:48 +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 7e96084114 Bug 13 - Added in support for signal loss detection. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1813 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 22:47:02 +00:00
stan b467ec84ce Incomplete polygon mods. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1710 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-21 00:13:23 +00:00
stan 973f7bad1e Added crop function and debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1637 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-01 16:24:25 +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 102843da42 Fixed missing initialisation when reading in JPEGs. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1627 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-23 13:38:38 +00:00
stan 90360aa18c Bug 197,199 - Caches jpeg comprression data and quality settings. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1614 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-22 10:41:50 +00:00
stan 65532674e6 Bug 198 - Added initial hooks for optional comment in jpeg headers. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1596 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-19 18:43:46 +00:00
stan aa9004cc75 Bug 195: Added quality override so frame server images are correct quality. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1593 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-18 17:26:12 +00:00
stan 6fa1cb5c2a Bug 182 - Added jpeg errors handlers. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1521 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-10-17 21:45:06 +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 d704c9b2fb Added flip function for vertical or horizontal mirroring. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1394 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-05-05 16:42:37 +00:00
stan 825e6420ad Moved declaration of double. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1393 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-05-02 14:02:04 +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 3d245e1ab0 Merged in MPEG streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@916 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-04 15:05:54 +00:00
stan ab7a6e658d Fixed annotate functions to prevent text wrapping. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@863 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-18 15:35:33 +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
stan 15d83eea1a Merged in montage sizing and scaling improvements. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@853 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 19:47:23 +00:00
stan 0aafd9d30b Applied Ian@zestysoft changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@744 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-01-14 21:26:47 +00:00
stan 169972446d Added Scale function and fixed non-initialised buffer in file constructor. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@653 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-10-16 09:00:25 +00:00
stan b5d6859bd4 Added orientation and tidied up a bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@529 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-05-02 15:03:16 +00:00
stan fb1ca482a7 Modified reference blending algorithm. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@519 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-22 23:16:57 +00:00
stan f4b66e2333 Added fast RGB diffs option and optmised YUV transforms by using bit shifts. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@496 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-16 13:02:15 +00:00
stan d1fd5c0828 Changed colours to palettes and now supports YUV420P. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@471 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-12 16:17:17 +00:00
stan 94390d39e3 Corrected warnings. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@450 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-07 10:56:38 +00:00
stan 56d14d55b3 Removed OPT_ from a couple of options. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@433 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-03-27 09:32:39 +00:00
stan d2033873ce Added BGR->RGB inversion parameter. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@424 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-03-26 13:03:15 +00:00
stan 0767828431 News files created as a result of breaking out the classes to support 
the use of remote cameras.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@409 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-03-26 11:57:29 +00:00