Commit Graph

587 Commits

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