mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-16 11:59:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,656 Commits 82 Branches 104 Tags
c35b28a3d13dbf08a27c19fa8fb21b111b35bc53
Commit Graph

5395 Commits

Author SHA1 Message Date
Isaac Connor
b4f674ef5d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-11-30 13:18:38 -05:00
Isaac Connor
ae66782ddb Use 32byte aligned buffer size when allocating an image buffer to make ffmpeg happy. Fixes a crash when width = 1080. When linesizes are different, copy line by line instead of the whole buffer all at once. 2022-11-30 13:18:13 -05:00
Isaac Connor
61e5527b63 Log image size as wel 2022-11-30 13:18:13 -05:00
Isaac Connor
fbb9350c58 Remove some extra scope, log group id as well. 2022-11-30 13:00:37 -05:00
Isaac Connor
b3a262fc9b Fix crash due to using unrotated y-channel image. Put the y-image creation in ::Decode, stored in ZMPacket. 2022-11-22 12:38:48 -05:00
Isaac Connor
5fdf66b51c Instead of return, set zm_terminate and continue so that we join the command processor thread and don't crash 2022-11-16 10:33:10 -05:00
Isaac Connor
4d716f26ee Make shm is not connected a debug... otherwise we really spam the logs. Useful error messages can go at a higher level 2022-11-16 09:07:36 -05:00
Isaac Connor
a4c88cea0a Fix warning about parentheses around assignment used as truth value 2022-11-15 13:03:55 -05:00
Isaac Connor
e59451b6da Check for return value of openEvent. In the situation where opening the event fails we must not crash. 2022-11-15 12:49:59 -05:00
Isaac Connor
bfaf8c8b53 Fix logic inversion on testing user Monitors for camera access 2022-11-06 07:46:41 -05:00
Isaac Connor
7fda500140 Make permission values 0 based but stsarting with UNKNOWN because when doing permission+0 in SQL, we get a 1-based value 2022-11-03 18:28:23 -04:00
Isaac Connor
6265a1ca41 Move from MonitorIds to Monitor_Permissions and Group_Permissions. 2022-11-02 13:25:43 -04:00
Isaac Connor
6d2b2ae525 Implement split out username/password for remote_camera and remote_camera_http 2022-11-02 10:06:39 -04:00
Isaac Connor
30bb5d47d7 Implement split out username/password for remote_camera and remote_camera_http 2022-11-02 10:06:26 -04:00
Isaac Connor
2d9bc06170 Set a 1 second timeout one the communications socket, so that our blocking commandQueue check will check zm_terminate every now an then 2022-10-26 13:09:43 -04:00
Isaac Connor
de012de198 Add a debug to tell if we got back from joining command_processor 2022-10-25 09:22:17 -04:00
Isaac Connor
37a34a9eb9 Don't list cause:ONVIF when going back into alarm 2022-10-25 09:21:57 -04:00
Isaac Connor
c2680f7f77 Turn failure to send into a debug. When running under fpm etc we may not get SIGPIPE. 2022-10-17 17:22:23 -04:00
Isaac Connor
658ca44c32 Don't panic if no font file found. Perhaps we can continue with diminished function 2022-10-14 14:04:06 -04:00
Isaac Connor
e49876de53 Bump number of db queue entries before warning to 40. 40 is still a reasonable number and rarely hit in testing. 2022-10-13 17:36:41 -04:00
Isaac Connor
a1595c0093 Default to use faststart since we close events in a separate thread we can get away with this now 2022-10-12 19:15:04 -04:00
Isaac Connor
67a399cd1f Include UpdatedOn when updating Monitor_Status 2022-10-12 19:13:52 -04:00
Isaac Connor
619cf1975f Add getting the connection id from mysql and log it in zmDbDo. This is so that when mysql reports a dropped connection, we can figure out which process it was. 2022-10-06 10:28:49 -04:00
Isaac Connor
79026b77a1 Use monitor::Substitute on Event Prefix 2022-09-28 15:53:43 -04:00
Isaac Connor
80f7f43f7c Introduce Monitor::Substitute from code doing timestamping. 2022-09-28 15:53:29 -04:00
Isaac Connor
7c9cb36027 Don't wait for decode in Analyze. 2022-09-28 13:41:23 -04:00
Jonathan Bennett
9cb21dce22 Uses the master Janus secret as the mountpoint secret, detects and restarts mounts if PIN is stale 2022-09-24 16:05:52 -05:00
Isaac Connor
e91b11d1db Add IDLE to the states where we will close the event at section length end time. 2022-09-23 14:17:28 -04:00
Isaac Connor
97a791656e Fix log causing idle events to not be closed when close_mode=ALARM. 2022-09-21 13:41:09 -04:00
Isaac Connor
895adcb4c4 put back code to close an event when idle, at section_length when using CLOSE_MODE==idle 2022-09-21 12:32:15 -04:00
Isaac Connor
dfbd9f4ed4 Set the rtsp version so that the mandatory s field in the SDP is filled 2022-09-18 14:16:35 -04:00
Isaac Connor
abc5ea26d8 Merge branch 'master' into add_janus_rtsp_user 2022-09-18 12:44:25 -04:00
Isaac Connor
bdf5b5d202 Use empty() instead of length() which is faster. Add rtsp path to debug 2022-09-18 12:36:29 -04:00
Isaac Connor
dd82a01291 Don't encode the user/pass. If they were properly entered in the web ui then we will double encode them. 2022-09-18 12:35:04 -04:00
Isaac Connor
11d6911ad4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-17 19:17:02 -04:00
Isaac Connor
67a7c0721a Fix bad merge reverts. Put back code that take username and password from fields in monitor instead of parsing from rtsp path 2022-09-17 18:58:50 -04:00
Isaac Connor
ad1a504d53 remove blank line 2022-09-16 18:33:23 -04:00
Isaac Connor
b7143a3c84 Add a check for auth timeout and re-adding with a new auth token. 2022-09-14 20:29:33 -04:00
Isaac Connor
d1cd7d3f91 Merge branch 'master' into add_janus_rtsp_user 2022-09-14 18:34:07 -04:00
Isaac Connor
319904ab80 When we increment past the event, fix the curr_frame_id so we reference the last image. 2022-09-14 18:30:39 -04:00
Isaac Connor
419a44f8ed Merge branch 'iiot' 2022-09-13 18:23:44 -04:00
Isaac Connor
deb35738db Merge branch 'master' into add_janus_rtsp_user 2022-09-13 16:17:15 -04:00
Isaac Connor
4668ffcaa9 rework event stream. Fixes seeking. Fixes event not completing due to not have Frame records for every frame. Adds send_twice to deal with browsers not showing the last sent image. Use locking around anything to do with curr_frame_id as commandQueue is it's own thread now. 2022-09-13 16:16:54 -04:00
Isaac Connor
8549cdf317 Implement a mutex/locks around changing event data, curr_frame_id, etc. also contains a fix for seeking due to > instead of <. In general fixes seeking 2022-09-12 16:17:42 -04:00
Isaac Connor
f431ab9e45 Slightly smarted UriEncode, which doens't include numbers and a few other valid characters. Needs more work and tests. 2022-09-12 13:44:18 -04:00
Isaac Connor
d079439005 Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports 2022-09-12 19:40:27 +02:00
Isaac Connor
17df9713b1 Replace Function with Capturing 2022-09-12 11:55:09 -04:00
Isaac Connor
18fb1777ec If in a multi-server env, load the hostname instead of localhost for the server for this camera when using zm_rtsp_server. 2022-09-12 11:54:56 -04:00
Isaac Connor
01bd094899 Rough in a Server class to load Server info 2022-09-12 11:54:02 -04:00
Isaac Connor
d2c461bcc9 When using RTSP_Server restream, need to auth as a ZM user. So load user and create an auth token. 2022-09-12 10:34:26 -04:00