Commit Graph

659 Commits

Author SHA1 Message Date
stan 154880ac15 Now detects camera restarts and disconnections properly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3342 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:53:31 +00:00
stan b3b715e022 Fixes to work with latest ffmpeg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3338 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-15 20:38:51 +00:00
stan a90ae4f19f Added additional info to exceptional polygon message
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3328 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-26 15:48:21 +00: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
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +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 beffdab035 Improved fast image blending somewhat and changed image class to use generic typedefs rather than libjpeg ones.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3301 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:18:41 +00:00
stan 39b5400046 Tidied up memory freeing a bit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3297 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 17:54:45 +00:00
stan 1ef02ac35a Tidied up disposal of ffmpeg structures.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3296 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 17:51:08 +00:00
stan e91795a619 Removed netpbm options
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:50:04 +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 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 d67d19dc4f Removed dependency on DB existing for config generation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:36 +00:00
stan e11a5700c7 Removed -frepo line
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3244 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:07 +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 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 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +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
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +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 ca4358bfd6 Initial libgcrypt to remove warning in zms and zmu
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:11:06 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
jaidhar 733eef46bd XML Plugin: Adding zmstreamer to application source
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3183 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-09 20:48:34 +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 3dccc2ee32 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3164 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:04:10 +00:00
stan 825eda95a6 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:56:23 +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 9472311a38 Fixed some size_t compiler warnings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3148 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-13 15:50:06 +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 36dddf22cc Updated to include standard type definitions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3088 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-07-04 18:09:44 +00:00
stan b079f1e1c6 Updated to use standard types.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3087 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-07-04 18:00:35 +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 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 72416fc24b Now checks to see if user is in group as well as owner
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3036 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:13 +00:00
stan 5ae6123ba3 Updated deprecated ffmpeg functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3018 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:05:53 +00:00
stan 2c9eeef178 Updated JPEG memory functions to not conflict with new libjpeg8 functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3012 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-01-20 14:43:54 +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 77fb484226 Fixed some ssize_t format specifiers.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2996 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 01:29:11 +00:00
stan 00f7799685 Fixed some non-64 bit safe printf specifiers.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2995 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:45:36 +00:00
stan e9d3076785 Removed obsolete commented out line.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2994 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:45:00 +00:00
stan 075257be52 Added stdio.h for vsnprintf if not present
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2993 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:40:45 +00:00
stan e30ae4fa0e Only send http Keep-alive header for http 1.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2992 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:40:04 +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 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