Commit Graph

2455 Commits

Author SHA1 Message Date
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
Pliable Pixels
01a57222d3 keep track if we have written alarmed frame incase savejpeg is off 2018-11-12 12:43:20 -05:00
Isaac Connor
a95a012fa5 fix #2302 2018-11-12 11:56:18 -05:00
Isaac Connor
230ce61dc4 fix #2296 by prepending bind with :: 2018-11-07 11:54:18 -05:00
Isaac Connor
bca2b30518 Add a test for channel layout and correct it if not set 2018-10-24 13:45:33 -04:00
Isaac Connor
0f14df64e2 google code style and whitespace 2018-10-22 10:41:27 -04:00
Andrew Bauer
ba10c431f7 check for __ARM_PCS_VFP instead of __armel__ 2018-10-12 09:34:16 -05:00
Andrew Bauer
c7f9ffa521 Merge pull request #2217 from connortechnology/touch_lockfile
Touch lockfile
2018-10-11 08:45:09 -05:00
Andrew Bauer
ad70648cb3 don't build neon instructions on armel (#2246) 2018-10-10 14:10:02 -04: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
c481fc868f be more robust when curFrames is empty. 2018-09-28 11:25:19 -04:00
Isaac Connor
49a7614504 revert change that breaks building on newer ffmpeg libs. 2018-09-26 18:35:29 -04:00
Isaac Connor
5ef64bf256 fix memleak on old libav distros 2018-09-26 16:20:29 -04:00
Isaac Connor
51f0e7e5c8 Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4 2018-09-26 15:34:01 -04:00
Isaac Connor
1419f20dcc add setting rtsp_transport to udp. It is the default but we print out an error otherwise 2018-09-26 15:33:29 -04:00
Isaac Connor
2385c80a4a cleanup code a bit 2018-09-26 15:32:54 -04:00
Isaac Connor
b55224be30 fix setting mFlush. Just have it on for DEBUG levels 2018-09-24 14:17:16 -04:00
Isaac Connor
fd2e8a530c When changing log levels by SIGUSR1 turn on flushing 2018-09-24 09:40:05 -04:00
Isaac Connor
45056c3602 fix deprecation warning 2018-09-23 16:51:54 -04:00
Isaac Connor
53057eae25 Always make SOCK_DIR as it may not exist due to running under systemd and being chrooted 2018-09-23 16:51:06 -04:00
Isaac Connor
94796aea2c Always make SWAP_PATH dir as under systemd it may be chrooted 2018-09-23 16:49:57 -04:00
Isaac Connor
ee168bf427 Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's. 2018-09-23 16:49:06 -04:00
Isaac Connor
89cd7ceaf8 Whitespace, extra parentheses, google code style 2018-09-23 16:47:06 -04:00
Isaac Connor
c8549e41da touch the zms lock file every hour so that we can determine which ones are stale 2018-09-21 15:58:14 -04:00