frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Update Grabber schema and Defaults

Browse Source
This commit is contained in:
LordGrey 2021-02-15 20:12:00 +01:00
parent 018651f099
commit 74147d200f
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/hyperion.config.json.default
View File

@ -68,7 +68,6 @@
"width" : 0, "width" : 0,
"height" : 0, "height" : 0,
"fps" : 15, "fps" : 15,
"standard" : "NO_CHANGE",
"flip" : "NO_CHANGE", "flip" : "NO_CHANGE",
"fpsSoftwareDecimation" : 0, "fpsSoftwareDecimation" : 0,
"sizeDecimation" : 8, "sizeDecimation" : 8,

2
libsrc/grabber/mediafoundation/MFWrapper.cpp
View File

@ -127,7 +127,7 @@ void MFWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& c
_grabber.setPixelDecimation(obj["sizeDecimation"].toInt(8)); _grabber.setPixelDecimation(obj["sizeDecimation"].toInt(8));
// flip mode // flip mode
_grabber.setFlipMode(obj["flip"].toString("no-change")); _grabber.setFlipMode(obj["flip"].toString("NO_CHANGE"));
// image cropping // image cropping
_grabber.setCropping( _grabber.setCropping(

2
libsrc/grabber/v4l2/V4L2Wrapper.cpp
View File

@ -151,6 +151,6 @@ void V4L2Wrapper::handleSettingsUpdate(settings::type type, const QJsonDocument&
obj["blueSignalThreshold"].toDouble(0.0)/100.0); obj["blueSignalThreshold"].toDouble(0.0)/100.0);
_grabber.setDeviceVideoStandard( _grabber.setDeviceVideoStandard(
obj["device"].toString("auto"), obj["device"].toString("auto"),
parseVideoStandard(obj["standard"].toString("no-change"))); parseVideoStandard(obj["standard"].toString("NO_CHANGE")));
} }
} }

11
libsrc/hyperion/schema/schema-grabberV4L2.json
View File

@ -7,7 +7,7 @@
"type": "string", "type": "string",
"title": "edt_conf_v4l2_device_title", "title": "edt_conf_v4l2_device_title",
"propertyOrder": 1, "propertyOrder": 1,
"required": true "required": false
}, },
"device": { "device": {
"type": "string", "type": "string",
@ -23,7 +23,7 @@
"type": "string", "type": "string",
"title": "edt_conf_v4l2_input_title", "title": "edt_conf_v4l2_input_title",
"propertyOrder": 3, "propertyOrder": 3,
"required": true "required": false
}, },
"input": { "input": {
"type": "integer", "type": "integer",
@ -40,8 +40,7 @@
"standard": { "standard": {
"type": "string", "type": "string",
"title": "edt_conf_v4l2_standard_title", "title": "edt_conf_v4l2_standard_title",
"default": "auto", "required": false,
"required": true,
"propertyOrder": 5 "propertyOrder": 5
}, },
"encoding": { "encoding": {
@ -55,7 +54,7 @@
"type": "string", "type": "string",
"title": "edt_conf_v4l2_resolution_title", "title": "edt_conf_v4l2_resolution_title",
"propertyOrder": 7, "propertyOrder": 7,
"required": true "required": false
}, },
"width": { "width": {
"type": "integer", "type": "integer",
@ -87,7 +86,7 @@
"type": "string", "type": "string",
"title": "edt_conf_v4l2_framerate_title", "title": "edt_conf_v4l2_framerate_title",
"propertyOrder": 10, "propertyOrder": 10,
"required": true "required": false
}, },
"fps": { "fps": {
"type": "integer", "type": "integer",