mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-23 16:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,006 Commits 80 Branches 104 Tags
74a0790c563dfe2a511c398f994bca0dd4910a37
Commit Graph

1225 Commits

Author SHA1 Message Date
Isaac Connor
4889358f38 Add the actual packet, not the first packet over and over and over. Fixes #3656 2023-02-13 14:46:56 -05:00
Cloudmule
20dc0d02fc Handle failure to subscribe gracefully, de-initing soap instead of crashing. 2023-01-31 16:05:30 -05:00
Isaac Connor
08f02ecd09 Queue packets instead of packet locks in event thread. Since we are using std::shared_ptr and not modifying the packet, should not need locking. Also, locking in one thread and unlocking in another is apparentlyundefined behaviour and doesn't work infreebsd. 2023-01-24 10:28:38 -05:00
baudneo
8750e0e333 Add Janus RTSP session timeout to C ⚗️ 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:26 -07:00
Isaac Connor
f06e11a097 Add SectionLengthWarn, use it to disable warnings in logs about section length being exceeded. 2023-01-07 12:33:42 -05:00
Isaac Connor
64786cc103 Set Status to Connected when updating FPS 2022-12-07 20:35:56 -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
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
6d2b2ae525 Implement split out username/password for remote_camera and remote_camera_http 2022-11-02 10:06:39 -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
67a399cd1f Include UpdatedOn when updating Monitor_Status 2022-10-12 19:13:52 -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
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
ad1a504d53 remove blank line 2022-09-16 18:33:23 -04:00
Isaac Connor
0f068e2136 Add Janus_RTSP_User loading 2022-09-12 10:34:26 -04:00
Jonathan Bennett
c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor
97e19b78bd Fixup debug logging in ::Decode. It documents the wrong case 2022-08-26 09:33:42 -04:00
Isaac Connor
64d6dab27e Fix quoting and commas when not built with MQTT 2022-08-26 09:19:28 -04:00
Isaac Connor
429358931b Allow zm to compile without mqtt 2022-08-25 20:56:53 -04:00
Isaac Connor
fa39983b69 Merge branch 'master' into add_mqtt 2022-08-25 18:41:59 -04:00
Isaac Connor
29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Isaac Connor
8558ade8f1 Merge branch 'master' into misc_fixes 2022-08-25 18:33:06 -04:00
Isaac Connor
d51a2eb8a5 Merge pull request #3537 from parvit/issue-695 
Added configuring of authentication for rstp cameras
 2022-08-21 18:08:00 -04:00
parvit (Vittorio Parrella)
ef104fcda3 libvlc support for rtsp authentication with special characters 2022-08-20 11:00:51 -04:00
parvit (Vittorio Parrella)
a94d74143e support for ffmpeg type camera authentication with special characters 2022-08-20 10:01:14 -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
parvit (Vittorio Parrella)
6c2291bd22 Merge branch 'master' into issue-695 2022-08-14 12:10:34 -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
Jonathan Bennett
d41792ae00 Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues 2022-08-09 00:54:41 -05:00
Isaac Connor
6e5b9b56ed Only load linked monitors if doing capture 2022-08-03 11:55:44 -04:00
Isaac Connor
b40423d720 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-02 20:57:48 -04:00
Isaac Connor
89631a8531 Fix spelling 2022-08-02 20:47:07 -04:00
Isaac Connor
a03189046e Rename zmc_heartbeat_time to heartbeat_time. Set it during waiting for prime and capturing. 2022-08-02 17:54:27 -04:00
Doug Nazar
8c37846c6c Check result of snprintf for errors and truncation. 2022-07-31 16:38:23 -04:00
Doug Nazar
f4dd897ef4 Convert AVFrame* to custom unique_ptr (av_frame_ptr). 
Switch all owning AVFrame* variables to av_frame_ptr for
automatic cleanup.

Use AVBufferRef to store frame data in AVFrame where appropriate
so that it can be freed automatically with it's AVFrame.

Handle allocation errors.
 2022-07-30 13:21:11 -04:00
Doug Nazar
110cc436a3 Switch from av_init_packet() to av_packet_alloc() 
Remove all uses of deprecated av_init_packet() and switch any stack
based AVPackets to unique_ptrs allocated with av_packet_alloc().

Ensure that all code paths call av_packet_unref() after use to reset
before next usage.
 2022-07-29 14:56:26 -04:00
Isaac Connor
5cb5132bf7 Fix crash due to double delete of Janus_Manager 2022-07-28 15:26:32 -04:00
Isaac Connor
8a8a5fd5c0 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:09:01 -04:00
parvit (Vittorio Parrella)
e4a8017b6b added configuring of authentication for rstp cameras 2022-07-22 07:08:22 -04:00
Isaac Connor
95530a4f7d Merge pull request #3529 from dougnazar/fix_printf_formats 
Fix printf formats & enable large file support for 32-bit
 2022-07-20 11:44:26 -07:00
ovargasp
981769b9db Allows users to set an specific "Onvif alarm text" for each monitor (#3535) 
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
 2022-07-20 12:51:13 -05:00
Doug Nazar
3b21153757 Fix various printf formats for 32bit, 32bit w/_FILE_OFFSET_BITS=64 and 64-bit 2022-07-16 03:18:18 -04:00
Isaac Connor
e4bd2d351a Merge branch 'master' into monitorlink_expressions 2022-07-14 14:42:56 -04:00
Isaac Connor
43649e1e36 Don't need to test for event 2022-07-14 10:25:19 -04:00
Isaac Connor
cc7c8376dd Rough in a MonitorLink_Expression object 2022-06-29 09:48:10 -04:00