5233c402d3
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
2023-08-02 18:07:28 -04:00
a4c14eb890
Don't crash when not able to connect to monitor
2023-08-02 15:11:13 -04:00
c510745317
Allow specifying width and height so that we can scale to alower res
2023-08-02 13:56:06 -04:00
f39b3f0583
Reduce debug levels. Pass along Width and Height when instantiating Image from AVFrame so that it can scale to a lower res.
2023-08-02 13:56:06 -04:00
4f08ad59cc
Remove redundant debugging of video frames including treating one as audio
2023-08-02 13:56:06 -04:00
672ba114f4
Fix reversed defaults for RTSP2Web options
2023-08-02 13:48:15 -04:00
e86610c38c
Bump version for RTSP2Web DB updates
2023-08-02 13:41:57 -04:00
206be0ea96
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-02 13:36:33 -04:00
b48702c96c
Fix lack of ZM on Warning
2023-08-02 13:36:26 -04:00
1628c4fa6b
Handle term->val not being defined, and fix the code to strip quotes from the value.
2023-08-02 13:28:44 -04:00
f1b3bc08c1
Use opendir instead of glob when copying files. For performance reasons.
2023-08-02 13:27:45 -04:00
54000bc204
Reduce redundant debugging
2023-08-02 13:05:57 -04:00
80c145dca4
Add support for HTTPS connections to RTSP2Web
2023-07-31 00:16:51 -05:00
af42398070
Fix ESLint issues in RTSP2Web work
2023-07-30 16:54:22 -05:00
d7e419726b
Update .eslintignore -- add hls.js
2023-07-30 15:55:07 -05:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
9295c390ca
re-parse Options into opts so that they are available to open_codec
2023-07-28 17:39:08 -04:00
d56beead81
Remove duplicated and old styles from dark montage that are in base. Removes width 99% from montage content which is no longer needed
2023-07-28 14:03:20 -04:00
20bbd9f3a6
If controls are on but not permitted the controls will not be defined
2023-07-28 12:56:51 -04:00
bd71b35403
Handle RateControl being undef
2023-07-27 11:47:02 -04:00
3301d3042b
Only show map if the event has lat&long
2023-07-27 10:30:37 -04:00
7a35b337d2
add another Hikvision
2023-07-25 20:02:52 -04:00
a570bac807
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 18:14:37 -04:00
5ab303526c
Add some more HIkvision
2023-07-25 18:14:25 -04:00
4b20109b69
Use the same open semantics regardless of blocking or non so that we always have an fd to lock. Fixes logging of unable to lock jpeg in streaming with buffering
2023-07-25 16:35:28 -04:00
03155da5b6
Use the full integer value instead of the first char of mi. Fixes failure to get status on janus viewing pages
2023-07-25 15:18:35 -04:00
b3fb68b293
Fix test for undef
2023-07-25 13:24:57 -04:00
c54a20ba70
Fix spacing, tag debug with ONVIF
2023-07-25 13:24:37 -04:00
30c8052e60
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 12:32:40 -04:00
bd3aac1cf6
Fixup curl() and Axis probing
2023-07-25 12:32:35 -04:00
bb625ab237
nonce can contain =, so parse that properly. Use a betr nonce.
2023-07-25 12:32:13 -04:00
4c697818eb
Merge pull request #3734 from sletteland/onvif_events
...
Onvif events
2023-07-25 12:27:47 -04:00
5a497a7d25
Add JANUS to logs relating to JANUS to ease debugging
2023-07-24 17:45:36 -04:00
b360e092d4
Add AMCREST to logs relating to Amcrest ONVIF support to ease debugging
2023-07-24 17:45:36 -04:00
ca25f70fee
Merge pull request #3747 from Simpler1/patch-5
...
Event table data should be aligned with column headers
2023-07-24 15:17:33 -04:00
a6c403a4ac
Refresh table on show
...
After opening an event from the events table and editing some properties, returning back to the events table would show the cached version of the table without the new values.
This change will refresh the events table each time it's shown.
It is a bit of a performance hit, but it's more important to show accurate information after a quick delay than to show bad/inaccurate information fast.
2023-07-24 15:13:53 -04:00
8c49d911a0
Event table data should be aligned with column headers
...
This is more noticeable when some columns of the events table are toggled off, but the column headers were centered and the data in columns were left justified. This made it difficult to read which column went to which data.
This change centers both the column headers and the data in the columns so that they line up.
2023-07-24 15:01:12 -04:00
0134f8e447
Change detect_realm to return empty string instead o f undef. Just so that realm is always a string and not undefined. Fix integer comparison on strings and make detect_realm succeed as long as response isn't 401.
2023-07-24 12:42:20 -04:00
8c754fb97d
Merge branch 'ZoneMinder:master' into onvif_events
2023-07-24 13:53:07 +02:00
add08aeb56
Add 5MP resolution
2023-07-21 14:30:10 -07:00
2fb0b4476b
add mac to probe results
2023-07-21 14:26:56 -07:00
c0b5bbf8cc
Rough in Hanwha support. Fix results getting overwritten
2023-07-21 14:26:39 -07:00
185f8a8d5f
Add another Zmcreest mac
2023-07-21 14:25:57 -07:00
701c1fc0b6
Merge pull request #3745 from Simpler1/patch-1
...
fix(event): Honor the Alt key with left/right arrow
2023-07-21 15:28:09 -04:00
01257d2ca1
Output debug the pixformat of the shm image
2023-07-21 15:09:51 -04:00
2e4db107a6
When doing detection on y-channel, use y-image when creating analsysis image, and scale the y-channel image to what is expected for monitor dimensions when dimensions don't match capture.
2023-07-21 15:09:32 -04:00
b8c43c42d1
Change camera_width and height to signed... just so we don't have to cast when comparing to avframe->width and height
2023-07-21 15:08:35 -04:00
c949b9e2d6
fix(event): Honor the Alt key with left/right arrow
...
Fixes a race condition when using Alt-LeftArrow to go back to the previous page (standard browser behavior).
Sometimes it would go the previous event and sometimes it would go to the previous page. Now it will consistently go to the previous page when the alt key is pressed with the left arrow.
2023-07-21 15:07:22 -04:00
a62b32f2e4
Include fifo name in debug
2023-07-21 14:10:46 -04:00
328f454248
Define and allocate, and assign image_pixelformats in shmem
2023-07-21 14:08:25 -04:00
Isaac Connor
Jonathan Bennett
Isaac Connor
Simpler1
sletteland