Jonathan Bennett
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
Isaac Connor
9295c390ca
re-parse Options into opts so that they are available to open_codec
2023-07-28 17:39:08 -04:00
Isaac Connor
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
Isaac Connor
20bbd9f3a6
If controls are on but not permitted the controls will not be defined
2023-07-28 12:56:51 -04:00
Isaac Connor
bd71b35403
Handle RateControl being undef
2023-07-27 11:47:02 -04:00
Isaac Connor
3301d3042b
Only show map if the event has lat&long
2023-07-27 10:30:37 -04:00
Isaac Connor
7a35b337d2
add another Hikvision
2023-07-25 20:02:52 -04:00
Isaac Connor
a570bac807
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 18:14:37 -04:00
Isaac Connor
5ab303526c
Add some more HIkvision
2023-07-25 18:14:25 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
b3fb68b293
Fix test for undef
2023-07-25 13:24:57 -04:00
Isaac Connor
c54a20ba70
Fix spacing, tag debug with ONVIF
2023-07-25 13:24:37 -04:00
Isaac Connor
30c8052e60
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 12:32:40 -04:00
Isaac Connor
bd3aac1cf6
Fixup curl() and Axis probing
2023-07-25 12:32:35 -04:00
Isaac Connor
bb625ab237
nonce can contain =, so parse that properly. Use a betr nonce.
2023-07-25 12:32:13 -04:00
Isaac Connor
4c697818eb
Merge pull request #3734 from sletteland/onvif_events
...
Onvif events
2023-07-25 12:27:47 -04:00
Isaac Connor
5a497a7d25
Add JANUS to logs relating to JANUS to ease debugging
2023-07-24 17:45:36 -04:00
Isaac Connor
b360e092d4
Add AMCREST to logs relating to Amcrest ONVIF support to ease debugging
2023-07-24 17:45:36 -04:00
Isaac Connor
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
Simpler1
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
Isaac Connor
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
sletteland
8c754fb97d
Merge branch 'ZoneMinder:master' into onvif_events
2023-07-24 13:53:07 +02:00
Isaac Connor
add08aeb56
Add 5MP resolution
2023-07-21 14:30:10 -07:00
Isaac Connor
2fb0b4476b
add mac to probe results
2023-07-21 14:26:56 -07:00
Isaac Connor
c0b5bbf8cc
Rough in Hanwha support. Fix results getting overwritten
2023-07-21 14:26:39 -07:00
Isaac Connor
185f8a8d5f
Add another Zmcreest mac
2023-07-21 14:25:57 -07:00
Isaac Connor
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
Isaac Connor
01257d2ca1
Output debug the pixformat of the shm image
2023-07-21 15:09:51 -04:00
Isaac Connor
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
Isaac Connor
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
Simpler1
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
Isaac Connor
a62b32f2e4
Include fifo name in debug
2023-07-21 14:10:46 -04:00
Isaac Connor
328f454248
Define and allocate, and assign image_pixelformats in shmem
2023-07-21 14:08:25 -04:00
Isaac Connor
05beec58e7
Merge pull request #3744 from Simpler1/master
...
chore(): Update .gitignore to remove node_modules
2023-07-21 13:48:01 -04:00
Isaac Connor
5fd544b1b0
Merge pull request #3743 from Simpler1/master
...
fix(cookies): Use max-age instead of expires
2023-07-21 13:34:34 -04:00
Simpler1
5e90f05c7c
chore(): Update .gitignore to remove node_modules
2023-07-21 13:34:31 -04:00
Simpler1
10f7e4320f
fix(cookies): Use max-age instead of expires
2023-07-21 13:27:44 -04:00
Isaac Connor
164e1f6730
Merge pull request #3742 from Simpler1/master
...
Set default cookie time to Jan 2038
2023-07-21 11:48:39 -04:00
Simpler1
ef68943b7c
chore(): Set default cookie time to Jan 2038
2023-07-21 11:07:11 -04:00
Isaac Connor
6cb4f0a4f6
Fix logic on filtering monitorNames
2023-07-20 16:44:23 -04:00
Isaac Connor
75322142a4
Remove deprecated MonitorsIds. Replace it's use with looking for edit permission per monitor
2023-07-19 12:39:32 -04:00
Isaac Connor
33d9a974d5
white space
2023-07-19 12:38:32 -04:00
Isaac Connor
f4d3b979f4
Implement automatic setting of redorder_queue_size in videostore by implementing has_out_of_order_packets and get_max_keyframe_interval in the monitor object.
2023-07-19 12:38:11 -04:00
Isaac Connor
cb7d954a87
Fix warning when creating new user
2023-07-17 17:29:16 -04:00
Isaac Connor
6dbdd2120d
Cleanup mid before use. Mostly to quiet snyk
2023-07-17 17:02:32 -04:00
Isaac Connor
ef29805a4d
Test for word auto in decodername and don't do lookup for it
2023-07-17 17:01:39 -04:00
Isaac Connor
f46ef094dc
Merge envserv:sandbox/ZoneMinder
2023-07-17 15:37:12 -04:00
IPC
65d37e7a36
Rough in a Grandstream detector
2023-07-17 14:36:28 -05:00
Isaac Connor
6426ea882a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-17 13:46:59 -04:00
