Isaac Connor
|
d98d20958c
|
fixup the Manufacturer and Model ddms and text inputs
|
2021-09-25 20:48:43 -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 |
|
Isaac Connor
|
bc07c38dc8
|
add 704x576 PAL D1
|
2020-12-14 12:57:59 -05:00 |
|
Isaac Connor
|
43d0b0fd55
|
Add D1-PAL resolution
|
2020-12-13 16:47:51 -05:00 |
|
Isaac Connor
|
8bda0b5504
|
fix element name on DecodingEnabled
|
2020-12-10 16:24:45 -05:00 |
|
Isaac Connor
|
5c1135b2a7
|
Merge branch 'master' into no_decode
|
2020-12-10 15:15:32 -05:00 |
|
Isaac Connor
|
eb00cf405a
|
Add DecodingEnabled to monitor view
|
2020-12-10 15:14:37 -05:00 |
|
Isaac Connor
|
b12f1cce5b
|
add Function help text to monitor view
|
2020-12-10 14:32:17 -05:00 |
|
Isaac Connor
|
b261fbb397
|
Merge branch 'master' into zma_to_thread
|
2020-12-07 16:26:26 -05:00 |
|
Isaac Connor
|
9b8f63b36f
|
EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation
|
2020-12-05 10:23:29 -05:00 |
hax0kartik
|
528699f942
|
Use ctzll + new font format for improving drawing speed
|
2020-11-28 18:46:20 +05:30 |
|
Isaac Connor
|
2eda49333f
|
Merge branch 'master' into zma_to_thread
|
2020-10-20 16:20:29 -04:00 |
|
Isaac Connor
|
3fdbae7761
|
add 1440p to the resolution list
|
2020-10-16 14:54:54 -04:00 |
|
Isaac Connor
|
a6de3e15f4
|
AddManufacturerId and ModelId to Monitor view
|
2020-10-11 09:57:08 -04:00 |
|
Isaac Connor
|
a39a656373
|
Merge branch 'master' into zma_to_thread
|
2020-09-29 11:02:40 -04:00 |
|
Isaac Connor
|
0a4a144bbc
|
Merge branch 'location'
|
2020-09-28 09:33:28 -04:00 |
Andrew Bauer
|
f4e7e264f0
|
fix makelink
|
2020-09-25 16:18:44 -05:00 |
|
Andrew Bauer
|
582d85f083
|
unpopup the controlcaps views
|
2020-09-25 16:12:05 -05:00 |
|
Isaac Connor
|
f9d28ddabe
|
stick a map on the location tab
|
2020-09-24 20:31:22 -04:00 |