Isaac Connor
9e41dbbb47
When not decoding, still mark the packet as decoded so that recording will work.
2024-06-23 10:45:14 -04:00
Isaac Connor
65da80d6ae
remove extra space
2024-06-21 15:49:53 -04:00
Isaac Connor
49fdf79a50
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-21 14:04:27 -04:00
Isaac Connor
9ae87d26bd
Reset last_capture_image_count in connect so that we don't get negative fps reports and possible floating point exceptions
2024-06-21 14:04:19 -04:00
Isaac Connor
eea0e8fe64
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2024-06-20 20:58:33 -04:00
Isaac Connor
d8e15f19c2
Add options for h264_v4l2m2m encoder
2024-06-20 20:58:21 -04:00
Isaac Connor
7d99f1e033
Do not null packet->out_frame, it might be in use. The packet manages the frame
2024-06-20 16:43:40 -04:00
Isaac Connor
c56d23a5a7
Always turn off db logging in zmDbDo. If db logging is set to debug, we will infinitely recurse.
2024-06-20 09:08:51 -04:00
Isaac Connor
420aa9a525
fix eslint
2024-06-19 09:39:01 -04:00
Isaac Connor
48dc523eee
Merge pull request #4068 from IgorA100/patch-141
...
Changed the flip panel control "data-flip-control-object" (skin.js)
2024-06-19 09:21:53 -04:00
Isaac Connor
ba833006ef
Merge pull request #4082 from IgorA100/patch-151
...
Fix: If "opts.focal" - calculate coordinates taking into account the planned Scale, and not just the calculated Scale (jquery.panzoom.js)
2024-06-19 09:21:02 -04:00
Isaac Connor
9a87e2976f
Fix js error when clicking play/pause when using video.js as viewer
2024-06-17 14:51:02 -04:00
Isaac Connor
402faeb9c5
Mark audio packets as decoded
2024-06-17 13:55:35 -04:00
Isaac Connor
acbc9948d4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-17 13:40:24 -04:00
Isaac Connor
c24f61e641
Wait for decoded flag so that we stay behind the decoder
2024-06-17 13:40:17 -04:00
IgorA100
54d363bf85
Fix: If "opts.focal" - calculate coordinates taking into account the planned Scale, and not just the calculated Scale (jquery.panzoom.js)
...
I created a PR in the author's repository, but there is no feedback yet.
https://github.com/timmywil/panzoom/pull/669
2024-06-17 11:16:11 +03:00
Isaac Connor
70c5d871d3
Merge pull request #4080 from IgorA100/patch-150
...
More compact display of Event information Event page
2024-06-15 20:00:12 -04:00
IgorA100
ae36a1f502
More compact display of Frame information (event.js.php)
2024-06-15 23:47:29 +03:00
IgorA100
1e34f5aee6
More compact display of Frame information (event.js)
2024-06-15 23:44:53 +03:00
Isaac Connor
081c3900a1
Merge pull request #4079 from IgorA100/patch-149
...
TotScore, AvgScore, MaxScore display in one line Event page
2024-06-15 14:15:26 -04:00
Isaac Connor
a5aef97464
Floor the scaling value % 5
2024-06-15 13:34:02 -04:00
Isaac Connor
ecc947a71d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-15 13:30:12 -04:00
Isaac Connor
b36d67c002
Set a cookie for speed value so that it persists over reloads
2024-06-15 13:30:04 -04:00
Isaac Connor
742f36c58c
Redo the event thread. Instead of analysis adding packets to an event specific queue, just pass in the iterator and let the event thread do it's own locking. This allows us to free ram in packet in the event, and not segfault.
2024-06-14 18:34:33 -04:00
Isaac Connor
13efaf4f83
Allow prev_dts==dts because it is really common and zm_videostore will correct it.
2024-06-14 18:34:33 -04:00
Isaac Connor
61c3943331
use RIAA style
2024-06-14 18:34:33 -04:00
IgorA100
12b84255ee
From "eventDataStrings" instead of "MaxScore" process "Score" (event.js)
2024-06-15 00:50:37 +03:00
Isaac Connor
04c743d888
Merge pull request #4072 from IgorA100/patch-144
...
Added the ability to initialize with parameters (PanZoom)
2024-06-14 17:46:26 -04:00
IgorA100
0587cdc7a9
Update event.js.php
2024-06-15 00:41:21 +03:00
Isaac Connor
efeba87bf4
Merge pull request #4078 from IgorA100/patch-148
...
Fix: Added getStat execution error handling Frame page
2024-06-14 17:33:34 -04:00
IgorA100
c57af2c8ca
Fix: Added getStat execution error handling (frame.js)
2024-06-15 00:28:53 +03:00
IgorA100
b1a35c339e
Chore: Fix extra space & lost semicolon (skin.js)
2024-06-14 19:35:45 +03:00
IgorA100
730c3b5161
Changing the icon control for the hide/show panel button (skin.js)
...
+ Part of the code for controlling the icon of the button to hide/show the panel has been moved to the "changeButtonIcon" function
+ Added support for the "data-initial-state-icon" attribute to make it possible not to use cookies when initially opening a page.
2024-06-14 19:29:17 +03:00
IgorA100
576dc6a652
Merge branch 'ZoneMinder:master' into patch-141
2024-06-14 19:23:35 +03:00
IgorA100
038b3b2886
Chore: eslint (watch.js)
2024-06-14 15:49:13 +03:00
IgorA100
d9b9dfc77f
Chore: eslint (panzoom.js)
2024-06-14 15:47:02 +03:00
IgorA100
5c3f244a9a
Added initialization of the experimental PanZoom function for reducing a block containing an image (Shift+Alt+mouse wheel) (watch.js)
2024-06-14 15:39:42 +03:00
IgorA100
7fadd6444b
Merge branch 'ZoneMinder:master' into patch-144
2024-06-14 15:33:40 +03:00
IgorA100
845049c951
When initializing, specify any PanZoom & more parameters (panzoom.js)
...
+ During initialization, you can specify any parameters that will later be transferred directly to "Panzoom"
+ Added an experimental function for reducing the block containing the image (Shift+Alt+mouse wheel).
To do this, you need to initialize another object. For example like this:
"zmPanZoom.init({objString: '.imageFeed', disablePan: true, contain: 'inside', additional: true});"
The key parameter for additional control (Alt key) is "additional: true"
+ Code optimization
2024-06-14 15:31:19 +03:00
Isaac Connor
cb3b29dd8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-13 09:28:38 -04:00
Isaac Connor
b0081d93d6
Make code a little more robust when expected attributes are not found. Mitigates #4076
2024-06-13 09:28:25 -04:00
Isaac Connor
db80135997
Merge pull request #4075 from IgorA100/patch-147
...
Fix: PTZ control error on Watch page
2024-06-11 17:15:27 -04:00
IgorA100
fe9cc6d2a7
Don't change skin.js now, it will cause problems in other places
...
Additional research is required in a quiet environment.
2024-06-12 00:14:44 +03:00
IgorA100
a4443bb0a7
Update watch.js
2024-06-11 23:17:01 +03:00
IgorA100
073bbfc316
dataOnClick is called with a delay, because DOM change occurs (watch.js)
2024-06-11 23:06:59 +03:00
IgorA100
02a66983a5
Merge branch 'master' into patch-147
2024-06-11 22:58:32 +03:00
IgorA100
6308ceaf0c
Update watch.js
2024-06-11 22:48:02 +03:00
IgorA100
e874fd9c1f
Chore: code optimization (watch.js)
2024-06-11 22:33:20 +03:00
IgorA100
5e3bfbb392
Call dataOnClick() when switching to new next camera (watch.js)
...
Necessary because we change the DOM
2024-06-11 21:54:01 +03:00
IgorA100
add8eb4be3
Temporarily added dataOnClick() when initializing the page (watch.js)
2024-06-11 21:18:47 +03:00
Isaac Connor