Commit Graph

2660 Commits

Author SHA1 Message Date
Kfir Itzhak de015761c1 Fix different palettes warning showing up when using automatic palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 41ad83a7d3 Added updated configure and src/zm_config_defines.h 2012-02-01 07:33:21 +02:00
Kfir Itzhak b51bce05e8 Rebased to SVN revision 3487 2012-02-01 07:33:21 +02:00
Kfir Itzhak be8ef02a7c Small corrections 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 66f5d7c2f1 Added #defines to control the inclusion of the SSE code. 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 7e0206bbcc Disable zm_event.cpp deleting the diagnostic images every second 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 46aa1bb1d8 Fixed bug in linked monitor loading code which should fix the crash of a monitor linked to a disabled monitor. 2012-02-01 07:33:20 +02:00
Kfir Itzhak 442b9e5ba2 1) Reloaded zm_event.cpp to hopefully fix its issues once and for all.
2) Added backup code in case sendfile() fails.
3) Fixed a bug that allowed to link a monitor to itself, which can cause alarm lasting forever once triggered.
2012-02-01 07:33:20 +02:00
Kfir Itzhak bc255d1b06 1) Replaced the blend and delta algorithms with newer versions that use 1 less register and 1 less instruction per iteration.
2) Fixed small bug in rgb_convert
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 63122ab9bc Undo translations in es_es.php because its not available in the ZM 1.24.4 package. 2012-02-01 07:33:20 +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 eab09844de 1) Some more work on the overlay function.
2) Got rid of some compiler warning messages.
2012-02-01 07:33:20 +02:00
Kfir Itzhak 2fd6e99ec5 1) Rebased to 1.24.4
2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files
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 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 b0bc227232 1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
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 13e46d8595 Improved makePath and tweaks to createEvent
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3522 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-11 10:08:49 +00:00
stan dacb1f2a27 Added event creation functions for scripted events, not entirely complete.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3521 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:56:21 +00:00
stan 2c47a15f9b Use event dimensions instead of monitor ones as they may have changed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
stan a665a66071 Fixed typo in command string.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3519 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-10-04 21:24:58 +00: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 8b86c9af58 Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 10:50:50 +00:00
stan f74f893651 Added low_priority qualifier to some audit statements to avoid pre-empting more important operations.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3508 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:51:13 +00:00
stan 1e80d72ddd Fixed line endings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3507 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:10:22 +00:00
stan cad65de5c9 Removed temporary module inclusion.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3506 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:05:42 +00:00
stan b7ca4dba77 Fixed a few more incorrectly quoted split patterns, though these were not disfunctional.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3505 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 07:51:36 +00:00
stan 5c2149e319 Fixed incorrectly quoted patterns to split
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3504 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-25 20:45:32 +00:00
stan b90155640d Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3503 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-25 20:45:16 +00:00
stan 56cc21ef3a Added check for Expect perl module for sftp uploading.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3502 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-25 20:44:56 +00:00
stan e695dfd4dd Allow for level as a minimum when selecting availability criteria for other fields.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-24 13:15:58 +00:00
stan b64c506659 Added SFTP upload option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
stan 3aa6c13c64 Added auto reconnect option to database
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3499 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 13:31:04 +00:00
stan a3ba83aca4 Typo
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3498 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 08:46:59 +00:00
stan 194d8350b4 Fixed distribution and install lists
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3497 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-05 11:24:24 +00:00
stan 59273af6e3 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3496 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-05 11:23:57 +00:00