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

69 Commits

Author SHA1 Message Date
Isaac Connor 954c863ad8 add a non-const version of StartTime() which we need in order to assign to video_data->recording 2017-04-12 13:36:49 -04:00
Isaac Connor 48d658790a Merge branch 'storageareas' into optimisations 2017-04-09 17:36:24 -04:00
Isaac Connor 8f3e40d7af add a const array of char * strings for the frame types so that we can make better use of the FrameType enum for more efficient code 2017-01-08 16:53:15 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 819dad455e whitespace/tabs 2016-04-29 09:11:14 -04:00
Isaac Connor 59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -04:00
Isaac Connor 24e3306955 master master 2016-04-28 09:20:56 -04:00
abi 9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor 9493e99587 Add video file to event data. 2016-04-01 14:06:31 -04:00
Isaac Connor 56d95bb949 Merge branch 'iconnor_video' into storageareas 2016-03-31 14:02:56 -04:00
Isaac Connor c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor 1262e831ac rework zmu to load data from the last event with frames when it can't connect to zmc 2016-03-29 14:36:16 -04:00
Isaac Connor 6daa8e2290 add server_id to event_data 2015-12-15 12:09:45 -05:00
SteveGilvarry ba425edd0f Convert from event_directory to event file as per Video branch 2015-01-12 20:42:17 +10:00
SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_event.cpp
	web/skins/classic/views/js/event.js
 2014-12-02 20:58:35 +11:00
stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php
 2014-05-30 01:55:24 +10:00
Kfir Itzhak 2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
David Nesting 79c7a1b255 Apply INSERTs in Event::AddFrames in batches to avoid excessive query length 2013-10-26 18:41:12 -07:00
Chris Wiggins 35468a5b9c Tidy up starting and stopping of recording 2013-09-28 23:22:58 +12:00
Chris Wiggins 938f81c753 Add snapshot.jpg to event directory if we are doing a video recording 2013-09-28 23:17:22 +12:00
Chris Wiggins 65afc830b1 Save a snapshot image alongside the h264 video for thumbnail and poster use 2013-09-28 18:50:54 +12:00
Chris Wiggins 774a84d487 Updated event processing to actually add frames into the DB. Use MP4 container 2013-09-14 00:50:54 +12: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 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 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 c617a8436c Bug 434 - Added delete functionality back into DVR events view plus enhanced events scrolloing etc to support. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2391 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-04-21 13:52:05 +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 07a9f1fa1c Bug 228 - Added deep storage option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2190 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-04 16:08:55 +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 208beb0934 Added enum for frame type, though not currently used. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1994 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-25 14:02:38 +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 14fc3e2473 Bug 249 - Added event navigator and progress panel 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1790 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-12 15:41:39 +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 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 b7a4a25437 Applied patches to correct diagnostic image naming problems and to display them. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1273 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-02-01 23:05:19 +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 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 16fcbb4983 Fixed to always write closing frame record to database. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1054 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-05-05 09:19:07 +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 ea6abdf089 Added variable image digits format. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@991 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-22 10:33:40 +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 eb2363747b Implemented frame rates better on events. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@957 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-15 08:48:52 +00:00