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

Add SECAM video standard to v4l2

Browse Source
This commit is contained in:
brindosch
2017-10-04 21:23:45 +02:00
parent 6f443a48dd
commit 59ec767373
7 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/grabber/v4l2/V4L2Grabber.cpp
View File

@@ -90,7 +90,7 @@ bool V4L2Grabber::init()
{
getV4Ldevices();
QString v4lDevices_str;
// show list only once
if ( ! QString(QSTRING_CSTR(_deviceName)).startsWith("/dev/") )
{
@@ -153,7 +153,7 @@ bool V4L2Grabber::init()
ErrorIf( !_deviceAutoDiscoverEnabled, _log, "V4l2 init failed (%s)", e.what());
}
}
return _initialized;
}
@@ -161,7 +161,7 @@ void V4L2Grabber::getV4Ldevices()
{
QDirIterator it("/sys/class/video4linux/", QDirIterator::NoIteratorFlags);
while(it.hasNext())
{
{
//_v4lDevices
QString dev = it.next();
if (it.fileName().startsWith("video"))
@@ -462,6 +462,15 @@ void V4L2Grabber::init_device(VideoStandard videoStandard, int input)
}
}
break;
case VIDEOSTANDARD_SECAM:
{
v4l2_std_id std_id = V4L2_STD_SECAM;
if (-1 == xioctl(VIDIOC_S_STD, &std_id))
{
throw_errno_exception("VIDIOC_S_STD");
}
}
break;
case VIDEOSTANDARD_NO_CHANGE:
default:
// No change to device settings
@@ -768,7 +777,7 @@ int V4L2Grabber::read_frame()
emit readError(e.what());
rc = false;
}
return rc ? 1 : 0;
}
@@ -810,7 +819,7 @@ void V4L2Grabber::process_image(const uint8_t * data)
unsigned xMax = image.width() * _x_frac_max;
unsigned yMax = image.height() * _y_frac_max;
for (unsigned x = xOffset; noSignal && x < xMax; ++x)
{
for (unsigned y = yOffset; noSignal && y < yMax; ++y)