Isaac Connor
|
e39e399ea0
|
fix potential double lock of jpeg mutex
|
2022-04-26 12:07:40 -04:00 |
|
Isaac Connor
|
bda9142e7a
|
Add check for deleting or terminating. Decrement packet counts in clear so that debugging makes more sense
|
2022-04-26 12:06:34 -04:00 |
|
Isaac Connor
|
15ec6af3cc
|
Simplify openEvent. Move packetqeue clearing below event closing as packets might be in use
|
2022-04-26 12:05:44 -04:00 |
|
Isaac Connor
|
998ed3753a
|
Put a lock around jpeg writing. libjpeg is not thread safe
|
2022-04-26 12:04:27 -04:00 |
|
Isaac Connor
|
c9557e21c3
|
Code comment reminding us that packets in the event queue are locked.
|
2022-04-26 11:52:15 -04:00 |
|
Isaac Connor
|
d93c9a30a5
|
WARNING should be a DEBUG when restarting a process
|
2022-04-26 10:08:54 -04:00 |
|
Isaac Connor
|
a5fce12f8b
|
Fix logging of next_dts instead of last_dts
|
2022-04-26 10:08:36 -04:00 |
|
Isaac Connor
|
012531daf4
|
Reduce warnings by setting has_warned = false in the correct spot. Add code comments
|
2022-04-26 10:08:17 -04:00 |
|
Isaac Connor
|
12a0b829be
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-04-25 18:33:47 -04:00 |
|
Isaac Connor
|
15e2ec76af
|
Add back updating Event record with video file
|
2022-04-25 18:33:30 -04:00 |
|
Isaac Connor
|
edaa4db9f6
|
Add Jammy, always default to ubuntu2004 build except for xenial, stretch
|
2022-04-25 22:04:18 +00:00 |
|
Isaac Connor
|
6b651378c0
|
Initialize ret to suppress warning.
|
2022-04-25 09:32:30 -04:00 |
|
Isaac Connor
|
1d39605476
|
Use mOptions instead of Options(). Check for empty before parsing
|
2022-04-22 13:08:25 -04:00 |
|
Isaac Connor
|
c761196744
|
Remove debugging
|
2022-04-22 13:08:25 -04:00 |
|
Isaac Connor
|
b4d4d282bb
|
trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end
|
2022-04-22 13:08:25 -04:00 |
|
Isaac Connor
|
5eeade14a9
|
Add case to handle scale value stored in cooke == auto
|
2022-04-21 17:41:03 -04:00 |
|
Isaac Connor
|
b069c538b5
|
Remove use of auto for auto scale
|
2022-04-21 17:40:37 -04:00 |
|
Isaac Connor
|
320b860a97
|
defint CMD_QUIT for telling streams to stop
|
2022-04-21 17:38:13 -04:00 |
|
Isaac Connor
|
207991781b
|
synchronize on '0' instead of '' for auto scale.
|
2022-04-21 17:37:53 -04:00 |
|
Isaac Connor
|
d4ab1d55c5
|
Revert back to Scale To Fit having the value 0. Change it to be Auto
|
2022-04-21 17:34:58 -04:00 |
|
Isaac Connor
|
b6e9b6ad9c
|
Send CMD_QUIT when changing img.src to fix safari.
|
2022-04-20 15:38:40 -04:00 |
|
Isaac Connor
|
5756449f0b
|
Include CMD_QUIT
|
2022-04-20 15:02:43 -04:00 |
|
Isaac Connor
|
0702938f44
|
Only apply scale if it is a positive integer. Use const instead of var. Only apply src if it's different
implement streamCommand and use it to send CMD_QUIT when changing img.src
|
2022-04-20 15:02:02 -04:00 |
|
Isaac Connor
|
4b4b2d2703
|
add in auto layout choice based on # of monitors
|
2022-04-20 12:23:01 -04:00 |
|
Isaac Connor
|
139b05eefe
|
scale to fit should have a value of auto and fixed will now be fixed.
|
2022-04-20 12:22:30 -04:00 |
|
Isaac Connor
|
dac24b05ec
|
Set imageFeed img to 100%
|
2022-04-20 12:22:07 -04:00 |
|
Isaac Connor
|
8acd01f9b7
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-04-18 18:07:46 -04:00 |
|
Isaac Connor
|
391f5dbf98
|
Merge more code from master fixing up when to clearPackets, don't delete image data if we have an event etc.
|
2022-04-18 18:07:24 -04:00 |
|
Isaac Connor
|
e4e20ab52f
|
make max_score an int to get rid of the casts. Move assignment of it above the event UPDATE sql so that it is immediately accurate.
|
2022-04-18 18:06:51 -04:00 |
|
Isaac Connor
|
738a9c2d27
|
Fix lockups due to lack of locking around terminate_
|
2022-04-18 17:05:41 -04:00 |
|
Isaac Connor
|
5651bc1316
|
Merge changes from master. Just delete packet_lock instead of packetqueue.unlocking it
|
2022-04-18 16:58:07 -04:00 |
|
Isaac Connor
|
ef16135d24
|
Only notify one. Anyone waiting is waiting on a lock and only 1 process can get that lock, so only one should try.
|
2022-04-18 16:56:49 -04:00 |
|
Isaac Connor
|
70743a4f11
|
Don't need to check for end of queue as we already did that when adding packet to the queue
|
2022-04-18 16:55:46 -04:00 |
|
Isaac Connor
|
6531462637
|
Don't need to test for end() because we added our packet to the queue and still have the lock
|
2022-04-18 16:55:33 -04:00 |
|
Isaac Connor
|
10d8ccf244
|
Cleanup LockedPacket, use RAII
|
2022-04-18 16:55:05 -04:00 |
|
Isaac Connor
|
b552436375
|
limit logging of full packetqueue
|
2022-04-18 16:54:35 -04:00 |
|
Isaac Connor
|
939e1d83f0
|
add mMaskedPath and mMaskedSecondPath and use them when logging so that usernames and passwords are shown in logs. Fixes #3118
|
2022-04-18 13:42:22 -04:00 |
|
Isaac Connor
|
ae313fa31b
|
Introduce mask_authentication function to replace username and password with * in url like strings
|
2022-04-18 13:42:22 -04:00 |
|
Isaac Connor
|
947a4c5e24
|
Put back UpdateAnalysisFPS
|
2022-04-15 19:54:05 -04:00 |
|
Isaac Connor
|
ecee80c4ef
|
Implement last_dts[] because next_dts[] isn't actually useful. This fixes another ffmpeg deprecation problem by keep our own copy of cur_dts
|
2022-04-15 19:41:17 -04:00 |
|
Isaac Connor
|
77482e8294
|
replace cur_dts mangling with use of our next_dts array
|
2022-04-15 19:38:37 -04:00 |
|
Isaac Connor
|
585d75044c
|
Push locked packets into event packetqueue instead of unlcoked contents. Prevents freeing of data before writing to event, hence crashing.
|
2022-04-15 19:36:33 -04:00 |
|
Isaac Connor
|
baae444f5d
|
Remove debugging, code style, spacing. Free lock before notifying
|
2022-04-15 18:45:26 -04:00 |
|
Isaac Connor
|
b999adf892
|
Pass full packet to AddFrame so that we can also write other contents out
|
2022-04-15 18:34:50 -04:00 |
|
Isaac Connor
|
bc158ea2c1
|
Rough in a queue and a thread into the event to process packets. We do this so that the event creator can get back to analysis as fast as possible so as to avoid the packetqueue filling up.
|
2022-04-14 18:44:02 -04:00 |
|
Isaac Connor
|
614acc3757
|
You must close the stream first or we get leftovew zms processes
|
2022-04-14 18:17:34 -04:00 |
|
Isaac Connor
|
b957968476
|
last analyse time being zero is very common on startup. Not an error.
|
2022-04-11 11:00:38 -04:00 |
|
Isaac Connor
|
7f602df593
|
INF logging of alarm frames in alert state should be debug
|
2022-04-11 10:10:56 -04:00 |
|
Isaac Connor
|
aab257897c
|
Ensure rate is an integer when coming from cookie. Remove commented out rate display.
|
2022-04-11 09:43:45 -04:00 |
|
Isaac Connor
|
47c8e69722
|
Merge @alabamatoys' work to add focus controls
|
2022-04-06 09:03:58 -04:00 |