Isaac Connor
903f5af1ef
invalid parameters should be a debug not a warning
2019-03-04 13:35:36 -05:00
Isaac Connor
705468dfc4
if we don't have a connkey, comms will not be open so don't touch the sock file or call checkCommandQueue
2019-02-26 10:08:07 -05:00
Isaac Connor
443fd35d99
Fix imagesize requirements ( #2404 )
...
* introduce non-loop-unrolled version of function and use them when the image size is not a multiple of 12 or 16
* Remove tests for imagesize being a multiple of 16 or 12 to handle functions with unrolled loops
* Use non-unrolled functions when image size is not a multiple of 12 or 16
* use std_blend when image is odd size
2019-02-22 09:44:57 -05:00
Isaac Connor
9996b3e718
Merge branch 'master' into break_videostorage
2019-02-17 12:10:32 -05:00
Isaac Connor
96906734b8
add an audio_fifo to handle input audio < 1024 samples per frame
2019-02-15 17:26:30 -05:00
Isaac Connor
4e463c9354
use swr_convert_frame instead of swr_convert
2019-02-14 17:48:58 -05:00
Isaac Connor
281775cc80
try setting out_frame pts from in_frame
2019-02-14 15:54: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
0bfaf87d27
Mostly code style and whitespacing. However, I do setup more values in the output frame when doing audio resampling
2019-02-12 16:40:27 -05:00
Isaac Connor
3177764db4
spacing
2019-02-12 14:20:33 -05:00
Isaac Connor
ed6b22ac06
spacing
2019-02-11 16:29:36 -05:00
Isaac Connor
6d7660cdbd
Now that we are dynamically allocating safer_username and safer_password, need to free them. Also, don't strlen them multiple times for efficiency
2019-01-25 08:46:40 -05:00
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