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

186 Commits

Author SHA1 Message Date
Kfir Itzhak 2dfdc8129c Few small fixes: 
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
 2012-03-07 14:33:09 +02:00
Kfir Itzhak fc1807f433 Fixed possible small stack corruption. 2012-02-01 07:33:21 +02:00
Kfir Itzhak af821828b8 Changed a few warnings 2012-02-01 07:33:21 +02:00
Kfir Itzhak de015761c1 Fix different palettes warning showing up when using automatic palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak b4921c4403 1) Made 24bit the default target colorspace. 
2) Changed crop info's layout.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak 349e18b543 Few text corrections. 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 066fe89718 Added automatic capture palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak bdf0687550 1) Added support for JPEG and MJPEG capture palettes - needs to be tested 
2) Allow the blend percent to be zero, to disable blending
 2012-02-01 07:33:20 +02:00
Kfir Itzhak de2df49d64 1) Added support for the new formats to the mpeg code. 
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
 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 ea3a1a9072 1) Removed the mmap file removal at shutdown. 
2) ZoneMinder should now compile cleanly wihout swscale
3) Fixed multiple monitors capturing from the same device and channel.
Current code allows for multiple monitors sharing the same device, each on a different channel
Or, multiple monitors sharing the same device, all on the same channel.
In both cases, capture method, width, height and palette must be identical on all monitors.
However, target colorspace can be different because each monitor handles the format conversion separately.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 37cc9199b2 1) Changed ZM static colours to RGB order instead of HTML(BGR) order 
2) Allow ZM to compile without swscale - hopefully
3) Saved few cpu cycles during image blending
4) Fixed wrong zone colours showing up
5) Unrelated fix: Allow ZM to be compiled with the latest ffmpeg revisions
 2012-02-01 07:33:20 +02:00
Kfir Itzhak f2aaeb78e0 1) Completed ffmpeg code 
2) Minor changes to zm_local_camera.cpp
 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 4e0d775e5b Added in additional headers to provide missing defines on some distros. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3514 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-09-08 15:39:58 +00: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
stan 278b78f012 Added missing V4L1 conditional 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3304 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-17 09:31:33 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan f813ff1691 Cleaned up some deprecated ffmpeg calls. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3273 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 13:21:24 +00:00
stan df0d6919c9 Added v4l2 interlacing control 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-20 18:49:42 +00:00
stan 257f975558 Commented out some unnecessary debug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3156 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 10:03:58 +00:00
stan 2b375ef264 Changes to querying and probing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 17:38:30 +00:00
stan a786dfeb66 Debug tidying and renaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2976 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 13:10:14 +00:00
stan ad77dc2e56 Applied patch to restore camera settings at startup. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2870 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-13 10:43:49 +00:00
stan cf30933bb4 Conditional compilation for recent V4L2 addition 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2834 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 14:09:53 +00:00
stan afe253b71a Added V4L2 query 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2827 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 12:57:34 +00:00
stan 41c2889df2 Added query capabilities for V4L2 cameras 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2824 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-30 15:27:15 +00:00
stan 20580582b3 Minor header file reorg 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2811 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:56:30 +00:00
stan f29e7b7436 Commented out recent redundant pix_format definitions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2808 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-20 11:33:05 +00:00
stan b89b1cfc7c Fixed non-standard for webcam properly 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2785 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-20 18:15:16 +00:00
stan 28692c1b28 Fixed greyscale issue and don't do format conversion if not required. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2777 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-18 12:30:43 +00:00
stan 3a86651627 Reworked multi-buffering etc for V4L multi-sources. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 21:23:27 +00:00
stan 5506400519 Applied YUV patch from forum. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2766 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-16 18:33:36 +00:00
stan d980c3996d Cosmetic 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2763 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-16 18:18:03 +00:00
stan 1195e8e27c More multi-cam tweaks. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2757 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-12 22:26:28 +00:00
stan 98b648bfc1 Fixes to multiple cameras on one device. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2756 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-12 21:33:05 +00:00
stan 541d4e20e5 Updated for latest ffmpeg 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2748 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-09 14:42:08 +00:00
stan d9542aba28 Removed unecessary Info line. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2747 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-08 17:46:00 +00:00
stan 885c090f12 Removed or conditionally commented out V4L2 pix formats that are nopt in older kernels 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2740 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-04 15:02:47 +00:00
stan cd269623c1 Allow sources with no video standard defined. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2739 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-04 14:44:30 +00:00
stan c753214450 Added some conditional compilation around ffmpeg stuff. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2733 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 15:02:33 +00:00
stan 4b9d30ca75 Cleaned up multi-camera setup 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2729 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 12:50:37 +00:00
stan 0f5ee9580f Conditional compilation for V4L2 stuff. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2728 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:28:03 +00:00
stan dde584a12a Restructured camera capture methods somewhat and revamped V4L stuff a bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 09:48:06 +00:00
stan 21d8d74a28 V4L2 updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-27 11:07:24 +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 d598f54210 Merged in V4L2 initial changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2582 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:20:52 +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 b2f616ff21 Merged in mmap changes. Revision 2323:2515 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2516 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 15:21:16 +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 ed0626492f Bug 374 - Multiple monitors can now share the same video device source without penalty. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2030 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-24 14:37:34 +00:00
stan 7ad5388fc3 Bug 265 - Fixed memory access errors due to pointers to free'd mysql query data. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1849 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-21 17:58: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 c345eb0706 Bug 207 - Fixed incorrect offsets in YUV conversion tables. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1607 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-21 12:07:26 +00:00
stan 74e4bd5737 Bug 73 - Made video devices use paths rather than numbers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1519 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-10-17 10:58:25 +00:00
stan c643b81627 Bug 45: Added lazyleoppard deinterlacing patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1459 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-06-13 10:21:54 +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 f6b2d23d88 Added YUYV/YUV422 support. Untested. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1165 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-12-28 15:44:47 +00:00
stan aff2ef8430 Added persistent brightness etc feature. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1114 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-09-25 16:37:41 +00:00
stan fc32786546 Corrected typo. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1090 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-08-17 14:24:29 +00:00
stan dad7aed4b2 Patched with Oskin bttvfix.patch 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1081 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-08-11 15:13:47 +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 1a87d79b78 Fixed blank image if RGB invert not checked. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@971 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-17 10:26:17 +00:00
stan d49861ffcd Reorganised ioctl calls a bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@967 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-16 15:40:10 +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 0aec7c648b Modified return check from mmap call. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@714 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-12-24 10:38:28 +00:00
stan afc62b1915 Added YUV422P and RGB555 formats. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@673 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-11-03 14:40:28 +00:00
stan 06c13211c7 Converted to use dynamic configuration. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@593 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-07-04 12:31:36 +00:00
stan d543323c9a Added ability to control camera settings. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@576 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-06-25 09:47:09 +00:00
stan c2fa12ccdd Now opens devices and shared memory read/write for v4l2 compatibility. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@569 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-06-12 14:29:27 +00:00
stan 7b5f23e29a Added zm.h header where missing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@533 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-05-16 10:27:41 +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 a3adc41d11 Fixed sense of strict video config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@497 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-16 13:03:41 +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 7d9924f702 Removed extraneous line ends from Error and Debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@486 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-15 09:04:38 +00:00
stan aa1164a0e3 Added Preventive zone type. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@473 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-13 12:20:00 +00:00
stan a0e29e0401 Added RGB565 format. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@472 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-12 17:18:52 +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 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