Commit Graph

370 Commits

Author SHA1 Message Date
Isaac Connor 2a83e26fb2 Move Recording to General tab. Improve help links 2022-01-11 10:46:08 -05: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
Isaac Connor 95fe689d58 WIP, rabbit hole too deep 2021-03-03 09:55:57 -05:00
Isaac Connor bb747bfc6d Add RTSPStreamName fields 2021-03-01 16:46:48 -05:00
Isaac Connor d106c2fcc3 Add 4MP and 6MP resoolutions 2021-02-24 15:03:11 -05:00
Isaac Connor 9fec32fdc5 We now support audio when doing video encoding 2021-02-22 09:55:40 -05:00
Isaac Connor 317274248b Allow mid= and dupId= in monitor view to allow mid reuse. Alphabetically sort Monitors in LinkedMonitors by name 2021-02-16 14:16:59 -05:00
Isaac Connor c8af90fd24 Add RTSP Server checkbox 2021-02-02 23:19:52 -05:00
Isaac Connor 49209d9e72 populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown 2021-02-01 16:45:13 -05:00
Isaac Connor 4ba939e267 role=tabList needs to be role=tablist 2021-01-29 20:37:55 -05:00
Isaac Connor bacf4a1aca Add 640x360 resolution 2021-01-26 17:54:22 -05:00
Isaac Connor f7de6045ef Change Disabled to Auto and add h265 as codec options 2021-01-11 13:46:50 -05:00
Steve Gilvarry 7c783aa53d
Deal with Error for Auto not in Array
Add value auto into the array, even if not implemented as without it you cannot save a monitor.
2021-01-01 14:38:33 +11:00
Isaac Connor 284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor 997a05eb8b AV_CODEC_ID for H264 is 27 not 220 2020-12-15 16:56:27 -05:00
Isaac Connor e123322d06 Merge branch 'master' into rtsp_server 2020-12-15 11:00:13 -05:00
Isaac Connor 99e7ae3505 Merge branch 'master' into rtsp_server 2020-12-15 10:14:19 -05:00