Commit Graph

235 Commits

Author SHA1 Message Date
Kfir Itzhak 0932f50d80 1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +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 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 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 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 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 d92c781026 Removed mapped memory file on shutdown.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2755 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:32:00 +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 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 bb872feab4 Added result error checking to frame streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2718 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:37:39 +00:00
stan 23d82a7e03 Added FFMPEG camera type
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
stan fe1c1f3beb Moved some initialisations
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2691 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:13:45 +00:00
stan e60149ce36 Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-29 23:08:21 +00:00
stan 0606700091 Updated to continuously update Notes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2645 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:07:43 +00:00
stan c207e7720f Changed force close events to more general setting allowing long events to be closed after alarm.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2630 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-25 11:18:55 +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 bf955715ee Removed redundant typedefs
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2599 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 15:38:21 +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 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 9d291c0ba1 Bug 431 - Removed default args for monitor constructors and now can stream events without active monitor.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2274 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:50:53 +00:00
stan 8d905aac99 Bug 400 - Made signal check colour monitor specific.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2193 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-05 15:05:28 +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 9f63b75c88 Bug 390 - Updated timestamp tokens to show deci-seconds etc
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2096 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-12-24 16:50:01 +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 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 cbfb343835 Bug 301 - Alarm maximum FPS now monitor specific.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1903 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 12:49:05 +00:00
stan dd118888a0 Bug 302 - Added control state scratch area to shared memory.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1899 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-30 13:52:51 +00:00
stan e6fd8c8cc7 Bug 267, 89 - Allow cascading alarm triggers, include zones in event notes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1852 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-22 19:38:41 +00:00
stan 2079f61cbc Bug 5 - Added support for linked monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1851 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-22 18:31:55 +00:00
stan 9dcdcb8508 Slight reorganisation of shm member data, also blats shm on destruction.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1848 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-20 16:10:08 +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 05c2fb5dfd Bug 238 - Changes to do with the various enabled/disable/suspend/trigger modes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1720 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-22 16:46:25 +00:00
stan 9678f5ae88 Bug 235 - Added raw streamed output.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1711 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-21 10:11:44 +00:00
stan 448c61efa5 Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1664 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-08 17:10:16 +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 6e7daa90c5 Bug 202 - Added status summary --list function.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1602 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 12:17:45 +00:00
stan ab2d99160e Bug 104 - Monitors can now read images from disk files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1522 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 21:55:02 +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 7a23b4f819 Bug 101 - Fixed timstamps not showing if no %%s in them.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1471 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-06-22 09:53:32 +00:00
stan f2a8ebb344 Removed extra debug, added some just in case debug also for jpeg-mmx but commented out.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1426 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-22 17:33:34 +00:00
stan c20d73e95b Bug 63 - Allow update of image annotation via trigger mechanism.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1423 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-19 16:22:22 +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 a1006edcbd Added flip support and optimised some config calls.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1395 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-05 16:43:19 +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 1c5fee19d9 Merged in generic triggering.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1172 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 17:41:55 +00:00
stan 4a5e2f9337 Made brightness etc signed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1115 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-09-25 18:26:09 +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 438a5c2b74 Added prealarm state and minimum alarm frames.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1109 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-09-25 12:37:45 +00:00
stan 23ea7dff66 Added monitor specific event prefixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1104 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-09-23 13:43:10 +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 d7671a1daf Added patch to allow zms to produce single images.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1013 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-04-19 13:03:16 +00:00
stan 4d6b69a499 Sorted out monitor streaming and removed old config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@958 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-15 09:37:21 +00:00
stan e6ef3bbcd7 Added maximum fps and timed option to video streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@942 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-11 11:18:14 +00:00
stan e30fc4ac2c Changed bit_rate to bitrate
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@927 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-05 10:40:45 +00:00
stan 6e74128e97 Fixed bulk frame inserts.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@924 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-05 10:23:01 +00:00
stan 81923acac7 Fixed bulk_frame_interval cast.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@918 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-04 15:16:44 +00:00
stan f257aee488 Merged in optimised db frames.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@917 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-04 15:13:10 +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 8526aa69aa Added scale parameter to zmu.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@864 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-02-18 15:35:51 +00:00
stan 275dea8300 Merged in annotation changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@856 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-02-15 20:07:16 +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 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 6802b3a6ad Removed trailing comma
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@739 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-01-08 13:01:04 +00:00
stan b15fd12b98 Added scaling to monitor streams.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@662 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-10-19 10:11:07 +00:00
stan e498c91185 Added frame skip for continuous modes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@648 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-10-08 14:49:26 +00:00
stan 21c7c8b56f Updated for v.16
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@637 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-09-23 09:52:45 +00:00
stan feabf475df Added last image capture time into shared memory.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@607 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-07-05 20:40:38 +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 2abf43c569 Removed bosus sleep statement.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@574 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-06-20 15:42:41 +00:00
stan 180cf8acf4 Gave shared memory area a good going over!
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@570 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-06-12 14:29:54 +00:00
stan 303864f0cb Made DELTA_TIMEVAL variable precision to handle different scenarios.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@532 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-05-16 10:17:05 +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 17de8a0488 Corrected warnings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@451 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-04-07 11:16:34 +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 f62254e146 Removed extraneous \n from Info line.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@436 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-27 17:15:00 +00:00
stan 77a771801d Added throttling.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@428 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 22:12:25 +00:00
stan ee8b5e8e14 Added new forced alarms off state.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@425 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 13:18:26 +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