Isaac Connor
|
a250567e74
|
add sleeping when no viewers and in ondemand mode
|
2022-01-01 17:54:47 -05:00 |
|
Isaac Connor
|
8c8a9ca32a
|
Rework the logic around waiting for capture to be in both single jpeg mode and streaming.
|
2022-01-01 17:54:20 -05:00 |
|
Isaac Connor
|
fd489c2c8d
|
Fix. Need to use system_clock
|
2022-01-01 17:53:45 -05:00 |
|
Isaac Connor
|
a66adb6dcd
|
fix SteadyClock vs Systemclock issues
|
2021-12-31 18:36:23 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |
|
Isaac Connor
|
82a5f3a059
|
set zm_terminate instead of exit() so that all the cleanup code happens
|
2021-12-26 15:19:13 -05:00 |
Isaac Connor
|
81048b6191
|
Reduce code
|
2021-12-17 13:29:30 -05:00 |
|
Isaac Connor
|
77793da70e
|
If no max_fps set we don't care how long it takes to send frame
|
2021-12-17 13:29:30 -05:00 |
|
Isaac Connor
|
edbe726e86
|
Implement semaphore retry. Make not getting the semaphore an error
|
2021-12-17 09:41:45 -05:00 |
|
Isaac Connor
|
1bc0e1820e
|
fix build on older c++
|
2021-12-16 17:02:20 -05:00 |
|
Isaac Connor
|
c081637036
|
Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON.
|
2021-12-16 16:38:15 -05:00 |
|
Isaac Connor
|
4dd454325c
|
use options[maxfps] instead of always specifying 30fps.
|
2021-12-16 16:36:38 -05:00 |
|
Isaac Connor
|
30e4d72c1d
|
Implement CMD_MAXFPS
|
2021-12-16 16:36:12 -05:00 |
|
Isaac Connor
|
7101a70774
|
Switch to steady_clock
|
2021-12-16 16:35:42 -05:00 |
|
Isaac Connor
|
60d2186ff4
|
Move from SystemTimePoint to SteadyTimePoint where possible. Implement MAXFPS command. Change the logic of calculating sleep time to make more sense. Get rid of frame_mod use in favour of calculating when then next frame should get sent and just waiting till then.
|
2021-12-16 16:35:20 -05:00 |
|
Isaac Connor
|
7b7ac8fc7e
|
Add utility functions TimePointToString and SystemTimePointToString
|
2021-12-16 16:30:26 -05:00 |
|
Isaac Connor
|
7c3ab46408
|
fix missing quote
|
2021-12-16 09:35:21 -05:00 |
|
Isaac Connor
|
d10d5201ac
|
log max fps
|
2021-12-15 16:57:27 -05:00 |
|
Isaac Connor
|
4edd5c1bf5
|
Don't alter maxfps. Just report that we are too slow. Don't use ZM_RATE_BASE in sleep time calculations it amplifies the sleep seconds by 100 times. Removing allows us to view a full framerate.
|
2021-12-15 16:57:17 -05:00 |
|
Isaac Connor
|
8215b04fb0
|
remove padding from container in watch view so that image can go right to edge. Add 1px padding to sidebar for better visual separation.
|
2021-12-15 14:49:40 -05:00 |
|
Isaac Connor
|
f1db88510e
|
remove debug, fix eslint
|
2021-12-15 09:23:21 -05:00 |
|
Isaac Connor
|
854d11ce9d
|
List the connkey that isn't open, differentiate logs a bit to help debug.
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
d86456b6f2
|
revamp, using ZoneMinder::Monitor methods to reduce code. Reduce last analysze time was zero to a debug. Fixes #3389
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
12ebdacf54
|
specify ZoneMinder::Database for zmSQLExecute
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
fe0e4627ef
|
Specify ZoneMinder::General for runCommand
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
28d5614da0
|
Fix missing ;
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
f683557b0e
|
Fix Monitor::Control to handle local cameras
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
e8edeab641
|
parseInt prevEventId and nextEventID to be sure that our tests for != 0 work. Also don't go to previous event if prevEventId ==0.Maybe Fixes #3390
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
61fe35a32a
|
Don't log errors when querying a monitor in NONE Function. Just report a 0 status.Fixes #3397
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
f6d0274f74
|
Fix PrevCycle because monIdx was empty.
|
2021-12-14 17:05:56 -05:00 |
|
Isaac Connor
|
4fa804e9a2
|
Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8
|
2021-12-14 13:33:00 -05:00 |
|
Isaac Connor
|
cca7953856
|
include user and function error message about insufficient permissions. Will make it easier to figure out who tried what.
|
2021-12-14 12:26:26 -05:00 |
|
Isaac Connor
|
fe72fd83f8
|
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
|
2021-12-14 10:04:35 -05:00 |
|
Isaac Connor
|
cfcc39defb
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-12-14 09:29:03 -05:00 |
|
Isaac Connor
|
2f287a5050
|
Merge pull request #3400 from makers-mark/master
Fix boilerplate (un)typo
|
2021-12-13 22:29:52 -05:00 |
makers-mark
|
9733cdb576
|
Update zm_update-1.35.25.sql
|
2021-12-13 21:07:35 -05:00 |
|
Isaac Connor
|
3fad178528
|
Bump version for ExecuteInterval in filters
|
2021-12-13 15:02:54 -05:00 |
|
Isaac Connor
|
ea671a57f8
|
Add skip_locked and ExecuteInterval
|
2021-12-13 15:01:23 -05:00 |
|
Isaac Connor
|
6b18b2889d
|
Add skip_locked and ExecuteInterval
|
2021-12-13 15:01:17 -05:00 |
|
Isaac Connor
|
69faa42ca7
|
Add more of the resulting SQL to the filter debug modal
|
2021-12-13 15:00:55 -05:00 |
|
Isaac Connor
|
6511dc8a4f
|
Allow empty sort field.
|
2021-12-13 15:00:35 -05:00 |
|
Isaac Connor
|
e2df6e5074
|
Add ExecuteInterval to Filters
|
2021-12-13 15:00:03 -05:00 |
|
Isaac Connor
|
a65f2b42ce
|
Implement per-filter delays using the ExecuteInterval member of Filters. Remove uneded lockandload when doing row locks. We will have already locked when executing the filter sql.
|
2021-12-13 14:59:38 -05:00 |
|
Isaac Connor
|
0382a677df
|
Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage.
|
2021-12-13 14:58:32 -05:00 |
|
Isaac Connor
|
ef13c84d8b
|
fix zmtrigger. Need {}
|
2021-12-12 17:01:12 -05:00 |
|
Isaac Connor
|
b4511a8fc3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-12-10 16:20:54 -05:00 |
|
Isaac Connor
|
c42b75a252
|
must clear the monitors array before terminating log.
|
2021-12-10 16:20:44 -05:00 |
|
Isaac Connor
|
4cbc55d160
|
spacing
|
2021-12-10 16:19:41 -05:00 |
|
Isaac Connor
|
5a57122891
|
fix typpo
|
2021-12-10 16:17:54 -05:00 |
|
Isaac Connor
|
5312d11e78
|
Don't both running zmu if monitor Function is set to None
|
2021-12-10 16:08:43 -05:00 |