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
|
d2d9721c4e
|
spacing, remove redundant debug
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
3241fa59c5
|
Don't redirect if there was an error so that we display it
|
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 |
|
Isaac Connor
|
90492d332c
|
Put back to brand 3.0 of upstream
|
2022-01-18 10:39:24 -05:00 |
|
Isaac Connor
|
24c2efeb00
|
fix eslint
|
2022-01-17 16:19:27 -05:00 |
Isaac Connor
|
eab29babea
|
Merge pull request #3409 from jp-bennett/master
Refactor Montage view js -- Janus in MonitorStream
|
2022-01-17 15:14:43 -05:00 |
|
Isaac Connor
|
32a5dcbda9
|
ignore janus for eslint
|
2022-01-17 14:52:43 -05:00 |
|
Isaac Connor
|
4374a6e70e
|
Bump versions of eslint to latest
|
2022-01-17 14:35:59 -05:00 |
|
Isaac Connor
|
08b3277aa8
|
bump version for janus
|
2022-01-17 14:09:27 -05:00 |
Jonathan Bennett
|
5026008482
|
Changes due to janus packaging
|
2022-01-16 19:55:53 -06:00 |
|
Jonathan Bennett
|
688f505f28
|
Adds better error handling, changes expected location of janus.js
|
2022-01-16 19:44:52 -06:00 |
|
Jonathan Bennett
|
f27f7e9d27
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-16 12:25:58 -06:00 |
|
Isaac Connor
|
5f17cb6e9a
|
Debug the size returned as compared to the file size
|
2022-01-15 17:19:35 -05:00 |
|
Isaac Connor
|
1891002c65
|
Remove Freenode from the badges.
|
2022-01-15 17:19:35 -05:00 |
|
Isaac Connor
|
4cd085e085
|
Bump eslint to ECMA2017
|
2022-01-15 17:19:35 -05:00 |
|
Jonathan Bennett
|
59056b4103
|
Refactor Montage view js -- Janus in MonitorStream
|
2022-01-15 01:33:17 -06:00 |
|
Isaac Connor
|
8d757d37a6
|
fix eslint
|
2022-01-14 16:43:59 -05: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
|
da538f7d1d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-14 14:46:00 -05:00 |
|
Isaac Connor
|
a4b0aa442a
|
Introduce event->Duration()
|
2022-01-14 14:35:26 -05: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
|
eb59b4de7f
|
Clear out dead code
|
2022-01-14 14:20:17 -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 |
|
Isaac Connor
|
7c1ba721aa
|
Preface Debug with ZM
|
2022-01-13 22:15:02 -05:00 |
|
Jonathan Bennett
|
212d51f933
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-13 12:16:16 -06:00 |
|
Isaac Connor
|
9b8ca69203
|
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
|
2022-01-13 12:26:47 -05:00 |
|
Isaac Connor
|
274ffd7da0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-13 12:02:14 -05:00 |
|
Isaac Connor
|
44b11389ce
|
Merge pseudo:sandbox/ZoneMinder.connortechnology into event_thread
|
2022-01-13 12:00:17 -05:00 |
|
Isaac Connor
|
58bd09d83d
|
Fix debug output from zmDbDo
|
2022-01-13 09:56:04 -05:00 |
|
Isaac Connor
|
3ec6c7e32f
|
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
|
2022-01-13 09:55:26 -05:00 |
|
Isaac Connor
|
3dad3a5200
|
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
|
2022-01-13 09:55:16 -05:00 |
|
Jonathan Bennett
|
2beffeb1b4
|
Add Janus to Cycle view. Remove debug Alert() messages
|
2022-01-12 22:47:35 -06:00 |
|
Isaac Connor
|
f764cfbc32
|
Fix deadlock on deleting event. Cannot race for the lock, joining will do the job
|
2022-01-12 23:11:19 -05: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 |
|
Isaac Connor
|
e4693c251c
|
add backticks around field names because some like Function are reserved
|
2022-01-12 23:08:29 -05:00 |
|
Isaac Connor
|
8d06175024
|
Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling.
|
2022-01-12 23:07:48 -05:00 |
|
Isaac Connor
|
a9f7b257ea
|
Rough in a queue and a thread into the event to process packets. We do this so that the event creator can get back to analysis as fast as possible so as to avoid the packetqueue filling up.
|
2022-01-12 17:16:49 -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 |
|
Isaac Connor
|
134d80a91d
|
Replace Requires with BindsTo and add comment explaining how to override
|
2022-01-12 11:32:08 -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 |
|
Jonathan Bennett
|
50c824f3bb
|
Janus cleanup, adds support to the "watch" view
|
2022-01-11 21:21:58 -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 |