frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L2 enhanced (#766)

Browse Source 
* fix v4l2 standard
* ignore v4l2 meta devices
* added resolution, framerate and device dropdown list to WebUI (thx to @Lord-Grey & @b1rdhous3)

* Fix for kernels prior to v4.16
* Device names added & WebUI adapted
This commit is contained in:
Paulchen Panther
2020-04-17 16:59:20 +02:00
committed by GitHub
parent b92af63cef
commit 10f11c2d89
20 changed files with 717 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/hyperion/Grabber.cpp
View File

@@ -90,8 +90,8 @@ bool Grabber::setWidthHeight(int width, int height)
bool Grabber::setFramerate(int fps)
{
if(fps > 0)
if((fps > 0) && (_fps != fps))
_fps = fps;
return fps > 0;
}
return (fps > 0) && (_fps != fps);
}

37
libsrc/hyperion/GrabberWrapper.cpp
View File

@@ -9,6 +9,8 @@
// qt
#include <QTimer>
GrabberWrapper* GrabberWrapper::instance = nullptr;
GrabberWrapper::GrabberWrapper(QString grabberName, Grabber * ggrabber, unsigned width, unsigned height, const unsigned updateRate_Hz)
: _grabberName(grabberName)
, _timer(new QTimer(this))
@@ -17,6 +19,8 @@ GrabberWrapper::GrabberWrapper(QString grabberName, Grabber * ggrabber, unsigned
, _ggrabber(ggrabber)
, _image(0,0)
{
GrabberWrapper::instance = this;
// Configure the timer to generate events every n milliseconds
_timer->setInterval(_updateInterval_ms);
@@ -89,7 +93,6 @@ QStringList GrabberWrapper::availableGrabbers()
return grabbers;
}
void GrabberWrapper::setVideoMode(const VideoMode& mode)
{
if (_ggrabber != nullptr)
@@ -216,3 +219,35 @@ void GrabberWrapper::tryStart()
start();
}
}
QStringList GrabberWrapper::getV4L2devices()
{
if(_grabberName.startsWith("V4L"))
return _ggrabber->getV4L2devices();
return QStringList();
}
QString GrabberWrapper::getV4L2deviceName(QString devicePath)
{
if(_grabberName.startsWith("V4L"))
return _ggrabber->getV4L2deviceName(devicePath);
return QString();
}
QStringList GrabberWrapper::getResolutions(QString devicePath)
{
if(_grabberName.startsWith("V4L"))
return _ggrabber->getResolutions(devicePath);
return QStringList();
}
QStringList GrabberWrapper::getFramerates(QString devicePath)
{
if(_grabberName.startsWith("V4L"))
return _ggrabber->getFramerates(devicePath);
return QStringList();
}

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

@@ -7,10 +7,14 @@
"device" :
{
"type" : "string",
"title" : "edt_conf_v4l2_device_title",
"title" : "edt_conf_enum_custom",
"default" : "auto",
"options" : {
"hidden":true
},
"required" : true,
"propertyOrder" : 1
"propertyOrder" : 2,
"comment" : "The 'available_device' settings are dynamically inserted into the WebUI under PropertyOrder '1'."
},
"standard" :
{
@@ -22,7 +26,7 @@
"enum_titles" : ["edt_conf_enum_NO_CHANGE", "edt_conf_enum_PAL", "edt_conf_enum_NTSC", "edt_conf_enum_SECAM"]
},
"required" : true,
"propertyOrder" : 2
"propertyOrder" : 3
},
"width" :
{
@@ -30,9 +34,13 @@
"title" : "edt_conf_fg_width_title",
"default" : 0,
"minimum" : 0,
"append" : "edt_append_pixel",
"options" : {
"hidden":true
},
"required" : true,
"access" : "expert",
"propertyOrder" : 3
"propertyOrder" : 5,
"comment" : "The 'resolution' settings are dynamically inserted into the WebUI under PropertyOrder '4'."
},
"height" :
{
@@ -40,19 +48,26 @@
"title" : "edt_conf_fg_height_title",
"default" : 0,
"minimum" : 0,
"append" : "edt_append_pixel",
"options" : {
"hidden":true
},
"required" : true,
"access" : "expert",
"propertyOrder" : 4
"propertyOrder" : 6
},
"fps" :
{
"type" : "integer",
"title" : "Framerate",
"title" : "edt_conf_enum_custom",
"default" : 15,
"minimum" : 1,
"append" : "fps",
"options" : {
"hidden":true
},
"required" : true,
"access" : "expert",
"propertyOrder" : 5
"propertyOrder" : 8,
"comment" : "The 'frames per second' setting is dynamically inserted into the WebUI under PropertyOrder '7'."
},
"sizeDecimation" :
{
@@ -62,7 +77,7 @@
"maximum" : 30,
"default" : 6,
"required" : true,
"propertyOrder" : 6
"propertyOrder" : 9
},
"cropLeft" :
{
@@ -72,7 +87,7 @@
"default" : 0,
"append" : "edt_append_pixel",
"required" : true,
"propertyOrder" : 7
"propertyOrder" : 10
},
"cropRight" :
{
@@ -82,7 +97,7 @@
"default" : 0,
"append" : "edt_append_pixel",
"required" : true,
"propertyOrder" : 8
"propertyOrder" : 11
},
"cropTop" :
{
@@ -92,7 +107,7 @@
"default" : 0,
"append" : "edt_append_pixel",
"required" : true,
"propertyOrder" : 9
"propertyOrder" : 12
},
"cropBottom" :
{
@@ -102,7 +117,7 @@
"default" : 0,
"append" : "edt_append_pixel",
"required" : true,
"propertyOrder" : 10
"propertyOrder" : 13
},
"signalDetection" :
{
@@ -110,7 +125,7 @@
"title" : "edt_conf_v4l2_signalDetection_title",
"default" : false,
"required" : true,
"propertyOrder" : 11
"propertyOrder" : 14
},
"redSignalThreshold" :
{
@@ -126,7 +141,7 @@
}
},
"required" : true,
"propertyOrder" : 12
"propertyOrder" : 15
},
"greenSignalThreshold" :
{
@@ -142,7 +157,7 @@
}
},
"required" : true,
"propertyOrder" : 13
"propertyOrder" : 16
},
"blueSignalThreshold" :
{
@@ -158,7 +173,7 @@
}
},
"required" : true,
"propertyOrder" : 14
"propertyOrder" : 17
},
"sDVOffsetMin" :
{
@@ -174,7 +189,7 @@
}
},
"required" : true,
"propertyOrder" : 15
"propertyOrder" : 18
},
"sDVOffsetMax" :
{
@@ -190,7 +205,7 @@
}
},
"required" : true,
"propertyOrder" : 16
"propertyOrder" : 19
},
"sDHOffsetMin" :
{
@@ -206,7 +221,7 @@
}
},
"required" : true,
"propertyOrder" : 17
"propertyOrder" : 20
},
"sDHOffsetMax" :
{
@@ -222,7 +237,7 @@
}
},
"required" : true,
"propertyOrder" : 18
"propertyOrder" : 21
}
},
"additionalProperties" : true