Isaac Connor
|
10383d775a
|
Fix on-change-this to data-on-change-this and remove an extra /tr
|
2022-04-06 14:58:42 -04:00 |
Isaac Connor
|
717dfff0c4
|
Merge pull request #3456 from exuvo/master
ffmpeg change
|
2022-04-03 14:59:35 -04:00 |
|
Isaac Connor
|
40014588d4
|
Put the monitor Id first instead of stuck on the end of the Name
|
2022-03-29 17:16:25 -04:00 |
|
Isaac Connor
|
5618d242f9
|
Change from DecodingEnabled to Decoding, and move to Source tab
|
2022-03-28 17:57:16 -04:00 |
|
Isaac Connor
|
b67185fe9c
|
Fix alignment on Capture Method
|
2022-03-20 19:13:46 -04:00 |
Exuvo
|
7924fa6326
|
Add webm as allowed output format
|
2022-03-11 21:46:09 +01:00 |
|
Exuvo
|
9fd0a94c9f
|
Add support for vp9 and av1 encoding
|
2022-03-11 13:37:27 +01:00 |
|
Isaac Connor
|
c395d46cc8
|
Split options into Capturing, Analysing, Recording tabs
|
2022-03-10 13:54:38 -05:00 |
|
Isaac Connor
|
1d15de0534
|
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
|
2022-02-27 14:03:48 -05:00 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -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
|
3835087c9d
|
Merge branch 'master' into multistream
|
2022-01-18 20:16:08 -05:00 |
|
Isaac Connor
|
2a83e26fb2
|
Move Recording to General tab. Improve help links
|
2022-01-11 10:46:08 -05:00 |
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |
|
Isaac Connor
|
46b95e28ec
|
Fix commas
|
2021-12-28 13:51:36 -05:00 |
|
Isaac Connor
|
87962a3723
|
Invert Importance so that Normal is the auto-selected first value
|
2021-12-28 13:48:37 -05:00 |
|
Isaac Connor
|
21218491f7
|
Add EventStartCommand and EventEndCommand to monitors ui
|
2021-11-26 19:22:07 -05:00 |
|
Isaac Connor
|
46a835b28a
|
fix error when no monitors defined and we are adding one.Fixes #3385
|
2021-11-22 14:26:48 -05:00 |
|
Isaac Connor
|
caeaf91cad
|
Only list available ids if there are some
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
7f573b147f
|
Continue altering monitor view to do Capturing, Analysing, Recording
|
2021-10-25 16:54:53 -04:00 |
|
Isaac Connor
|
45b7c7b105
|
add Capturing, Analysing, AnalysisSource, Recording, RecordingSource, SecondPath
|
2021-10-16 20:36:19 -04:00 |
|
Isaac Connor
|
1c01936f75
|
add oninput methods to text inputs for new Manufacturer/Model
|
2021-09-26 14:47:29 -04:00 |
|
Isaac Connor
|
f40e2be28a
|
Add an input for an Id to assign to the new monitor. List 10 available Ids.
|
2021-09-25 20:56:33 -04:00 |
|
Isaac Connor
|
43dfeb5b84
|
whitespace
|
2021-09-25 20:56:33 -04:00 |
|
Isaac Connor
|
94c1b3445d
|
Add an input for an Id to assign to the new monitor. List 10 available Ids.
|
2021-09-25 20:54:35 -04:00 |
|
Isaac Connor
|
d98d20958c
|
fixup the Manufacturer and Model ddms and text inputs
|
2021-09-25 20:48:43 -04:00 |
|
Isaac Connor
|
03892796eb
|
whitespace
|
2021-09-25 16:10:50 -04:00 |
|
Isaac Connor
|
227e5794fa
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-09-08 18:32:46 -04:00 |
Peter Keresztes Schmidt
|
6e96cbe14a
|
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
|
2021-09-08 00:19:08 +02:00 |
|
Isaac Connor
|
4ff4e1f780
|
add Manufacturer and Model dropdown/text inputs to monitor edit view
|
2021-07-07 09:47:55 -04:00 |
|
Peter Keresztes Schmidt
|
f2bee0704a
|
LocalCamera: Remove support for V4L1
Kernel support for Video4Linux 1 was removed in 2.6.38 (March 2011). It's time to drop support on our side.
|
2021-05-31 23:29:29 +02:00 |
|
Isaac Connor
|
da8128aba1
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-05-07 19:16:35 -04:00 |
|
Isaac Connor
|
b8f0d90000
|
Put back Estimated Ram Use. Rework it to provide min/max
|
2021-05-06 10:17:46 -04:00 |
|
Isaac Connor
|
2dfe66663d
|
Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options
|
2021-05-05 14:03:02 -04:00 |
|
Isaac Connor
|
f59904ea7e
|
Add ModectDuringPTS checkbox on Control tab
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
506e5f84c9
|
Remove getCurrentLocation label that says Longitude
|
2021-04-19 15:45:18 -04:00 |
|
Isaac Connor
|
ed29021179
|
Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about
|
2021-04-11 12:59:18 -04:00 |
|
Isaac Connor
|
73082a2d33
|
Remove the H264/X264 from the dropdown labels. Could be H265 or other
|
2021-04-01 11:53:57 -04:00 |
|
Isaac Connor
|
8e1b2ccbc7
|
Add MaxImageBufferCount
|
2021-03-26 17:02:17 -04:00 |
|
Isaac Connor
|
badb1c6131
|
Add MaxImageBufferCount, remove estimated ram us
|
2021-03-26 14:31:04 -04:00 |
|
Isaac Connor
|
c7b22dae81
|
get rid of nextId entirely. Don't want to use it anywhere other than setting the name
|
2021-03-22 12:07:23 -04:00 |
|
Isaac Connor
|
2a6621959c
|
We CANNOT specify nextId for the next mid to use. If we do that then we can overwrite existing db entries
|
2021-03-13 12:47:05 -05:00 |
|
Isaac Connor
|
8aebcf7337
|
Fix ['mid'] not being defined. Use instead
|
2021-03-03 12:51:27 -05:00 |
|
Isaac Connor
|
ce4e133c94
|
Add loading SecondPath in monitor
|
2021-03-03 09:56:33 -05:00 |