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

Added support for YUYV

Browse Source 
Former-commit-id: 2e867b53b129af5c5f6d443a197721a3c8852a1b
This commit is contained in:
johan 2014-01-26 20:20:55 +01:00
parent beddd7ccc4
commit ad8afb0f12
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/hyperion.tar.gz.REMOVED.git-id
View File

@ -1 +1 @@
a485d3d4675427fdfdb206cf108d945e77064d9e 3ffb1a5d95dabb4c6a7b1ac40403ce5d393fe646

31
src/hyperion-v4l2/V4L2Grabber.cpp
View File

@ -41,6 +41,7 @@ V4L2Grabber::V4L2Grabber(const std::string &device, int input, VideoStandard vid
_ioMethod(IO_METHOD_MMAP), _ioMethod(IO_METHOD_MMAP),
_fileDescriptor(-1), _fileDescriptor(-1),
_buffers(), _buffers(),
_pixelFormat(0),
_width(width), _width(width),
_height(height), _height(height),
_cropWidth(cropHorizontal), _cropWidth(cropHorizontal),
@ -368,9 +369,15 @@ void V4L2Grabber::init_device(VideoStandard videoStandard, int input)
} }
// check pixel format // check pixel format
if (fmt.fmt.pix.pixelformat != V4L2_PIX_FMT_UYVY)
switch (fmt.fmt.pix.pixelformat)
{ {
throw_exception("Only pixel format UYVY is supported"); case V4L2_PIX_FMT_UYVY:
case V4L2_PIX_FMT_YUYV:
_pixelFormat = fmt.fmt.pix.pixelformat;
break;
default:
throw_exception("Only pixel formats UYVY and YUYV are supported");
} }
if (_width > 0 || _height > 0) if (_width > 0 || _height > 0)
@ -648,9 +655,23 @@ void V4L2Grabber::process_image(const uint8_t * data)
for (int xSource = _cropWidth + _pixelDecimation/2, xDest = 0; xSource < _width - _cropWidth; xSource += _pixelDecimation, ++xDest) for (int xSource = _cropWidth + _pixelDecimation/2, xDest = 0; xSource < _width - _cropWidth; xSource += _pixelDecimation, ++xDest)
{ {
int index = (_width * ySource + xSource) * 2; int index = (_width * ySource + xSource) * 2;
uint8_t y = data[index+1]; uint8_t y = 0;
uint8_t u = (xSource%2 == 0) ? data[index] : data[index-2]; uint8_t u = 0;
uint8_t v = (xSource%2 == 0) ? data[index+2] : data[index]; uint8_t v = 0;
switch (_pixelFormat)
{
case V4L2_PIX_FMT_UYVY:
y = data[index+1];
u = (xSource%2 == 0) ? data[index ] : data[index-2];
v = (xSource%2 == 0) ? data[index+2] : data[index ];
break;
case V4L2_PIX_FMT_YUYV:
y = data[index];
u = (xSource%2 == 0) ? data[index+1] : data[index-1];
v = (xSource%2 == 0) ? data[index+3] : data[index+1];
break;
}
ColorRgb & rgb = image(xDest, yDest); ColorRgb & rgb = image(xDest, yDest);
yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue); yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);

1
src/hyperion-v4l2/V4L2Grabber.h
View File

@ -81,6 +81,7 @@ private:
int _fileDescriptor; int _fileDescriptor;
std::vector<buffer> _buffers; std::vector<buffer> _buffers;
uint32_t _pixelFormat;
int _width; int _width;
int _height; int _height;
const int _cropWidth; const int _cropWidth;