Isaac Connor
|
2cf6ad8089
|
Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers.
|
2021-05-08 21:14:20 -04:00 |
Isaac Connor
|
bc11e6a95b
|
Include pre event count in min estimated ram use
|
2021-05-08 15:47:29 -04:00 |
Isaac Connor
|
ff0d6e8e0f
|
remove duplicated getModal and pass fid=fid to getModal
|
2021-05-07 15:34:08 -04:00 |
Isaac Connor
|
ea3bffb402
|
make getModal take additional query parameters
|
2021-05-07 15:33:49 -04:00 |
Isaac Connor
|
9e6367c7c3
|
look for 264 instead of x264
|
2021-05-06 17:33:04 -04:00 |
Isaac Connor
|
373fae2511
|
BadEncoder Params and PathNotEncoded are warnings, not errors
|
2021-05-06 11:05:05 -04:00 |
Isaac Connor
|
b8f0d90000
|
Put back Estimated Ram Use. Rework it to provide min/max
|
2021-05-06 10:17:46 -04:00 |
Isaac Connor
|
0adc2d96d6
|
Revert "remove estimated ram use stuff as it is no longer possible"
This reverts commit 2e675a338b .
|
2021-05-06 09:54:06 -04:00 |
Isaac Connor
|
f4bbacb3f4
|
add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc
|
2021-05-05 16:48:49 -04:00 |
Isaac Connor
|
ed97ff495b
|
Unhide Codec, hide OutputContainer
|
2021-05-05 16:48:01 -04:00 |
Isaac Connor
|
09e5c47f3e
|
Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow.
|
2021-05-05 14:03:38 -04:00 |
Isaac Connor
|
2dfe66663d
|
Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options
|
2021-05-05 14:03:02 -04:00 |
Isaac Connor
|
6d07c7ce9f
|
specify the invalid characters
|
2021-05-04 15:56:47 -04:00 |
Isaac Connor
|
0b6e414998
|
Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting
|
2021-05-04 13:19:40 -04:00 |
Isaac Connor
|
24d9bfa257
|
Add a test for invalid characters in Path for Ffmpeg monitors
|
2021-05-04 10:45:27 -04:00 |
Isaac Connor
|
b10b2932ee
|
Code spacing and doc
|
2021-05-03 15:20:11 -04:00 |
Isaac Connor
|
d92c95a420
|
if analysis frame doesn't exist revert back to capt
|
2021-05-03 15:18:35 -04:00 |
Isaac Connor
|
44e8107cac
|
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
|
2021-05-02 13:38:06 -04:00 |
Isaac Connor
|
b70cd053d6
|
spacing and quotes
|
2021-05-02 12:43:17 -04:00 |
Isaac Connor
|
b84efac0e5
|
left align Server head
|
2021-04-28 19:00:15 -04:00 |
Isaac Connor
|
f754b82f3b
|
When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error
|
2021-04-28 12:03:44 -04:00 |
Isaac Connor
|
953882a6da
|
Dirty hack to fix up/down arrows on pagination number input
|
2021-04-27 16:31:25 -04:00 |
Isaac Connor
|
0213c67236
|
add MinSectionLength
|
2021-04-27 15:25:09 -04:00 |
Isaac Connor
|
7901950c48
|
spacing
|
2021-04-26 09:40:08 -04:00 |
Isaac Connor
|
4385076e66
|
Fix encrypting password when saving User
|
2021-04-26 09:40:08 -04:00 |
Isaac Connor
|
02a1ecee6f
|
Remove dbeug
|
2021-04-26 09:40:08 -04:00 |
Peter Keresztes Schmidt
|
1dbfa0790a
|
web: fix eslint errors
|
2021-04-24 01:42:13 +02:00 |
Isaac Connor
|
9254c99ab8
|
Add ModectDuringPTZ
|
2021-04-23 14:52:29 -04:00 |
Isaac Connor
|
f4837d72ee
|
add text for ModectDuringPTZ
|
2021-04-23 14:52:29 -04:00 |
Isaac Connor
|
f59904ea7e
|
Add ModectDuringPTS checkbox on Control tab
|
2021-04-23 14:52:29 -04:00 |
Isaac Connor
|
4d9fb5b225
|
Don't show live thumbnail if we do not have Stream permission. Do not show groups if not view permission. Do not make them links to montage if no stream permission
|
2021-04-23 09:51:38 -04:00 |
Isaac Connor
|
37e0f010e3
|
Require session to be instantiated
|
2021-04-23 09:08:48 -04:00 |
Isaac Connor
|
15a769bcd1
|
add hashing of passwords on user save
|
2021-04-23 09:07:50 -04:00 |
Isaac Connor
|
e01533af7f
|
Add users to routes
|
2021-04-23 08:52:55 -04:00 |
Isaac Connor
|
d07d85dd6c
|
Clean User add to match behaviour of Monitors. For some reason posting to index doesn't call add unlike Monitors. Clean out duplicated Views
|
2021-04-22 12:25:13 -04:00 |
Isaac Connor
|
354a3d9f09
|
Add on-mouseup and on-mousedown processing
|
2021-04-21 12:20:06 -04:00 |
Isaac Connor
|
79cede7cac
|
Merge branch 'release-1.34'
|
2021-04-20 09:24:49 -04:00 |
Isaac Connor
|
c0eb790e45
|
Fix colour shift in Crop function due to not multiplying x position by colours
|
2021-04-19 17:29:31 -04:00 |
Isaac Connor
|
70313ce152
|
Revert "Add on-mouseup and on-mousedown processing"
This reverts commit e0c0598e13 .
|
2021-04-19 17:15:35 -04:00 |
Isaac Connor
|
ffb2d937e1
|
Revert "Use on-mousedown and on-mouseup if doing continuous"
This reverts commit d7fa28142f .
|
2021-04-19 17:15:20 -04:00 |
Isaac Connor
|
aaa1309377
|
Use > instead of >= to fix duplicated log entries display
|
2021-04-19 17:14:51 -04:00 |
Isaac Connor
|
80835614d5
|
Define timeout
|
2021-04-19 15:49:06 -04:00 |
Isaac Connor
|
1a5d87b3b8
|
Add GetCurrentLocation
|
2021-04-19 15:45:55 -04:00 |
Isaac Connor
|
506e5f84c9
|
Remove getCurrentLocation label that says Longitude
|
2021-04-19 15:45:18 -04:00 |
Isaac Connor
|
df26c25ac9
|
Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus
|
2021-04-17 16:32:06 -04:00 |
Isaac Connor
|
d598edc7df
|
Implement duplicate RTSPSTreamName check
|
2021-04-17 12:50:26 -04:00 |
root
|
23f1b68e8a
|
Merge branch 'continuous' into cont_mast
|
2021-04-16 11:28:10 -04:00 |
root
|
f3ea08c4a1
|
Merge branch 'continuous' into cont_mast
|
2021-04-16 11:27:48 -04:00 |
Isaac Connor
|
3d1b0e2724
|
Apply onmouseup/down to other ptz buttons
|
2021-04-16 11:27:08 -04:00 |
Isaac Connor
|
c880618d5f
|
If no button is associated with the event, assume it is a mouseup
|
2021-04-16 10:24:48 -04:00 |