Commit Graph

152 Commits

Author SHA1 Message Date
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