Commit Graph

18800 Commits

Author SHA1 Message Date
Isaac Connor badb1c6131 Add MaxImageBufferCount, remove estimated ram us 2021-03-26 14:31:04 -04:00
Isaac Connor 52cb182ae3 Load max_image_buffer_count in monitor and set it in packetqueue. rename max_video_packet_count to pre_event_video_count in packetqueue and adjust logic. When queuing packets check to ensure that we aren't going over. Delete packets from front if possible, do not queue packet if not possible 2021-03-26 14:26:37 -04:00
Isaac Connor 3655b25b7c spacing 2021-03-26 08:16:26 -04:00
Isaac Connor c78e6a7cc7 Fix scroll bars on options view 2021-03-26 08:16:15 -04:00
Isaac Connor d0a390b42f decrease logging of nal counts 2021-03-26 08:15:55 -04:00
Isaac Connor 21cf1f47a5 GroupIds is not a valid Column in Monitors 2021-03-25 17:33:04 -04:00
Isaac Connor 4fab9fe458 fix error due to missing columns 2021-03-25 17:29:35 -04:00
Isaac Connor cbbb95182d Add back jwt-cpp 2021-03-25 13:53:42 -04:00
Isaac Connor a1859210d5 delete jwt-cpp 2021-03-25 13:53:08 -04:00
Isaac Connor 1c920647b8 Remove jwt-cpp as a submodule 2021-03-25 13:52:57 -04:00
Isaac Connor b6187a8e91 Allow setting the frame size 2021-03-25 13:39:07 -04:00
Isaac Connor 7038263e3b implement a nal splitter for udp transmission 2021-03-25 13:12:52 -04:00
Isaac Connor 0c7542d20d set hType 2021-03-25 13:12:21 -04:00
Isaac Connor 292bad8718 We can use >= instead of > to avoid an unneeded reallocation. Reduce duplicated code. 2021-03-25 12:52:41 -04:00
Isaac Connor 3f8b9db3d9 fix UriEncode returning a string that is longer than the c_str 2021-03-24 13:29:17 -04:00
Isaac Connor 79115e79f8 Fix jwt-cpp failing signature validation 2021-03-24 13:28:40 -04:00
Isaac Connor e0e75ad8d9 jwt-cpp/ 2021-03-23 15:58:42 -04:00
Isaac Connor 125b02a392 add jwt-cpp as a submodule 2021-03-23 15:56:14 -04:00
Isaac Connor 354d7d8c04 add libjwt to codeql build 2021-03-23 15:46:53 -04:00
Isaac Connor 1c8a850acf Handle stream having something other than an img as it's display 2021-03-23 13:53:45 -04:00
Isaac Connor 37a8f007c8 remove unised function 2021-03-23 13:53:25 -04:00
Isaac Connor e5a464f090 fix reverse logic on testing stop_ 2021-03-23 13:53:07 -04:00
Isaac Connor d1b816658b code style cleanups and add debug to tell which library we are using 2021-03-23 13:52:35 -04:00
Isaac Connor 531850c57e require libjwt-gnutls0. Our built in jwt-cpp doesn't seem to work 2021-03-23 13:52:05 -04:00
Isaac Connor 7a533686de remove our version of jwt-cpp 2021-03-23 13:43:08 -04:00
Isaac Connor 1bfc61a5b7 change log level to debug when monitor is not decoding 2021-03-23 10:32:59 -04:00
Isaac Connor 456afac0ec Must initialize stop_ 2021-03-23 10:07:55 -04:00
Isaac Connor e51fe9eb4a add tail_count to encode option 2021-03-22 21:31:09 -04:00
Isaac Connor 7743445323 Handle when there isn't a server Id 2021-03-22 21:30:56 -04:00
Isaac Connor e0893ef7ab update RtspServer 2021-03-22 17:49:59 -04:00
Isaac Connor 16b33536ed Turn off second Log in header 2021-03-22 17:49:59 -04:00
Isaac Connor 0a8b89fecd Use pts instead of timestamp in our nal 2021-03-22 17:49:59 -04:00
Isaac Connor f306febb5f use find_one when loading Server which can use caching 2021-03-22 17:49:59 -04:00
Isaac Connor 96a96f4865 add jwt token as a std:;string 2021-03-22 17:49:59 -04:00
Isaac Connor 8bc22880a4 use modern threads. Add a separate thread for sending data. 2021-03-22 17:49:59 -04:00
Isaac Connor cfff9723af Remove h264markers cuz it's in zm_rtsp_server_frame.h 2021-03-22 17:49:59 -04:00
Isaac Connor 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
Isaac Connor d84e4a14fb Use a define when setting pipe size 2021-03-22 17:49:59 -04:00
Isaac Connor 1dc32a0eed Use getBodyTopHTML so that we get error reporting 2021-03-22 13:00:08 -04:00
Isaac Connor be0841832e enable reporting saving errors back to web ui. 2021-03-22 12:59:41 -04:00
Isaac Connor 3fdd2bff7f Have to use === because apparently null == NOW() according to php. 2021-03-22 12:59:18 -04:00
Isaac Connor b5f64f1c69 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2021-03-22 12:41:36 -04:00
Isaac Connor 9cb5887332 better debug logging when choosing codec 2021-03-22 12:41:30 -04:00
Isaac Connor 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
Isaac Connor 613ed1faf2 Update estimated ram use when we use the dropdown to change resolution 2021-03-22 12:06:48 -04:00
Isaac Connor 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
Isaac Connor c347261e19 Change default of ImageBufferCount to 3 2021-03-22 12:05:36 -04:00
Isaac Connor b8b20917be setKeepKeyframes when not PASSTHROUGH 2021-03-22 12:05:22 -04:00
Isaac Connor 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
Isaac Connor 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