cad80eb37d
Revert "Fix memleak due to not deleting okpt in VideoStore destructor"
...
This reverts commit 896a05c65d
2022-08-06 09:54:23 -04:00
896a05c65d
Fix memleak due to not deleting okpt in VideoStore destructor
2022-08-06 09:47:25 -04:00
5405ebdaa8
Replace the Event index with an eventId,ZoneId index, which mysql will actually use to speed up the subquery for AlarmedZone
2022-08-05 10:53:25 -04:00
9b287d56a3
Merge pull request #3563 from ovargasp/Date-Format
...
Date format
2022-08-05 09:31:20 -04:00
35ed770de7
Merge pull request #3562 from ovargasp/master
...
Modify zmu
2022-08-05 09:29:43 -04:00
b01c75ab76
Modify config.php.in
...
Modifies config.php to use ZM_TIMEZONE if defined by user
2022-08-05 06:40:23 -06:00
a0f6ba1455
Modify zmu
...
Adds option to get monitor triggered status.
2022-08-04 20:31:12 -06:00
409dac7051
Merge pull request #3557 from teridon/axiszoomfix
...
Make proportional zoom and movement work for AxisV2 API
2022-08-04 12:44:46 -04:00
3190051287
Make proportional and continuous movement actually work
2022-08-04 12:40:31 -04:00
71325fdd5c
Setting padding to 0 for ptz buttons
2022-08-04 12:13:53 -04:00
84385442d7
Set button padding to 0 for ptz buttons
2022-08-04 09:22:30 -04:00
eb4b097560
fix eslint
2022-08-03 13:52:01 -04:00
19952b25c1
Remove unused code
2022-08-03 13:40:08 -04:00
2e5d7ee167
Improve adding parenthesis, rename function to snake case
2022-08-03 13:38:56 -04:00
f4b8066d00
Add backtrace to invalid value for width
2022-08-03 12:28:39 -04:00
6f146d1af0
Add MonitorLinkExpression.js
2022-08-03 12:14:51 -04:00
45697c7da9
Merge branch 'master' into reports
2022-08-03 11:57:07 -04:00
6e5b9b56ed
Only load linked monitors if doing capture
2022-08-03 11:55:44 -04:00
cf3c194e21
Handle when there are no servers and hence no defined ServerId in newMonitor
2022-08-03 11:55:44 -04:00
77472492e2
Make zoom buttons work for Axis P5655-E
2022-08-03 09:57:57 -04:00
b40423d720
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-02 20:57:48 -04:00
2fa90cff4d
Use const or let instead of var
2022-08-02 20:47:47 -04:00
89631a8531
Fix spelling
2022-08-02 20:47:07 -04:00
79f2d1d20f
If nothing selected, present a message about it. This shouldn't happen, but does
2022-08-02 20:46:33 -04:00
c40cedc15c
Simply code about zm_terminate, replace fixed 60 second max sleep time with ZM_WATCH_MAX_DELAY
2022-08-02 20:45:45 -04:00
6f02096098
Notify all packets when doing packetqueue:stop so prevent deadlock when waiting for decode
2022-08-02 20:44:45 -04:00
1d40279fcf
Check heartbeat time for monitors that don't do decoding
2022-08-02 20:44:10 -04:00
42bb0c41a0
Rename zmc_heartbeat_time to just heartbeat_time
2022-08-02 20:43:49 -04:00
baf65819cb
add notify_all functions
2022-08-02 20:43:20 -04:00
a03189046e
Rename zmc_heartbeat_time to heartbeat_time. Set it during waiting for prime and capturing.
2022-08-02 17:54:27 -04:00
30271283ba
Make CMD_LIST available to specific monitors as well as all monitors.
2022-08-02 14:19:57 -04:00
a9cc417a8b
Fix logic around warning about keyframe interval being larger than max image buffer count.
2022-08-02 13:02:12 -04:00
53dbb71c78
Merge pull request #3546 from dougnazar/ffmpeg_use_av_packet_alloc
...
Switch from av_init_packet() to av_packet_alloc()
2022-08-02 10:57:50 -04:00
7121665376
cache bust MonitorLinkExpression.js
2022-08-02 10:38:55 -04:00
6934b7090d
remove commented out code, use const for obr and cbr selects
2022-08-02 10:38:35 -04:00
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
acbdf1854d
Add guard to handle resetting AVPacket after use.
...
Also handle allocation failures.
2022-07-29 14:56:38 -04:00
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
5776a766e1
fixup logic inversion on test_post_sql_conditions. condense code.
2022-07-29 13:59:21 -04:00
e1581b6be6
db limits should not be affected by pre-conditions, so include the limit regardless of pre-sql-conditions.
2022-07-29 13:59:01 -04:00
c937169a6b
Fix logic inversion on test_pre_sql_conditions
2022-07-29 13:50:40 -04:00
4d31089707
Only decremember warned_count if > 0. Fixes too much logging. Add warning about keyframe interval being > max image buffer setting.
2022-07-29 13:49:34 -04:00
12c1011ff9
Use parseInt to turn '0' into 0
2022-07-29 10:44:28 -04:00
d0cbb7b478
Sync up with c++ shm alignment to fix same size of 32bit
2022-07-29 10:27:18 -04:00
d8dea37c88
When selecting AlarmedZone, must check for SCore > 0.
2022-07-28 16:33:38 -04:00
7f192c4e47
Merge pull request #3551 from dougnazar/fix_crash
...
Fix zmc Segfault on 1.36.20
2022-07-28 16:28:32 -04:00
33943acbc4
Code style, spacing. Move check for trailing slash into the if specified janus_path part
2022-07-28 16:27:28 -04:00
f463246e43
Log reorder_queue_size
2022-07-28 15:46:01 -04:00
5cb5132bf7
Fix crash due to double delete of Janus_Manager
2022-07-28 15:26:32 -04:00
b2bcd9bc25
Merge pull request #3545 from dougnazar/misc_fixes
...
Misc fixes
2022-07-27 12:42:44 -04:00
Isaac Connor
Isaac Connor
ovargasp
Robert Jacobson
Doug Nazar