 Isaac Connor
|
1982c21e1f
|
Merge pull request #3423 from jp-bennett/master
Starts moving elements from zm_monitor.cpp into nested classes and dedicated files.
|
2022-02-03 17:53:31 -05:00 |
|
|
Jonathan Bennett
|
dde3884084
|
Moves Janus and Amcrest into their own nested classes
|
2022-02-03 16:31:07 -06:00 |
|
|
Isaac Connor
|
da4c880233
|
0 out another used of y-image
|
2022-02-03 12:16:01 -05:00 |
|
|
Isaac Connor
|
02a2c783e4
|
Disable alleged y-channel image motion detection. Doesn't work.
|
2022-02-03 11:57:27 -05:00 |
|
|
Isaac Connor
|
67ac0fdffd
|
Disable alleged y-channel image motion detection. Doesn't work.
|
2022-02-03 11:57:00 -05:00 |
|
|
Isaac Connor
|
b05bc211f7
|
Apparently it is actually the Y channel that we want.
|
2022-02-03 10:50:40 -05:00 |
|
|
Isaac Connor
|
7e9c707f92
|
V plane is actually the 3rd array entry, not the 4th
|
2022-02-03 10:06:36 -05:00 |
|
|
Isaac Connor
|
606c47ba87
|
If possible, use the v-channel from the yuv420p image for motion detection instead of the rgba data.
|
2022-02-02 14:33:58 -05:00 |
|
|
Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
|
|
Isaac Connor
|
6b8cc14723
|
Don't free image data if we added the packet to an event. The lock moves to the event so it's not safe
|
2022-01-31 12:07:09 -05:00 |
|
|
Isaac Connor
|
e5792c21c9
|
Push locked packets into event packetqueue instead of unlcoked contents. Prevents freeing of data before writing to event, hence crashing.
|
2022-01-28 15:38:18 -05:00 |
|
|
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
|
Isaac Connor
|
f10d0fd3f5
|
Merge pull request #3413 from jp-bennett/master
Adds janus updates
|
2022-01-23 12:35:42 -05:00 |
|
|
Jonathan Bennett
|
5485c04bc6
|
Rework of the Janus polling loop
|
2022-01-23 01:07:48 -06:00 |
|
|
Jonathan Bennett
|
07c5b23aa6
|
Adds Janus streaming checks to polling thread
|
2022-01-22 12:49:08 -06:00 |
|
|
Isaac Connor
|
9443aaa2d8
|
Do state changes when in RECORD mode as well as it doesn't do motion detection Fixes #3411
|
2022-01-22 13:33:39 -05:00 |
|
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
|
Isaac Connor
|
dec440ead1
|
Unset holdbuffer so that when we connect, we reset the shm buffer pointer. cleanup initializers in Image
|
2022-01-19 15:01:37 -05:00 |
|
|
Isaac Connor
|
ebcb3abf2e
|
image_count is only relevant to capture. decode and analysis should use packet->image_index for indexing into image_buffer, etc.
|
2022-01-19 09:33:33 -05:00 |
|
|
Jonathan Bennett
|
fb832e7d1b
|
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
|
2022-01-19 00:14:52 -06:00 |
|
|
Isaac Connor
|
13ee39b1e9
|
Log errors talking to Janus. Log if janus is turned on but not compiled in
|
2022-01-18 23:02:26 -05:00 |
|
|
Isaac Connor
|
0c055edb5e
|
I think in all my changes I got rid of the code that opens events on Alarm.
|
2022-01-18 12:20:19 -05:00 |
|
|
Jonathan Bennett
|
688f505f28
|
Adds better error handling, changes expected location of janus.js
|
2022-01-16 19:44:52 -06:00 |
|
|
Isaac Connor
|
1ae61afd47
|
Merge pull request #3408 from jp-bennett/janus
Adds Janus h264 streaming
|
2022-01-14 16:34:19 -05:00 |
|
|
Isaac Connor
|
aba387f202
|
Fix !== which should be >=
|
2022-01-14 16:31:52 -05:00 |
|
|
Isaac Connor
|
3296e14264
|
Move RECORD/MOCORD length close code after the state machine. If the state machine has taken action, this code likely won't trigger, but the way it was before it could ignore current state. Plus I think it logically keeps relevant logic closer together. Must use packetqueue.unlock after decoding as analysis might be waiting in the packetqueue. Doing this will do both notifies. Disable de-interlacing for decoding style monitors.
|
2022-01-14 15:19:28 -05:00 |
|
|
Jonathan Bennett
|
9e9bdd183c
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-14 14:05:23 -06:00 |
|
|
Isaac Connor
|
1fe4bbedc0
|
use min_section_length instead of 0 when testing minimumm section length. Use event->Duration instead of snap-event->StartTime because this snap will not be included in the event. This results in events of 29.59 seconds instead of 30 seconds.
|
2022-01-14 14:35:16 -05:00 |
|
|
Isaac Connor
|
8b99b15b41
|
Use a scope to shorten the lock on event_lock
|
2022-01-14 14:17:07 -05:00 |
|
|
Isaac Connor
|
9240a93ef5
|
Revert my idea of having ONVIF and TRIGGER code start/end events. Move code to tst for Ready() up above ONVIF and TRIGGER code. When waiting for decode, junk the idea of locking in the packetqueue. Since waiting releases the lock, we should be ok waiting and notifying in the packet. (I know there was a time when I felt this was necessary and I think it had to do with the deinterlacing case, but I've simplified that code too).
|
2022-01-14 14:09:18 -05:00 |
|
|
Jonathan Bennett
|
212d51f933
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-13 12:16:16 -06:00 |
|
|
Isaac Connor
|
44b11389ce
|
Merge pseudo:sandbox/ZoneMinder.connortechnology into event_thread
|
2022-01-13 12:00:17 -05:00 |
|
|
Jonathan Bennett
|
2beffeb1b4
|
Add Janus to Cycle view. Remove debug Alert() messages
|
2022-01-12 22:47:35 -06:00 |
|
|
Isaac Connor
|
3d04228485
|
rework ::Analyse. The state engine will only go into alarm on actual motion, not on a skipped frame. TRIGGERS and ONVIF events will immediately create events.
|
2022-01-12 23:10:17 -05:00 |
|
|
Jonathan Bennett
|
aeefc512ab
|
Merge branch 'master' into janus
|
2022-01-12 13:04:13 -06:00 |
|
|
Isaac Connor
|
c9db5f44a4
|
cherry pick Add check to prevent tight busy loop if ONVIF setup fails
|
2022-01-12 12:05:33 -05:00 |
|
|
Jonathan Bennett
|
84a73bb007
|
Add check to prevent tight busy loop if ONVIF setup fails
|
2022-01-12 09:37:48 -06:00 |
|
|
Jonathan Bennett
|
7a5a05fe94
|
Clean up warnings
|
2022-01-12 01:29:32 -06:00 |
|
|
Jonathan Bennett
|
cb46b94ea1
|
Add error handling to libcurl calls to Janus
|
2022-01-12 00:19:54 -06:00 |
|
|
Isaac Connor
|
c27b0aff97
|
Move analysis image assignment up to where motion detection is done do remove duplication and simplify logic. Free analysis images as well as captured images after analysis. remove extra copy of image to analysis_image. Replae a packetqueue.unlock with just deleting the locked packet. No one waits for analysis. Re-introduce sleeping in the analysis thread on error to prevent spinning
|
2022-01-11 22:11:28 -05:00 |
|
|
Jonathan Bennett
|
2729e1de22
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-11 10:37:29 -06:00 |
|
|
Isaac Connor
|
90cbf5a018
|
Fix == instead of =
|
2022-01-11 09:06:43 -05:00 |
|
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
|
Isaac Connor
|
b88e699d7e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-10 19:56:04 -05:00 |
|
|
Isaac Connor
|
ec95c8da57
|
Rename the monitor type define from CURL to LIBCURL to fix namespace conflict
|
2022-01-10 15:25:15 -05:00 |
|
|
Isaac Connor
|
947132284d
|
When transitioning from ALERT to IDLE, close the event if CLOSE_MODE is IDLE as well as ALARM.
|
2022-01-10 14:44:52 -05:00 |
|
|
Isaac Connor
|
e9db12ca94
|
Fix importance got cutnpasted to where it shouldn't be
|
2022-01-09 14:46:48 -05:00 |
|
|
Isaac Connor
|
21762585d9
|
rework getting second packet for de-interlace. Pass notesetmap by reference
|
2022-01-09 14:43:23 -05:00 |
|
|
Jonathan Bennett
|
52b377ca86
|
Adds the 'closes_event" ONVIF option, to handle motionDetection message quirks.
|
2022-01-08 14:05:57 -06:00 |
|
|
Jonathan Bennett
|
a3c298ca93
|
Add nullptr checks to prevent a crash when in NODECT mode
|
2022-01-08 13:17:04 -06:00 |
|