Isaac Connor
|
442f126193
|
Fix compile on xenial which doesn't have hwaccel
|
2021-05-06 11:04:38 -04:00 |
Isaac Connor
|
b8f0d90000
|
Put back Estimated Ram Use. Rework it to provide min/max
|
2021-05-06 10:17:46 -04:00 |
|
Isaac Connor
|
0adc2d96d6
|
Revert "remove estimated ram use stuff as it is no longer possible"
This reverts commit 2e675a338b.
|
2021-05-06 09:54:06 -04:00 |
|
Isaac Connor
|
f4bbacb3f4
|
add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc
|
2021-05-05 16:48:49 -04:00 |
|
Isaac Connor
|
ed97ff495b
|
Unhide Codec, hide OutputContainer
|
2021-05-05 16:48:01 -04:00 |
|
Isaac Connor
|
b0b6de948d
|
Add h265 encoding with libx265, hevc_vaapi and hevc_nvenc
|
2021-05-05 16:47:39 -04:00 |
|
Isaac Connor
|
8aacdb37cc
|
Bump to 1.35.28
|
2021-05-05 15:03:51 -04:00 |
|
Isaac Connor
|
e514c77e90
|
Change encoder to a text field. enums will be too much of a hassle
|
2021-05-05 14:09:22 -04:00 |
|
Isaac Connor
|
09e5c47f3e
|
Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow.
|
2021-05-05 14:03:38 -04:00 |
|
Isaac Connor
|
2dfe66663d
|
Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options
|
2021-05-05 14:03:02 -04:00 |
|
Isaac Connor
|
31a95fa27c
|
add nvenc support
|
2021-05-05 13:58:31 -04:00 |
|
Isaac Connor
|
3645ccea1b
|
Make vaapi accelerated encoding work
|
2021-05-04 20:20:33 -04:00 |
|
Isaac Connor
|
6d07c7ce9f
|
specify the invalid characters
|
2021-05-04 15:56:47 -04:00 |
|
Isaac Connor
|
8f27db5d6f
|
Do not stop dbQueue in logTerm. dbQueue is not just for logging.
|
2021-05-04 14:22:02 -04:00 |
|
Isaac Connor
|
0b6e414998
|
Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting
|
2021-05-04 13:19:40 -04:00 |
|
Isaac Connor
|
9ee5e983d6
|
Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes
|
2021-05-04 13:19:10 -04:00 |
|
Isaac Connor
|
24d9bfa257
|
Add a test for invalid characters in Path for Ffmpeg monitors
|
2021-05-04 10:45:27 -04:00 |
|
Isaac Connor
|
4f4a1a4565
|
if sendTextFrame fails, just exit.
|
2021-05-03 16:27:37 -04:00 |
|
Isaac Connor
|
b10b2932ee
|
Code spacing and doc
|
2021-05-03 15:20:11 -04:00 |
|
Isaac Connor
|
934c726beb
|
Handle camera not being defined in SubpixelOrder and Colours. Remove subpixelorder as it exists in camera only
|
2021-05-03 15:19:45 -04:00 |
|
Isaac Connor
|
d92c95a420
|
if analysis frame doesn't exist revert back to capt
|
2021-05-03 15:18:35 -04:00 |
|
Isaac Connor
|
80d2f9f098
|
Revert "Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms"
This reverts commit 48f79da892.
|
2021-05-03 14:19:34 -04:00 |
|
Isaac Connor
|
bc6ba0a772
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-05-03 13:18:51 -04:00 |
|
Isaac Connor
|
8bd876d8c8
|
improve warning message to include the values that don't match
|
2021-05-03 13:18:39 -04:00 |
|
Isaac Connor
|
90dff85e40
|
Only default to BGRA when colours are > 1.
|
2021-05-03 13:17:58 -04:00 |
|
Isaac Connor
|
bf72bb2a22
|
Increase sleep after prime failure up to a minute.
|
2021-05-03 10:38:01 -04:00 |
Peter Keresztes Schmidt
|
e5ceed31cc
|
Image: Fix a typo introduced in 3f5dbb7780
|
2021-05-02 23:22:49 +02:00 |
|
Peter Keresztes Schmidt
|
e5613d0d27
|
Make sure all logging macro calls are terminated with a semicolon
|
2021-05-02 23:08:48 +02:00 |
|
Isaac Connor
|
260fcaadde
|
remove debug
|
2021-05-02 14:07:29 -04:00 |
|
Isaac Connor
|
3f5dbb7780
|
Default to rgba when subpixelorder is not specified
|
2021-05-02 14:07:29 -04:00 |
|
Isaac Connor
|
44e8107cac
|
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
|
2021-05-02 13:38:06 -04:00 |
|
Isaac Connor
|
91a09608ea
|
Use newlines to make debugging sql easier to read.
|
2021-05-02 13:37:26 -04:00 |
|
Isaac Connor
|
b70cd053d6
|
spacing and quotes
|
2021-05-02 12:43:17 -04:00 |
|
Isaac Connor
|
88147f3f7a
|
add another logInit so that early messages go to zms.log after loading config. Add Image::Initialise so that initialised flag will get set, and add a Deinitialise call so that ram allocated in zm_image gets freed.
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
59b1927ad6
|
do dbQUeue.stop in logTerm so we don't have to have an extra line in every executable
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
48f79da892
|
Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
ad388e9fc5
|
Free up encodejpg_ccinfo in Deinitialize
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
9f60b021ef
|
Merge pull request #3227 from Carbenium/werror
Enable Werror for CI builds
|
2021-04-30 19:34:03 -04:00 |
|
Peter Keresztes Schmidt
|
3bbec92d40
|
utils/packpack: Update RtspServer
|
2021-05-01 00:39:22 +02:00 |
|
Peter Keresztes Schmidt
|
14cb2bc3dd
|
zm_rtsp_server: Remove an unused variable
|
2021-05-01 00:24:54 +02:00 |
|
Peter Keresztes Schmidt
|
6c73590243
|
CI: Enable Werror for FreeBSD and Xenial builds
|
2021-05-01 00:12:45 +02:00 |
|
Peter Keresztes Schmidt
|
bf08502b9c
|
Build: Add CMake option to enable Werror
With -DENABLE_WERROR the -Werror flag will be passed to the compiler failing the build if a warning is emitted.
|
2021-05-01 00:07:12 +02:00 |
|
Isaac Connor
|
202c4ef28c
|
copy array_diff sub into Object so we don't have the dependency
|
2021-04-29 19:00:36 -04:00 |
|
Isaac Connor
|
c74778f949
|
Revert "add new dependency libarray-util-perl"
This reverts commit 9e5ca7832a.
|
2021-04-29 19:00:36 -04:00 |
|
Isaac Connor
|
6a1a94cece
|
Merge pull request #3226 from Carbenium/log-format
Fix logging format string mismatches
|
2021-04-29 18:29:56 -04:00 |
|
Peter Keresztes Schmidt
|
68bedfe48f
|
Fix logging format string mismatches
* Remove SZFMTD format macro and use %zu instead for size_t. %zu is understood by every compiler nowadays.
|
2021-04-30 00:26:24 +02:00 |
|
Isaac Connor
|
9e5ca7832a
|
add new dependency libarray-util-perl
|
2021-04-29 14:49:54 -04:00 |
|
Isaac Connor
|
e32771c255
|
Add Zones() to Monitor
|
2021-04-29 14:49:39 -04:00 |
|
Isaac Connor
|
69098ccdcb
|
Implement changes() in Object
|
2021-04-29 14:49:30 -04:00 |
|
Peter Keresztes Schmidt
|
c3dd8d8a47
|
Logger: Annotate logPrint with format attribute
This allows the compiler to check for mismatches in the format string and the passed parameters.
|
2021-04-29 17:12:44 +02:00 |