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

Browse Source
This commit is contained in:
brindosch 2017-04-21 17:14:39 +02:00
parent ecc9624a0b
commit bd1be10435
5 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/hyperion.config.json.commented
View File

@ -119,9 +119,9 @@
/// * cropTop : Cropping from the top [default=0] /// * cropTop : Cropping from the top [default=0]
/// * cropBottom : Cropping from the bottom [default=0] /// * cropBottom : Cropping from the bottom [default=0]
/// * signalDetection : enable/disable signal detection [default=true] /// * signalDetection : enable/disable signal detection [default=true]
/// * redSignalThreshold : Signal threshold for the red channel between 0.0 and 1.0 [default=0.0] /// * redSignalThreshold : Signal threshold for the red channel between 0 and 100 [default=5]
/// * greenSignalThreshold : Signal threshold for the green channel between 0.0 and 1.0 [default=0.0] /// * greenSignalThreshold : Signal threshold for the green channel between 0 and 100 [default=5]
/// * blueSignalThreshold : Signal threshold for the blue channel between 0.0 and 1.0 [default=0.0] /// * blueSignalThreshold : Signal threshold for the blue channel between 0 and 100 [default=5]
/// * signalDetectionVerticalOffsetMin : area for signal detection - horizontal minimum offset value. Values between 0.0 and 1.0 /// * signalDetectionVerticalOffsetMin : area for signal detection - horizontal minimum offset value. Values between 0.0 and 1.0
/// * signalDetectionHorizontalOffsetMin : area for signal detection - vertical minimum offset value. Values between 0.0 and 1.0 /// * signalDetectionHorizontalOffsetMin : area for signal detection - vertical minimum offset value. Values between 0.0 and 1.0
/// * signalDetectionVerticalOffsetMax : area for signal detection - horizontal maximum offset value. Values between 0.0 and 1.0 /// * signalDetectionVerticalOffsetMax : area for signal detection - horizontal maximum offset value. Values between 0.0 and 1.0
@ -144,10 +144,10 @@
"cropRight" : 0, "cropRight" : 0,
"cropTop" : 0, "cropTop" : 0,
"cropBottom" : 0, "cropBottom" : 0,
"redSignalThreshold" : 0.0, "redSignalThreshold" : 5,
"greenSignalThreshold" : 0.0, "greenSignalThreshold" : 5,
"blueSignalThreshold" : 0.0, "blueSignalThreshold" : 5,
"signalDetection" : true, "signalDetection" : false,
"signalDetectionVerticalOffsetMin" : 0.25, "signalDetectionVerticalOffsetMin" : 0.25,
"signalDetectionHorizontalOffsetMin" : 0.25, "signalDetectionHorizontalOffsetMin" : 0.25,
"signalDetectionVerticalOffsetMax" : 0.75, "signalDetectionVerticalOffsetMax" : 0.75,

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

@ -75,10 +75,10 @@
"cropRight" : 0, "cropRight" : 0,
"cropTop" : 0, "cropTop" : 0,
"cropBottom" : 0, "cropBottom" : 0,
"redSignalThreshold" : 0.0, "redSignalThreshold" : 5,
"greenSignalThreshold" : 0.0, "greenSignalThreshold" : 5,
"blueSignalThreshold" : 0.0, "blueSignalThreshold" : 5,
"signalDetection" : true, "signalDetection" : false,
"signalDetectionVerticalOffsetMin" : 0.25, "signalDetectionVerticalOffsetMin" : 0.25,
"signalDetectionHorizontalOffsetMin" : 0.25, "signalDetectionHorizontalOffsetMin" : 0.25,
"signalDetectionVerticalOffsetMax" : 0.75, "signalDetectionVerticalOffsetMax" : 0.75,

5
effects/schema/swirl.schema.json
View File

@ -1,7 +1,7 @@
{ {
"type":"object", "type":"object",
"script" : "swirl.py", "script" : "swirl.py",
"title":"edt_eff_rainbowswirl_header_title", "title":"edt_eff_swirl_header_title",
"required":true, "required":true,
"properties":{ "properties":{
"rotation-time": { "rotation-time": {
@ -49,6 +49,7 @@
"type": "array", "type": "array",
"title" : "edt_eff_color_title", "title" : "edt_eff_color_title",
"format":"colorpicker", "format":"colorpicker",
"default" : [255,0,0],
"items":{ "items":{
"type":"integer", "type":"integer",
"minimum": 0, "minimum": 0,
@ -57,7 +58,7 @@
"minItems": 3, "minItems": 3,
"maxItems": 3 "maxItems": 3
}, },
"propertyOrder" : 1 "propertyOrder" : 6
} }
}, },
"additionalProperties": false "additionalProperties": false

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

@ -12,9 +12,9 @@ V4L2Wrapper::V4L2Wrapper(const QString &device,
int height, int height,
int frameDecimation, int frameDecimation,
int pixelDecimation, int pixelDecimation,
double redSignalThreshold, double redSignalThreshold.toDouble()/100.0,
double greenSignalThreshold, double greenSignalThreshold.toDouble()/100.0,
double blueSignalThreshold, double blueSignalThreshold.toDouble()/100.0,
const int priority) const int priority)
: GrabberWrapper("V4L2:"+device, priority, hyperion::COMP_V4L) : GrabberWrapper("V4L2:"+device, priority, hyperion::COMP_V4L)
, _timeout_ms(1000) , _timeout_ms(1000)

63
libsrc/hyperion/schemas/hyperion.schema-2.json
View File

@ -121,6 +121,7 @@
"type" : "array", "type" : "array",
"title" : "edt_conf_color_channelAdjustment_header_title", "title" : "edt_conf_color_channelAdjustment_header_title",
"required" : true, "required" : true,
"minItems": 1,
"propertyOrder" : 3, "propertyOrder" : 3,
"items" : "items" :
{ {
@ -562,40 +563,52 @@
{ {
"type" : "boolean", "type" : "boolean",
"title" : "edt_conf_v4l2_signalDetection_title", "title" : "edt_conf_v4l2_signalDetection_title",
"default" : true, "default" : false,
"propertyOrder" : 16 "propertyOrder" : 16
}, },
"redSignalThreshold" : "redSignalThreshold" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_redSignalThreshold_title", "title" : "edt_conf_v4l2_redSignalThreshold_title",
"minimum" : 0.0, "minimum" : 0,
"maximum" : 1.0, "maximum" : 100,
"default" : 0.1, "default" : 5,
"step" : 0.005,
"append" : "edt_append_percent", "append" : "edt_append_percent",
"options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 17 "propertyOrder" : 17
}, },
"greenSignalThreshold" : "greenSignalThreshold" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_greenSignalThreshold_title", "title" : "edt_conf_v4l2_greenSignalThreshold_title",
"minimum" : 0.0, "minimum" : 0,
"maximum" : 1.0, "maximum" : 100,
"default" : 0.1, "default" : 5,
"step" : 0.025,
"append" : "edt_append_percent", "append" : "edt_append_percent",
"options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 18 "propertyOrder" : 18
}, },
"blueSignalThreshold" : "blueSignalThreshold" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_blueSignalThreshold_title", "title" : "edt_conf_v4l2_blueSignalThreshold_title",
"minimum" : 0.0, "minimum" : 0,
"maximum" : 1.0, "maximum" : 100,
"default" : 0.1, "default" : 5,
"step" : 0.005,
"append" : "edt_append_percent", "append" : "edt_append_percent",
"options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 19 "propertyOrder" : 19
}, },
"signalDetectionVerticalOffsetMin" : "signalDetectionVerticalOffsetMin" :
@ -606,7 +619,11 @@
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.1,
"step" : 0.005, "step" : 0.005,
"append" : "edt_append_percent", "options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 20 "propertyOrder" : 20
}, },
"signalDetectionVerticalOffsetMax" : "signalDetectionVerticalOffsetMax" :
@ -617,7 +634,11 @@
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.1,
"step" : 0.005, "step" : 0.005,
"append" : "edt_append_percent", "options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 21 "propertyOrder" : 21
}, },
"signalDetectionHorizontalOffsetMin" : "signalDetectionHorizontalOffsetMin" :
@ -628,7 +649,11 @@
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.1,
"step" : 0.005, "step" : 0.005,
"append" : "edt_append_percent", "options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 22 "propertyOrder" : 22
}, },
"signalDetectionHorizontalOffsetMax" : "signalDetectionHorizontalOffsetMax" :
@ -639,7 +664,11 @@
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.1,
"step" : 0.005, "step" : 0.005,
"append" : "edt_append_percent", "options": {
"dependencies": {
"signalDetection": true
}
},
"propertyOrder" : 23 "propertyOrder" : 23
} }
}, },