ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,207 Commits
80 Branches
104 Tags
168 MiB
Commit Graph

159 Commits (620407e4089eb5cb0ee6d7594de747975c55d11f)

Author SHA1 Message Date
Pliable Pixels 915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Mitch Capper eb005e8b9c FIFO support for zoneminder zone debugging (#2594) 
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
 2019-05-16 15:37:03 -04:00
Pliable Pixels 21710b6e49 demote logs 2019-05-12 15:45:39 -04:00
Pliable Pixels 27e6e46f84 remove allowing auth_hash_ip for token 2019-05-08 12:11:32 -04:00
Pliable Pixels b293592e4c added token validation to zms/zmu/zmuser 2019-05-08 10:55:32 -04:00
Isaac Connor 24665264a2 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-03-05 20:16:05 -05:00
Isaac Connor 903f5af1ef invalid parameters should be a debug not a warning 2019-03-04 13:35:36 -05:00
Isaac Connor 6156aa2af9 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-02-15 10:49:06 -05:00
Isaac Connor 31a11a6992 init log earlier in zms 2019-02-13 11:34:47 -05:00
Steve Gilvarry 924d5235d0 Validate zmu Username and Password lengths (#2484) 
* Validate zmu Username and Password lengths
Ensure user provided values are not larger than allowed and error if
they are, therefore further preventing overflow.

* Check username and password functions for zmu and zms

* Check username and password functions for zmu and zms
 2019-02-13 10:40:43 -05:00
Isaac Connor fe444218cc Implement replay mode = none in zms. This mode was only handled for video html tag viewing. 2018-09-28 12:31:53 -04:00
Isaac Connor dd479c9e55 remove () around return 2018-07-04 14:50:47 -04:00
Isaac Connor 87d9fc447e google code style 2018-06-01 11:27:53 -04:00
Andy Bauer 678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor e56cf0b31c switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:57:19 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 47ec0abf11 spacing 2018-03-02 18:27:03 -08:00
Isaac Connor ef72e585b9 Include id in the user object 2018-02-13 05:28:00 -05:00
Isaac Connor 70d43d2d27 fix strncpy calls 2017-12-12 13:42:48 -05:00
Isaac Connor 752990bb0f improve zms logging 2017-11-21 23:55:53 -05:00
Isaac Connor 48e9e12063 assume source=monitor when a monitor_id is specified 2017-08-24 10:13:46 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 2a71b0f170 Merge branch 'storageareas' into work_on_zms 2017-07-06 12:39:44 -04:00
Isaac Connor c3c6459052 Merge branch 'montagereview_rework' into storageareas 2017-07-05 15:34:02 -04:00
Isaac Connor 95ba837bda fix braces 2017-07-05 14:25:23 -04:00
Isaac Connor 834d1dddfa fix braces 2017-07-05 14:10:09 -04:00
Isaac Connor 62d6394923 finish roughing in ffmpeg_input 2017-06-26 16:55:49 -04:00
Isaac Connor b73c0ba978 rough in zm_ffmpeg_input and split out eventstream 2017-06-22 17:58:32 -04:00
Andrew Bauer ccc2cc832f Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon 2017-05-10 07:45:58 -05:00
Isaac Connor 8251e7ac03 fix uridecode(password) to uridecode(value) 2017-05-05 09:47:15 -04:00
Isaac Connor 2220b04203 need to include zm_monitorstream.h now 2017-04-10 21:52:29 -04:00
Andrew Bauer b609b9ad4c Merge pull request #1826 from connortechnology/uri_decode_in_zms 
Uri decode in zms
 2017-04-03 20:13:30 -05:00
Isaac Connor 8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04:00
Isaac Connor a33a8402ef Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon 
Conflicts:
	src/zmf.cpp
	src/zms.cpp
 2017-03-24 12:14:16 -04:00
Isaac Connor 0a1b2eab01 Merge branch 'uri_decode_in_zms' into storageareas 2017-03-20 15:13:19 -04:00
Isaac Connor f5dc896a45 missed one case 2017-03-20 15:12:23 -04:00
Isaac Connor a546c9e37f merge uri_decode in zms 2017-03-20 12:00:14 -04:00
Isaac Connor 9f30ccfa75 Use new UriDecode function to decode username and password 2017-03-20 11:16:39 -04:00
Kfir Itzhak e02e033cc8 Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection 2017-03-19 02:05:01 +02: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 48d9f31fa9 add more debug 2016-09-28 09:08:00 -04:00
Isaac Connor 079aa827c5 whitespace 2016-09-26 20:08:45 -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 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor 4394bb0a9a Make zms not crash when zmc is not running. 2015-02-22 16:58:15 -05:00
manupap1 b4732e4750 Close logger and database on exit 2014-11-14 22:17:44 +01:00
Kfir Itzhak 0bb2ee7efc More signal improvements: 
1) Cleaner code
2) Fixed the path displayed in the addr2line line
3) Improved dependency checking for backtrace
4) Few more improvements
 2013-10-07 02:37:50 +03:00
Kfir Itzhak 28e06e935b 1) Fixed blob motion detection issues. 
2) Some more progress towards getting analysis images working.
3) Fixed possible log corruption because of ssedetect().
 2012-02-01 07:33:21 +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
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 034f37cf4b Applied contributed patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-25 18:03:46 +00:00
stan 18f196dbcd Added srand initialisation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2848 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-14 20:18:57 +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 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 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 d55e1d4b6a Removed warning 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2604 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-24 17:12:39 +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 dc8aa90860 Added stream replay mode control. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2245 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-11-20 17:06:45 +00:00
stan 39e6a18e4c Change 'type' parameter back to 'mode'. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2213 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 14:01:25 +00:00
stan 6fffd05bc4 Fixed issue with no connkey if authentication on. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2176 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-29 18:53:29 +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 a0b3e2a5a3 Bug 308 - Added improved signal handling and backtracing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1916 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-05 12:22:27 +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 a998599df0 Bug 251 - Fixed problem when authentication relay set to 'none' 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 13:37:11 +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 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 c3142f7131 Bug 207 - Perrmitted any authentication to streams. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1628 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-11-23 14:14:27 +00:00
stan 46585d9cc2 Bug 148 - Allows remote http authentication. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1531 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-10-20 15:42:41 +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 8559d199bd Wrapped user check in OPT_AUTH check. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1241 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-01-26 20:53:55 +00:00
stan e56123b8c0 Totally revamped authentication for zms and zmu 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1226 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-01-19 01:50:24 +00:00
stan dc3b3691a0 Revamped debug initialisation and config loading. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1208 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-01-15 17:45:51 +00:00
stan 3805c8b9ac Initial pass at zms authentication. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1181 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-12-29 18:03:13 +00:00
stan 2ba1ee4eb8 Removed secondary DB user. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1171 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-12-28 17:01:25 +00:00
stan 72da78e98a Added zm.conf feature. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1170 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-12-28 16:46:48 +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 02d94534b0 Removed zero content length header in non-nph mode. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@994 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-23 09:24:13 +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
stan 6f02a01f36 Now optionally runs in nph mode. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@951 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-14 18:16:15 +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 36f74f1f24 Moved debug initialisation before query processing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@929 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-03-08 10:32:51 +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 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 15d83eea1a Merged in montage sizing and scaling improvements. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@853 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-15 19:47:23 +00:00
stan 9fc320fbf7 Fixed path problem when streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@814 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-02-05 21:58:44 +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 41315c9201 Corrected parameter bug ttl/path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@692 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-11-21 10:36:54 +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 05683469a2 Added scale and rate to event streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@654 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-10-16 09:00:53 +00:00
stan 3fe296d406 Added rate control to event replay. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@649 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-10-10 10:38:30 +00:00
stan 1dd77f5060 Commented out buffering code. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@554 e3e1d417-86f3-4887-817a-d78f3d33393f
 2003-06-08 20:24:52 +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