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 |
Isaac Connor
|
e6edf5b7db
|
Merge pull request #3410 from jp-bennett/master
Adds janus_enable_audio, a switch to try to enable audio in live stre…
|
2022-01-19 09:32:22 -05:00 |
Jonathan Bennett
|
04cfe372f8
|
Wrap public access function in Gsoap ifdef to remove build warning
|
2022-01-19 00:56:36 -06: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
|
d00aaa11e9
|
default JanusEnabled to 0 so that we can turn it off
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
388735e942
|
Fix relating auth_hash causing repeated reloads. If https, then assume a reverse proxy setup to janus. If video feed is not an img, log it and return
|
2022-01-18 23:02:26 -05: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
|
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
|
ec1f0d87af
|
fix HEAD left behind
|
2022-01-18 20:20:38 -05:00 |
|
Isaac Connor
|
3835087c9d
|
Merge branch 'master' into multistream
|
2022-01-18 20:16:08 -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 |
|
Isaac Connor
|
0e91825d5a
|
Fix merge
|
2022-01-13 22:14:54 -05:00 |
|
Isaac Connor
|
27abe85036
|
replace active with analysing, capturing, recording
|
2022-01-13 22:14:44 -05:00 |
|
Isaac Connor
|
a414506a5e
|
Preface Debug with ZM
|
2022-01-13 22:14:14 -05:00 |
|
Jonathan Bennett
|
212d51f933
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-13 12:16:16 -06:00 |
|
Isaac Connor
|
3504b13e2a
|
Merge branch 'master' into multistream
|
2022-01-13 12:29:34 -05: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
|
13e2f5e03b
|
remove Enabled from sql
|
2022-01-13 11:05:14 -05:00 |
|
Isaac Connor
|
3cc1b74b4e
|
Merge branch 'master' into multistream
|
2022-01-13 10:21:58 -05:00 |
|
Isaac Connor
|
162e12bf92
|
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 10:21:32 -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 |