b6187a8e91
Allow setting the frame size
2021-03-25 13:39:07 -04:00
7038263e3b
implement a nal splitter for udp transmission
2021-03-25 13:12:52 -04:00
0c7542d20d
set hType
2021-03-25 13:12:21 -04:00
292bad8718
We can use >= instead of > to avoid an unneeded reallocation. Reduce duplicated code.
2021-03-25 12:52:41 -04:00
3f8b9db3d9
fix UriEncode returning a string that is longer than the c_str
2021-03-24 13:29:17 -04:00
79115e79f8
Fix jwt-cpp failing signature validation
2021-03-24 13:28:40 -04:00
e0e75ad8d9
jwt-cpp/
2021-03-23 15:58:42 -04:00
125b02a392
add jwt-cpp as a submodule
2021-03-23 15:56:14 -04:00
354d7d8c04
add libjwt to codeql build
2021-03-23 15:46:53 -04:00
1c8a850acf
Handle stream having something other than an img as it's display
2021-03-23 13:53:45 -04:00
37a8f007c8
remove unised function
2021-03-23 13:53:25 -04:00
e5a464f090
fix reverse logic on testing stop_
2021-03-23 13:53:07 -04:00
d1b816658b
code style cleanups and add debug to tell which library we are using
2021-03-23 13:52:35 -04:00
531850c57e
require libjwt-gnutls0. Our built in jwt-cpp doesn't seem to work
2021-03-23 13:52:05 -04:00
7a533686de
remove our version of jwt-cpp
2021-03-23 13:43:08 -04:00
1bfc61a5b7
change log level to debug when monitor is not decoding
2021-03-23 10:32:59 -04:00
456afac0ec
Must initialize stop_
2021-03-23 10:07:55 -04:00
e51fe9eb4a
add tail_count to encode option
2021-03-22 21:31:09 -04:00
7743445323
Handle when there isn't a server Id
2021-03-22 21:30:56 -04:00
e0893ef7ab
update RtspServer
2021-03-22 17:49:59 -04:00
16b33536ed
Turn off second Log in header
2021-03-22 17:49:59 -04:00
0a8b89fecd
Use pts instead of timestamp in our nal
2021-03-22 17:49:59 -04:00
f306febb5f
use find_one when loading Server which can use caching
2021-03-22 17:49:59 -04:00
96a96f4865
add jwt token as a std:;string
2021-03-22 17:49:59 -04:00
8bc22880a4
use modern threads. Add a separate thread for sending data.
2021-03-22 17:49:59 -04:00
cfff9723af
Remove h264markers cuz it's in zm_rtsp_server_frame.h
2021-03-22 17:49:59 -04:00
d2efb51b0d
rearrange a bit, put back setting width and height on video source even though it isn't used yet. Remove signal blocking stuff that we don't use
2021-03-22 17:49:59 -04:00
d84e4a14fb
Use a define when setting pipe size
2021-03-22 17:49:59 -04:00
1dc32a0eed
Use getBodyTopHTML so that we get error reporting
2021-03-22 13:00:08 -04:00
be0841832e
enable reporting saving errors back to web ui.
2021-03-22 12:59:41 -04:00
3fdd2bff7f
Have to use === because apparently null == NOW() according to php.
2021-03-22 12:59:18 -04:00
b5f64f1c69
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2021-03-22 12:41:36 -04:00
9cb5887332
better debug logging when choosing codec
2021-03-22 12:41:30 -04:00
c7b22dae81
get rid of nextId entirely. Don't want to use it anywhere other than setting the name
2021-03-22 12:07:23 -04:00
613ed1faf2
Update estimated ram use when we use the dropdown to change resolution
2021-03-22 12:06:48 -04:00
fa08240a4d
Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type
2021-03-22 12:06:25 -04:00
c347261e19
Change default of ImageBufferCount to 3
2021-03-22 12:05:36 -04:00
b8b20917be
setKeepKeyframes when not PASSTHROUGH
2021-03-22 12:05:22 -04:00
2d4b4b6022
If we already tried decoding a packet, don't try again. Also we really shouldn't be decoding in videostore.
2021-03-22 12:05:05 -04:00
3f3bc50acb
Add keep_keyframes setting. When NOT doing passthrough we don't actually have to store all packets since last keyframe, so don't do it. SImplifies clearPackets() logic a lot and will save ram for those people.
2021-03-22 12:04:32 -04:00
6d5cbe2583
Make incorrect dimensions non-fatal if the monitor dimensions are larger than what is expected, so at least there is enough ram to store the image
2021-03-22 11:02:32 -04:00
be653980f3
fix eslint
2021-03-21 18:17:13 -04:00
858ae8b11f
fix alignment and min width of datetime column in logs view
2021-03-21 18:17:13 -04:00
da0fa3e08a
Merge pull request #3199 from Carbenium/localtime
...
Use thread-safe localtime and gmtime versions
2021-03-21 18:12:21 -04:00
67d7872e9a
Eliminate non-thread-safe calls to gmtime
...
gmtime uses an internal static storage to which a pointer is given as return value.
Due to this it is not safe to call gmtime from multiple threads since the same static storage is used.
Use gmtime_r instead which allows to pass in a tm struct.
Fixes:
https://github.com/ZoneMinder/zoneminder/security/code-scanning/32
2021-03-21 21:42:02 +01:00
4e8c7d1f7c
Eliminate non-thread-safe calls to localtime
...
localtime uses an internal static storage to which a pointer is given as return value.
Due to this it is not safe to call localtime from multiple threads since the same static storage is used.
Use localtime_r instead which allows to pass in a tm struct.
Fixes:
https://github.com/ZoneMinder/zoneminder/security/code-scanning/24
https://github.com/ZoneMinder/zoneminder/security/code-scanning/25
https://github.com/ZoneMinder/zoneminder/security/code-scanning/26
https://github.com/ZoneMinder/zoneminder/security/code-scanning/27
https://github.com/ZoneMinder/zoneminder/security/code-scanning/28
https://github.com/ZoneMinder/zoneminder/security/code-scanning/30
https://github.com/ZoneMinder/zoneminder/security/code-scanning/31
https://github.com/ZoneMinder/zoneminder/security/code-scanning/33
https://github.com/ZoneMinder/zoneminder/security/code-scanning/58
https://github.com/ZoneMinder/zoneminder/security/code-scanning/59
https://github.com/ZoneMinder/zoneminder/security/code-scanning/63
https://github.com/ZoneMinder/zoneminder/security/code-scanning/64
https://github.com/ZoneMinder/zoneminder/security/code-scanning/65
2021-03-21 21:42:02 +01:00
7e86e1ef40
utils: Make TimevalToString thread-safe
2021-03-21 21:42:02 +01:00
7f9c9c6624
web: make eslint happy
2021-03-21 21:40:41 +01:00
5f5648317c
Merge pull request #3198 from SirLouen/3197-record-event-close-mode
...
Issue #3197 Add RECORD to Event_Close_Mode time
2021-03-21 13:04:08 -04:00
7c9eb42ebb
Merge branch 'master' into 3197-record-event-close-mode
2021-03-21 13:03:26 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt