From ad8afb0f12c37d6ff09008ec7ac41e0d9ad25dcd Mon Sep 17 00:00:00 2001
From: johan <johanpol@hotmail.com>
Date: Sun, 26 Jan 2014 20:20:55 +0100
Subject: [PATCH] Added support for YUYV

Former-commit-id: 2e867b53b129af5c5f6d443a197721a3c8852a1b
---
 deploy/hyperion.tar.gz.REMOVED.git-id |  2 +-
 src/hyperion-v4l2/V4L2Grabber.cpp     | 31 ++++++++++++++++++++++-----
 src/hyperion-v4l2/V4L2Grabber.h       |  1 +
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/deploy/hyperion.tar.gz.REMOVED.git-id b/deploy/hyperion.tar.gz.REMOVED.git-id
index d10d00a7..d163bc69 100644
--- a/deploy/hyperion.tar.gz.REMOVED.git-id
+++ b/deploy/hyperion.tar.gz.REMOVED.git-id
@@ -1 +1 @@
-a485d3d4675427fdfdb206cf108d945e77064d9e
\ No newline at end of file
+3ffb1a5d95dabb4c6a7b1ac40403ce5d393fe646
\ No newline at end of file
diff --git a/src/hyperion-v4l2/V4L2Grabber.cpp b/src/hyperion-v4l2/V4L2Grabber.cpp
index dd5cee31..a305ca9e 100644
--- a/src/hyperion-v4l2/V4L2Grabber.cpp
+++ b/src/hyperion-v4l2/V4L2Grabber.cpp
@@ -41,6 +41,7 @@ V4L2Grabber::V4L2Grabber(const std::string &device, int input, VideoStandard vid
 	_ioMethod(IO_METHOD_MMAP),
 	_fileDescriptor(-1),
 	_buffers(),
+	_pixelFormat(0),
 	_width(width),
 	_height(height),
 	_cropWidth(cropHorizontal),
@@ -368,9 +369,15 @@ void V4L2Grabber::init_device(VideoStandard videoStandard, int input)
 	}
 
 	// 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)
@@ -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)
 		{
 			int index = (_width * ySource + xSource) * 2;
-			uint8_t y = data[index+1];
-			uint8_t u = (xSource%2 == 0) ? data[index] : data[index-2];
-			uint8_t v = (xSource%2 == 0) ? data[index+2] : data[index];
+			uint8_t y = 0;
+			uint8_t u = 0;
+			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);
 			yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
diff --git a/src/hyperion-v4l2/V4L2Grabber.h b/src/hyperion-v4l2/V4L2Grabber.h
index a8033dad..ca05204f 100644
--- a/src/hyperion-v4l2/V4L2Grabber.h
+++ b/src/hyperion-v4l2/V4L2Grabber.h
@@ -81,6 +81,7 @@ private:
 	int _fileDescriptor;
 	std::vector<buffer> _buffers;
 
+	uint32_t _pixelFormat;
 	int _width;
 	int _height;
 	const int _cropWidth;