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

2478 Commits

Author SHA1 Message Date
Steve Gilvarry a81e7c5221 Safer_username and safer_login should be based on the username and login (#2482) 
(lengths * 2)+1. Control input lengths at user input
 2019-01-25 08:33:30 -05:00
Isaac Connor a81428f701 add a test for a 0 fps passed in to updateFrameRate which would cause an infinite loop. Fixes #2427 2019-01-21 13:30:00 -05:00
Isaac Connor 189e78b42d add comments and a test for zm_terminate in the checkCommandQueue while loop 2019-01-21 13:29:20 -05:00
Isaac Connor 83a652aade add comments and a test for zm_terminate in the checkCommandQueue while loop 2019-01-21 13:29:14 -05:00
Isaac Connor 9f588d5758 prevent returning infinity from GetFPS 2019-01-21 13:00:10 -05:00
Isaac Connor 2b21fe3640 increase sql var size to MED to hold the largest possible sql string. 2019-01-16 11:48:31 -05:00
Isaac Connor 3560d6247f whitespace and comments. 2019-01-16 11:20:10 -05:00
Isaac Connor 34224a957b cleanup error string 2019-01-15 11:36:13 -05:00
Isaac Connor 730ced60d8 specify which input we are setting standard on. Not sure it is required, but the api docs do it 2019-01-10 12:08:51 -05:00
Isaac Connor 4a82f460b2 add some parenthesis to make logic at more clear if not more correct. Potentially fix #2405 2019-01-09 16:39:53 -05:00
Andrew Bauer 9811679cc0
Merge pull request #2401 from connortechnology/vlc_logging 
add a logging callback to the libvlc camera
 2019-01-08 13:49:51 -06:00
Isaac Connor a5de51478e The termination callback should be private 2019-01-08 13:12:22 -05:00
Isaac Connor ae1f00f2a1 add a logging callback to the libvlc camera 2019-01-08 13:06:19 -05:00
Isaac Connor 751c312609 fix non-ascii char 2018-12-29 09:56:33 -05:00
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
Isaac Connor 32c88a3a41 Update status as well as fps when updating fps 2018-12-27 13:50:17 -05:00
Isaac Connor db6d943854 If failure in connect, close the fd before returning 2018-12-27 11:53:21 -05:00
Isaac Connor b87ae53a83 merge debug lines and correct spacing 2018-12-27 11:50:43 -05:00
Isaac Connor 55e0d82f20 spacing 2018-12-24 11:30:22 -05:00
Andrew Bauer 6eb7892fc7
Merge pull request #2357 from connortechnology/libswresample 
Implement libswresample support as an alternative to libavresample, w…
 2018-12-20 16:44:06 -06:00
Isaac Connor 48865f124b cap AAC bitrate at 96000 to prevent the aac encoder from complaining 2018-12-20 15:10:04 -05:00
Isaac Connor 6ee72aa2d9 Implement libswresample support as an alternative to libavresample, which is deprecated 2018-12-20 14:06:56 -05:00
Isaac Connor 1d371b7a17 Fix small memleak of linked_monitors not getting freed on Monitor destruction. Fix unlocking db mutex before logging 2018-12-20 13:41:57 -05:00
Isaac Connor ad4f131284 Must unlock before logging 2018-12-14 12:22:10 -05:00
Isaac Connor 1a05e777c0 fix path not being constructed properly for shallow event storage 2018-12-14 08:54:29 -05:00
Isaac Connor 83e74aec55 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-14 08:40:45 -05:00
Isaac Connor 70388753ea COmment out logging in signal handlers. Logging is too complex. 2018-12-14 08:40:32 -05:00
Pliable Pixels ebaafef607 Ffmpeg logs optional (#2345) 
* make ffmpeg logs configurable via web

* fix Info
 2018-12-14 08:01:23 -05:00
Isaac Connor a1e9058729 adjust ffmpeg logging levels 2018-12-13 16:19:55 -05:00
Isaac Connor 0784a8a5a1 reduce ffmpeg log levels from error to warning and warning to info. Ffmpeg outputs a lot of errors that don't significantly affect video recording. 2018-12-13 10:27:44 -05:00
Andrew Bauer 22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm 
Save first alarm
 2018-12-11 09:35:40 -06:00
Andrew Bauer b563968ce2
Merge pull request #2321 from connortechnology/av_logging 
Av logging
 2018-12-11 09:30:08 -06:00
Andrew Bauer db81465fa2 allow one to set manpage destination 2018-12-07 09:47:00 -06:00
Isaac Connor d837b42836 fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec 2018-12-03 10:33:53 -05:00
Isaac Connor 8404f0ef64 When forcing an alarm, print out the event id 2018-11-26 16:21:32 -05:00
Isaac Connor 251ccc0ba9 remove extra () 2018-11-26 16:20:52 -05:00
Isaac Connor 1273cb863c send logPrint a pre-formatted string 2018-11-23 13:04:46 -05:00
Isaac Connor 522ecaddd8 remove extra include unistd.h and we have to pre-define RecursiveMutex because we use it in zm_logger. 2018-11-23 12:46:10 -05:00
Isaac Connor 4d4666f5e0 add a mutex in logging functions so that multiple threads can log at the same time 2018-11-23 12:45:41 -05:00
Isaac Connor 61759a1f2d older libavcodecs don't have AV_LOG_TRACE AND AV_LOG_MAX_OFFSET 2018-11-23 12:45:21 -05:00
Isaac Connor af8626158d zm_exception doesn't use anything from zm.h so don't include it 2018-11-23 12:44:54 -05:00
Isaac Connor 48564da915 zm_config.h shouldn't include zm.h. zm.h includs zm_config.h 2018-11-23 12:44:34 -05:00
Isaac Connor 5ad753b6b4 zm_comms uses logging functions, so include zm_logger.h 2018-11-23 12:44:10 -05:00
Isaac Connor 9241c26f2f Move PATH_MAX to zm_config where all the other defines are 2018-11-23 12:43:51 -05:00
Isaac Connor 87140ecdb5 white space and quiet warning 2018-11-17 10:39:42 -05:00
Isaac Connor 70d9fda758 Implement a logging callback for avcodec to use our logging functions 2018-11-14 17:02:52 -05:00
Isaac Connor 35b439629c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-13 18:14:35 -05:00
Isaac Connor 5120c6f540 remove compile warning by assigning AV_CODEC_NONE to the codec_id. 2018-11-13 18:13:55 -05:00
Isaac Connor 31b0ed107d remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258 2018-11-13 14:02:44 -05:00
Pliable Pixels e06f5b0f90 removed static 2018-11-12 13:34:29 -05:00