Isaac Connor
|
e5db510798
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-04-22 13:07:59 -04:00 |
|
Isaac Connor
|
1997a1b6d9
|
Fix reversed logic preventing warning about no video saving
|
2022-04-22 13:07:40 -04:00 |
|
Isaac Connor
|
348441ac46
|
Deprecate scale == auto
|
2022-04-22 13:07:11 -04:00 |
|
Isaac Connor
|
0d176b133a
|
Stop and restart statusCmdReq around rescaling img stream. Deprecate auto as a value for scale. Make another attempt as sanely applying scale
|
2022-04-22 12:34:49 -04:00 |
|
Isaac Connor
|
889cb7df18
|
Add workaround for old string values of scale
|
2022-04-22 12:33:36 -04:00 |
|
Isaac Connor
|
ccfbed6735
|
remove setting time base I don't know which version of ffmpe supports this, but not mine so it isn't solving the problem I thought it was
|
2022-04-21 17:00:10 -04:00 |
|
Isaac Connor
|
1fbd730968
|
Include libavdevice-dev
|
2022-04-21 10:47:57 -04:00 |
|
Isaac Connor
|
1a6f651424
|
time_base requires newer ffmpeg
|
2022-04-21 10:36:28 -04:00 |
|
Isaac Connor
|
dd86be0811
|
Add libavdevice-dev
|
2022-04-21 10:32:51 -04:00 |
|
Isaac Connor
|
c370b2b028
|
Have to specify libavdevice58
|
2022-04-21 10:31:07 -04:00 |
|
Isaac Connor
|
66b4902fd1
|
Clean up default layout code to match 1.36.15
|
2022-04-21 09:28:37 -04:00 |
|
Isaac Connor
|
be0037a17a
|
Revert scale=auto to be scale='0'
|
2022-04-21 09:26:23 -04:00 |
|
Isaac Connor
|
a05488b758
|
Put auto back to '0' because it needs to be for saving monitors
|
2022-04-21 09:25:46 -04:00 |
|
Isaac Connor
|
0eb358aecf
|
Make video tag for janus 100% width so that it scales likes img does
|
2022-04-21 09:24:03 -04:00 |
|
Isaac Connor
|
768941b020
|
Make video tags 100% as well as img so that janus scales
|
2022-04-20 18:48:19 -04:00 |
|
Isaac Connor
|
8170ce2b8d
|
Check error instead of textStatus for Unauthorized. Set streamCmdParams.auth when auth_hash changes. Fixes auth timing out in ajax
|
2022-04-20 18:47:57 -04:00 |
|
Isaac Connor
|
8ed50ea435
|
pkt_duration isn't use for decoding so don't bother setting it. Set the time base for the frame. Reduce content in debug logging.
|
2022-04-20 18:47:09 -04:00 |
|
Isaac Connor
|
c2dcaab744
|
fix eslint
|
2022-04-20 10:00:47 -04:00 |
|
Isaac Connor
|
e7dcfa6166
|
Put back code that calculates how long it takes to send a frame, but make it just a debug instead of a warning when we are too slow
|
2022-04-20 09:58:37 -04:00 |
|
Isaac Connor
|
fc9b2913f1
|
Put back libavdevice requirement
|
2022-04-20 09:45:54 -04:00 |
|
Isaac Connor
|
41cbc1afed
|
Must define CMD_QUIT
|
2022-04-20 09:39:12 -04:00 |
|
Isaac Connor
|
a047cedd47
|
Initialize Poll_Trigger_State(false),
+ Event_Poller_Healthy(false),
|
2022-04-20 09:10:46 -04:00 |
|
Isaac Connor
|
0501f464c5
|
Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari
|
2022-04-19 19:30:27 -04:00 |
|
Isaac Connor
|
1561ad140a
|
Merge branch 'master' into fix_viewing
|
2022-04-19 17:09:02 -04:00 |
|
Isaac Connor
|
ff46f78ab4
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-04-19 17:08:19 -04:00 |
|
Isaac Connor
|
5672b2c195
|
Try out options to improve latency
|
2022-04-19 17:08:16 -04:00 |
|
Isaac Connor
|
91a5642edc
|
merge
|
2022-04-19 17:07:20 -04:00 |
|
Isaac Connor
|
b519e3b388
|
spacing, default to fixed when appropriate, include state html if not website
|
2022-04-19 17:06:34 -04:00 |
|
Isaac Connor
|
3885d853f9
|
Don't need to use a random start on watch
|
2022-04-19 17:05:41 -04:00 |
|
Isaac Connor
|
aedfca22d6
|
reorg code a bit. Implement setting width & height in REQUEST
|
2022-04-19 16:59:11 -04:00 |
|
Isaac Connor
|
4393d2b9de
|
Add CMD_STOP, convert to consts
|
2022-04-19 16:58:33 -04:00 |
|
Isaac Connor
|
61bdcc53ab
|
add debugging and put back code in setLayout to call setScale. Add onclick to navbar elements to stop streaming when clicked.
|
2022-04-19 16:58:17 -04:00 |
|
Isaac Connor
|
4785954140
|
Add comments to scaleToFit
|
2022-04-19 16:57:30 -04:00 |
|
Isaac Connor
|
c171c47d58
|
Don't remove fixed
|
2022-04-19 16:56:40 -04:00 |
|
Isaac Connor
|
21716e994b
|
Keep better track of timers. Add img_onerror to report when image breaks. setScale is a mess. Add some more code to guess image scale. Browser can't handle 4k jpeg streams. scaling is a must.
|
2022-04-19 16:56:21 -04:00 |
|
Isaac Connor
|
1eaeccc564
|
Handle zones not being set in options
|
2022-04-19 12:31:43 -04:00 |
|
Isaac Connor
|
4154731f13
|
test for ctx->sw_pix_fmt being AV_PIX_FMT_NONE before trying to do do hwdevice transfer
|
2022-04-18 18:06:05 -04:00 |
|
Isaac Connor
|
f8366864b5
|
Remove dead code
|
2022-04-18 18:05:32 -04:00 |
|
Isaac Connor
|
29cea83a4a
|
Log the device that the error is happening for
|
2022-04-18 18:05:13 -04:00 |
|
Isaac Connor
|
510983c2e4
|
Add support for v4l2 input types in ffmpeg_camera.
|
2022-04-18 18:04:46 -04:00 |
|
Isaac Connor
|
bd501b38ca
|
Include libavdevice so that we can use v4l2 inputs in ffmpeg monitor type.
|
2022-04-18 18:04:25 -04:00 |
|
Isaac Connor
|
fe6663fa39
|
Fix skipping based on Function instead of Capturing.
|
2022-04-18 18:03:50 -04:00 |
|
Isaac Connor
|
53805079b6
|
If no device specified, look in /dev/ for video devices and specify them to zmu. Fix use of undefined host var
|
2022-04-18 15:56:14 -04:00 |
|
Isaac Connor
|
57fdbda7ec
|
add mMaskedPath and mMaskedSecondPath and use them when logging so that usernames and passwords are shown in logs. Fixes #3118
|
2022-04-18 13:33:58 -04:00 |
|
Isaac Connor
|
c3d7c306fc
|
Add tests for mask_authentication
|
2022-04-18 13:33:22 -04:00 |
|
Isaac Connor
|
8674b32a15
|
Introduce mask_authentication function to replace username and password with * in url like strings
|
2022-04-18 13:33:10 -04:00 |
|
Isaac Connor
|
01ab1c2535
|
Fix errors when sorting by EndDateTime.
|
2022-04-13 17:18:59 -04:00 |
|
Isaac Connor
|
5de88b8f9e
|
zmwatch.pl can work if Decoding == Keyframes Only
|
2022-04-13 16:35:17 -04:00 |
|
Isaac Connor
|
2ff16e002b
|
fix eslint
|
2022-04-12 14:04:35 -04:00 |
|
Isaac Connor
|
6548983f39
|
Make JANUS options full width and left-align things
|
2022-04-12 14:01:48 -04:00 |