Isaac Connor
c5db82c082
Remove TAPE state.
2024-02-26 15:47:39 -05:00
Isaac Connor
e78c873944
Remove TAPE state.
2024-02-26 14:36:27 -05:00
Isaac Connor
2c7f83f96f
Merge pull request #3841 from ovargasp/master
...
Makes the "Events" part of the ONVIF URL configurable
2024-02-24 16:22:01 -05:00
Server
58d8cf0adf
Makes the "Events" part of the ONVIF URL configurable
...
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
2024-02-24 11:05:08 -06:00
Isaac Connor
692e1ec745
Only allow loading user by only username if AUTH_RELAY=none. Log successful login as Debug
2024-02-24 07:54:40 -05:00
Isaac Connor
e1a141ed7d
Remove event_start_mode, not going to be used
2024-02-23 16:56:55 -05:00
Isaac Connor
06134c387b
Remove event_start_mode, not going to be used
2024-02-23 16:52:21 -05:00
Isaac Connor
5e704c3a1c
Remove event_start_mode, not going to be used
2024-02-23 16:51:13 -05:00
Isaac Connor
29d120f059
Add CLOSE_DURATION, remove EventStartMode
2024-02-23 16:50:57 -05:00
Isaac Connor
920568c704
Use switch instead of ifs and add CLOSE_DURATION as valid value
2024-02-23 16:50:44 -05:00
Isaac Connor
824d6ec032
Remove EventStartMode stuff
2024-02-22 16:58:03 -05:00
Isaac Connor
eeb8856157
Ad EventStartMode and EventCLoseMode to monitor
2024-02-22 10:46:36 -05:00
Isaac Connor
0d98b2523d
Split recording=ONMOTION and recording=ALWAYS logic out explicitly, even though it leads to redundant code, it should be easier to debug.
2024-02-22 10:39:38 -05:00
Isaac Connor
ae2dc039ac
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-22 10:02:46 -05:00
Isaac Connor
364d0c438e
Split the if so that we get better debug output
2024-02-22 09:52:17 -05:00
BHMSD-bdailey
025fc939a9
Update debug to make it unique
2024-02-22 07:49:49 -05:00
BHMSD-bdailey
ebee72bf65
Prevent events from exceeding the section_length even if we are still in alarm
2024-02-21 17:10:18 -05:00
Isaac Connor
63b3f2bd36
Always increment alarm_frames if it is an alarm packet. Doesn't have to have an image.
2024-02-21 14:21:16 -05:00
Isaac Connor
15e4a7ac65
Move setting of last_signal up to where it is used for clarity
2024-02-21 12:09:24 -05:00
BHMSD-bdailey
ec24235cd3
Merge branch 'ZoneMinder:master' into master
2024-02-21 10:48:24 -05:00
BHMSD-bdailey
7e6efde1a9
Simple typo and consistency fixes.
2024-02-21 10:47:53 -05:00
Isaac Connor
0994e9da48
Merge pull request #3832 from webgeek1234/rpi-dec
...
Fix raspberry pi hardware decoding
2024-02-21 09:52:21 -05:00
Isaac Connor
72cbf4a393
Include unistd because we use sleep
2024-02-20 20:29:49 -05:00
Isaac Connor
e03afd678a
Add a return value to zmDbReconnect which seems to fix the crashing
2024-02-20 19:31:11 -05:00
Isaac Connor
93ee735086
Fix nitpick
2024-02-20 18:56:54 -05:00
Isaac Connor
87156149a0
Only do mysql_close if we think we are connected
2024-02-20 18:56:02 -05:00
Isaac Connor
e9e429083e
Add zmDbReconnect, which closes the connection before trying to reconnect, in an attempt to prevent mem leak. This adds a 1 sec sleep if we fail to connect. This also removes the disabling of db logging before doing logging... because we are going to assume (possibly incorrectly) that the logging code is correct and generating well-formed sql, and hence the error is external. This might be a bad idea.
2024-02-20 18:36:10 -05:00
Aaron Kling
e710127924
ffmpeg: Rework decode and encode flows
...
send_packet will fail with -EAGAIN if receive_frame hasn't consumed the
last packet. Similarly send_frame will fail if receive_packet has
pending frames.
This fixes problems with the raspberry pi hardware decoder. The change
likely affects many other codecs as well.
2024-02-19 17:17:24 -06:00
Isaac Connor
ff41c1612f
Use time instead of pts for legibility in warning about jumping back in time. Don't break capture until we have at least 5 of these errors.
2024-02-19 09:52:10 -05:00
Isaac Connor
01ebcad29c
Put back test for out of order packets. These buffers can take up a lot of ram even though they may not be needed.
2024-02-16 11:29:15 -05:00
Isaac Connor
602959adce
Fix issue with packet have score != -1. We don't set snap->score until after doing motion detection because we give up if we are waiting for decoding. We now always do state transitions regardless of whether we did motion detection.
2024-02-15 09:33:23 -05:00
Isaac Connor
29d70ab79b
Revert "Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early""
...
This reverts commit efe5c02223
2024-02-15 09:00:31 -05:00
Isaac Connor
efe5c02223
Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early"
...
This reverts commit 0e1cf9beda
2024-02-15 08:13:45 -05:00
Isaac Connor
0e1cf9beda
Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early
2024-02-14 17:22:26 -05:00
Isaac Connor
7517de2811
Add some more debugging. Include zm_terminate in while loop condition. return instead of continuing to process nals if _stop or _zmterminate
2024-02-13 16:34:01 -05:00
Isaac Connor
839f09dba1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-13 13:54:10 -05:00
Isaac Connor
01c6df434c
Move code to shutdown the process properly into exit_zms and use it when auth fails. The stops a segfault.
2024-02-13 13:14:39 -05:00
Isaac Connor
565badeaa5
Merge pull request #3828 from ovargasp/snapshot_1.37.50
...
SOAP WSA option for Chinese cameras
2024-02-13 10:02:38 -05:00
Server
0ff48f631e
Implements an option to disable soap_wsa code that doesn't work
...
with some chinese cameras, more common to Latam zone
2024-02-12 19:22:01 -06:00
ovargasp
5d5210b116
Changes to zm_monitor code to enable/disable soap_wsa support
...
for chinnese cameras that doesn't have it implemented
2024-02-11 07:42:58 -06:00
David Aguilar
2e9379b3f5
zm_user: avoid memory leak when user cannot be authenticated
2024-02-09 22:53:19 -08:00
Isaac Connor
b87c86621a
Set zm_terminate on io error
2024-02-08 14:42:08 -05:00
Isaac Connor
79ce5cf80f
When monitor is Decoding==None send a more informative text image saying so. Instead of simply returning, set zm_terminate and go through the normal flow so that comms thread and db threads terminate as well. Might fixes zms hangs
2024-02-08 10:58:58 -05:00
Isaac Connor
a64b24687c
Add warnings when event_close_mode is weird. Fix monitor always being in close_mode=idle. Still do state changes even if packet is not video. Do not set state=ALARM when triggered, let the state machine do that.
2024-02-07 15:56:24 -05:00
Isaac Connor
22a2846218
Can't set alarm when triggering. Must be done by the state machine
2024-02-07 15:56:24 -05:00
Isaac Connor
593f6f1601
Add some more debugging to track down idle events not closing on alarm
2024-02-07 15:56:24 -05:00
Isaac Connor
ad232761e1
Spacing, cpplint
2024-02-07 15:56:24 -05:00
Isaac Connor
4993a55b14
Move declaration of zones down to where it is used
2024-02-07 15:56:24 -05:00
Isaac Connor
f92115b4fe
Spacing
2024-02-07 15:56:23 -05:00
Isaac Connor
de7b915291
Increase the time jump to 20 seconds.
2024-02-06 15:59:08 -05:00
