Commit Graph

21136 Commits (b59a42c8fec4aa3da99fda026d1acab779969bbd)

Author SHA1 Message Date
Isaac Connor 86a4e967a2 Add a button to jump this event time in montage review 2022-08-18 10:35:47 -04:00
Isaac Connor 035206a195 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-18 10:25:48 -04:00
Isaac Connor a31e09f234 Update material icons to v1.11.10 2022-08-18 10:25:32 -04:00
Isaac Connor 9a10568a5d SCALE BASE is already deifned 2022-08-18 09:54:27 -04:00
parvit (Vittorio Parrella) 442d7b1c89
integrated dynamic client and server update of path, user and password values 2022-08-18 05:05:18 -04:00
Isaac Connor 4bd7fc8fcf Clear out width=auto and height=auto to prevent warnings in logs 2022-08-17 15:34:39 -04:00
Isaac Connor 8eab9bc518 Remove SCALE_BASE as it is defined globally already 2022-08-17 15:01:04 -04:00
Isaac Connor 1362207a21 Use const instead of var to flush out duplicates for things that shouldn't change in javascript land 2022-08-17 15:00:42 -04:00
Isaac Connor 84f14a03b0 Set auto_relay as well as auth_hash. getNavBar uses it 2022-08-17 15:00:01 -04:00
Isaac Connor 4c5ec4c01f Add a Control file for Grandstream cameras 2022-08-17 14:59:02 -04:00
Isaac Connor dc24be4d99 Test for success loading Control 2022-08-17 14:58:18 -04:00
Isaac Connor d2cf2d5b41 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-16 16:37:56 -04:00
Isaac Connor f4d77116ea Add SetVideoWriterStartTime(starting_packet->timestamp);. We use shared->data->recording.tv_sec etc... but since we don't set it, it is always 0. 2022-08-16 16:37:45 -04:00
Isaac Connor 82b71d5b12 Don't update notes from this frame on continuous recording. Fixes #3550 2022-08-16 16:32:33 -04:00
Isaac Connor e655cc345f Fix crash due to deplicated join. 2022-08-16 15:16:37 -04:00
Isaac Connor a26c9f0935 Handle case where time_base is not set in the codec. Fixes h265 not playing right. Don't eek until a significant difference in time. Lots more debug output. Pass codec when initialising codec context. Mostly this fixes playback of h265 2022-08-16 15:16:22 -04:00
Isaac Connor b9c97e6795 Fix crash due to deplicated join. Don't output BOUNDARY unless image loading suceeds 2022-08-16 15:15:01 -04:00
Isaac Connor 6762ec5166 Split out realm detection and use it in sendCmdPost. Our initial query on / doesn't fail as the camera doesn't require authorization for /. 2022-08-16 13:19:29 -04:00
Isaac Connor 9501da8a41 Remove debug 2022-08-15 17:59:25 -04:00
Isaac Connor a41cba5c33 Quote and spacing 2022-08-15 17:59:17 -04:00
Isaac Connor aa030afcb6 Make checkCommandQueue it's own thread, meaning we use blocking I/O and will still respond when it takes forever to send a jpeg. Make warning about broken stream into a Debug. The signal doesn't set zm_terminate fast enough. 2022-08-15 17:58:56 -04:00
parvit (Vittorio Parrella) 3642abd155
typo 2022-08-15 14:35:16 -04:00
parvit (Vittorio Parrella) 408b42edd4
correct regex escaping 2022-08-15 14:30:48 -04:00
Isaac Connor 071147fba7 Remove no longer used code to protect percentage widths 2022-08-15 13:04:50 -04:00
Isaac Connor baa45bff4b Don't setScale after layout, just do setSteamScale because setScale will alter widths and heights 2022-08-15 13:02:55 -04:00
Isaac Connor de5b8bd893 Handle width=100% and remove code that worked around montage layouts with width=%. 2022-08-15 13:01:49 -04:00
parvit (Vittorio Parrella) 603d10a072
janus password integration 2022-08-15 12:55:04 -04:00
parvit (Vittorio Parrella) 6c2291bd22
Merge branch 'master' into issue-695 2022-08-14 12:10:34 -04:00
Isaac Connor 82ff0c1082
Merge pull request #3574 from peat-psuwit/for-upstream/zmdb-thread-init
db: start the processing thread after all fields are initialized
2022-08-13 16:02:14 -04:00
Isaac Connor 1cf0245aca Don't set AVFMT_TS_NONSTRICT. Crashes on ffmpeg 5. Fixes #3497 2022-08-12 18:21:58 -04:00
Isaac Connor 39afe4fd24 Remove warning about maxImageBuffer. It will be handled in queuePacket as it was before, only now we actually tell about the keyframe interval. It is entirely common to not get to another keyframe due to locked packets during event writing. 2022-08-12 11:05:23 -04:00
Isaac Connor 42d8be01ce set decoded=true and notify when deleting packets from queue. Analysing might be waiting on the packet. 2022-08-11 20:40:03 -04:00
Isaac Connor cec9e32a79 Use new packetqueue.stopping() to not wait when the packetqueue is stopping 2022-08-11 15:23:49 -04:00
Isaac Connor 1f9746e6c0 Add bool stopping() to packetqueue. 2022-08-11 15:10:49 -04:00
Isaac Connor cdc356f547 Keep track of max_keyframe_interval and log it when complaining 2022-08-11 13:23:13 -04:00
Isaac Connor 71986a815a Don't need max_keyframe_interval. Whether our it is still pointing at the front is enough. Only log the warning if the packetqueue is full and we couldn't find another keyframe. 2022-08-11 12:56:11 -04:00
Isaac Connor 852b67bf21 Don't call format on an empty string and only pass the integer part of it 2022-08-10 17:58:11 -04:00
Isaac Connor 1f978f0ac2 Detect out of order packets 2022-08-10 17:57:11 -04:00
Isaac Connor 80227d749a Fix bionic-focal 2022-08-10 11:56:34 -04:00
Isaac Connor d970b02079 Bump version to 1.37.20 to pickup Janus db changes 2022-08-10 11:53:05 -04:00
Isaac Connor 9480e34f2b Add bionic and focal builds 2022-08-10 11:33:35 -04:00
Isaac Connor 3136f26e40 Fix warnings about keyframe interval and maximagebuffer count on jpeg streams. 2022-08-10 10:31:57 -04:00
Isaac Connor 0078a6f639 Log entire backtrace when invalid value for width 2022-08-10 09:18:39 -04:00
Isaac Connor e10c1e8d65 Fix deprecation warning due to implicit conversion to integer. Make it explicit. 2022-08-10 09:18:39 -04:00
Isaac Connor c18a5e422a Rework code to be smaller. Don't require SystemView permission to post a log entry. Default to ERR if invalid err code provided instead of PANIC so that the log entry still gets saved 2022-08-10 09:18:39 -04:00
Jonathan Bennett 702df653f9
Fix typo in field name 2022-08-10 03:59:18 -05:00
Isaac Connor f5a6a0a5d9 Test for existence of monitors[i] before trying to kill it just to reduce javascript errors 2022-08-09 18:52:35 -04:00
Isaac Connor d1222d2fa7
Merge pull request #3572 from jp-bennett/master
Adds Janus Restream and Profile Override
2022-08-09 18:15:39 -04:00
Isaac Connor 091718da82
Merge pull request #3571 from ZoneMinder/update-RTSP-doc
Update ZM_MIN_RTSP_PORT description
2022-08-09 18:12:56 -04:00
Jonathan Bennett 2c48d83860 Properly hide Janus options when Janus is disabled for a given monitor. 2022-08-09 15:17:40 -05:00