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

876 Commits

Author SHA1 Message Date
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 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 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 0ff4e53832 Allow FPS reporting to be disabled by setting valure to zero 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:23:10 +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 162b1b2feb Fixed bug in signal checking - http://www.zoneminder.com/forums/viewtopic.php?t=17158 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3287 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:34:26 +00:00
stan aa4a97d0da Fixed incorrect monitor type when loading individual ffmpeg monitors. Not used anywhere currently so no impact. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3225 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-17 18:18:46 +00:00
stan 061a324a36 Fixed issue with image scaling etc when streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3213 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-12-13 22:30:22 +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 2effcc506b Reworked to handle signal lost events better and to prevent untimed events. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3172 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:43:33 +00:00
stan 52b83eb813 Fixed issue with signal loss detection and timestamp label. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3143 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-08 22:42:54 +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 60f0136ed3 Merged in image root changes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:16:40 +00:00
stan f0e7aaf6db Made mapped memory files not hidden 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 18:37:24 +00:00
stan 30c3c88c55 Remove MS_INVALIDATE from closing msync as not required. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2991 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:31:00 +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 174c82a452 Remove error message if terminated and can't send. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2916 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-09 14:15:02 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan 820dce5e42 Updated for decimal frame rates. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2867 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 13:47:19 +00:00
stan ca858a8562 Applied patch from 'mitch' to improve error detection when streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2864 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 09:47:37 +00:00
stan 4c8352153d Removed srand call and improved error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2849 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-14 20:19:36 +00:00
stan 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-03 12:10:54 +00:00
stan fa5db09a73 FIxed issues with negative FPS affecting streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-01 19:39:23 +00:00
stan 73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-08 14:34:09 +00:00
stan ee972ac78a Fixed issue with event section lengths being ignored on alarm and rationalised debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2778 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-18 22:05:32 +00:00
stan e64312e48c Corrected so mapped memory files are removed by package script. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2771 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 12:32:03 +00:00
stan 9c518efb3d Stopped memory file getting deleted unless zmc restarts. Better overrun detection. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2770 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 12:29:51 +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 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
viseon f2ad7cc770 Add offset to replay_rate to make it unsigned 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:56:15 +00:00
stan c83d340ad8 COntrol stream replay rate now two bytes long 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2703 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:14:20 +00:00
stan 842398a32f Added checks to return status of some functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2690 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 18:13:26 +00:00
stan 6d78b17d90 Added CMD_VARPLAY to stream commands 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 13:16:47 +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 94912ddae1 Ensure that all events has at least some regular frames to start with. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2674 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-28 12:52:09 +00:00
stan 3aedc486b7 Updated for latest ffmpeg 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2667 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-16 16:11:49 +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 506815599b Addressed issues with event start and end times. Now includes the time from first to last frame. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2631 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:45:59 +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 a79594387c Fixed various mapped memory errors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2624 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 15:31:20 +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 03611d70c9 Fixed printf issues with stream cmd_type size change 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2595 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-23 09:56:38 +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 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +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 6a3c6dfa14 Bug 445 - Fixed problem with using the wrong count when reloading linked monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2294 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-10 22:14:32 +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 911920dc71 Fixed issue with single frame streaming not working. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2234 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-11-11 15:57:54 +00:00
stan fdbb18c3f8 Fixed force/disable alarm buttons. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2232 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-11-04 17:36:30 +00:00
stan 5378a73ae2 Corrected timestamp fractional token. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2221 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 15:07:19 +00:00
stan 6932898d40 Bug 390 - Changed timestamp tokens. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2194 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 16:31:42 +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 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 3e8d503681 Bug 402 - Added errors and warnings on bogus exits. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2097 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-04-03 09:47:08 +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 82c2f5d23c Bug 368 - Added missing LinkedMonitors term into SQL. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2015 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-18 15:13:47 +00:00
stan d347a4e3ee Now highlights if retreived image is wrong size or colour depth. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1928 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-12 15:14:24 +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 8ae9aa3465 Handle null MaxFPS values. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1884 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-23 18:21:26 +00:00
stan ff60da760e Bug 5 - Linked monitors 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1860 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-23 16:42:41 +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 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 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 33cb9ab66f Bug 13 - Added prototype signal loss detection code into remote monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1824 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-15 17:39:18 +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 9051cf481a Removed closeEvent call on suspend. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1757 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-01 20:30:36 +00:00
stan d0e3247db9 Moved state transitions to before actions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1741 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-27 14:40:15 +00:00
stan eadcbb4bfa Updated shared_data->last_event for each time event is created. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1728 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-22 22:51:22 +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 fa0c5348a0 Bug 223 - Added in custom mime-type initialisations. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1659 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-07 13:42:25 +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 9e03d55a8c Bug 207 - Fixed memory corruption due to incorrect shared memory offsets. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1613 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-22 10:39:51 +00:00
stan 76252c4831 Bug 209 - Optional prevent ongoing alarms from keeping events open. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1608 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-21 12:18:36 +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 0660c19929 Bug 169 - Masked out shared memory keys. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1529 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-10-20 11:53:39 +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 8a710e3a89 Bug 110 - Moved frame boundaries before frames. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1479 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-06-23 08:40:43 +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 48828d6d05 Fixed issue with streaming being twice as fast as limit implies. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1384 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-03-20 16:33:29 +00:00
stan dd90d80264 Added extra event id in creation debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1362 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-03-04 12:15:13 +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 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 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 5f7b1d7575 Changed shmget error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1085 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-08-11 15:26:44 +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 153b6ff8b3 Now outputs mime headers directly from ffmpeg. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1053 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-05-05 09:18:14 +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 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 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 54befcd015 Adjusted some options and added video format options. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@956 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-14 23:27:36 +00:00
stan e8ec46c2ad Added handling for other video formats. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@955 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-14 22:49:12 +00:00
stan 9ecd8ce9f7 Fixed JPEG streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@945 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-13 14:07:23 +00:00
stan 5693da40bc Messed around with jpeg stream header. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@943 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-11 11:19:37 +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 ba2820ef37 Fixed fixed section lengths to start on boundary. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@936 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-09 17:04:15 +00:00
stan 1aa2bdc76f Added timestamping to video generation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@930 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-08 10:33:19 +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 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 d0cc002084 Corrected image MIME types. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@906 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-02 16:18:55 +00:00
stan 9a33ab5e2e Fixed fixed length events length bug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@880 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-20 09:47:49 +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 2452b48239 Moved timestamp encoding to before JPEGising 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@861 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 23:35:15 +00:00
stan 9ead79db37 Bumped timing debug up to level 2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@858 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 23:16:00 +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 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 5e5902b32e Alarms are now cancelled on destruction. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@809 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-05 17:26:58 +00:00
stan ec24c82e5c Changed CHECK_IMAGES config to DIAG_IMAGES. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@788 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-01-27 17:07:20 +00:00
stan bd03a054c9 Merged in diagnostic images. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@787 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-01-27 17:03:45 +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 82bd47b918 Resets the read count on destruction. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@703 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-12-11 16:41:20 +00:00
stan 34f902e87b Added option to not generate analysis images. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@695 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-11-21 10:38:41 +00:00
stan f6c3de24b8 Frame are now correctly timestamped. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@678 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-11-05 14:50:11 +00:00
stan 5b6fc78f07 Changed the streaming headers. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@663 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-10-19 13:54:40 +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 b6e7923498 Ensured that events have their end times tagged correctly. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@640 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-10-08 12:54:35 +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 6af6bad961 Made inactive zones black in zone image dump. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@610 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-07-07 11:20:06 +00:00
stan a6a4149855 Made shared memory inaccessible to other users. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@608 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-07-05 20:40:53 +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 16d338b2ab Made SQL buffers bigger to prevent overflow. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@588 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-07-03 20:39:47 +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 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 361c073f2f Commented out setbuf calls. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@553 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-06-03 21:53:13 +00:00
stan 847d07b7f7 Removed excess \r from stream output. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@548 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-06-03 21:20:09 +00:00
stan dc261cd110 Fixed monitor selection bug where remote monitors could be selected by mistake. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@541 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-05-27 08:59:49 +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 bf4e592766 Fixed double dump of first alarmed image. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@527 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-05-02 10:15:09 +00:00
stan 435040ad69 Moved declaration of index outside 'if' statement. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@516 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-22 14:25:31 +00:00
stan d3acdd7f7c Made adaptive skip algorithm optional and removed startup warning. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@512 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-22 14:16:50 +00:00
stan 09ef0f2495 Modified stepping algorithm slightly. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@505 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-20 20:52:14 +00:00
stan 522967f0e4 Added variable frame skips on analysis. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@504 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-17 15:39:44 +00:00
stan 3232656595 Changed preventive zones to preclusive. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@488 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-15 11:54:08 +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 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 1318127ba6 Added some debug about the shared memory size. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@462 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-10 22:42:26 +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 18a52515d2 Added expiry headers to monitor stream. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@449 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-07 10:47:27 +00:00
stan 64907c388c Revamped the streaming line endings slightly. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@446 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-04-04 10:00:57 +00:00
stan 280efb3244 Slightly modified format of streams. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@438 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-03-27 17:17:08 +00:00
stan 03796df14d Added blend alarmed images feature. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@432 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-03-27 09:31:13 +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