Media Foundation/V4L2 grabber ... (#1119)

* - New Media Foundation grabber - JsonAPI available grabber fix - commented json config removed * Added libjpeg-turbo to dependencies * Fix OSX build Removed Azure Pipelines from build scripts * Remove Platform from Dashboard * Correct Grabber Namings * Grabber UI improvements, generic JSONEditor Selection Update * Active grabber fix * Stop Framebuffer grabber on failure * - Image format NV12 and I420 added - Flip mode - Scaling factor for MJPEG - VSCode (compile before run) - CI (push) dependency libjpeg-turbo added * Refactor MediaFoundation (Part 1) * Remove QDebug output * Added image flipping ability to MF Grabber * fix issue 1160 * -Reload MF Grabber only once per WebUI update - Cleanup * Improvements * - Set 'Software Frame Decimation' begin to 0 - Removed grabber specific device name from Log - Keep pixel format when switching resolution - Display 'Flip mode' correct in Log - BGR24 images always flipped * Refactor MediaFoundation (Part 2) * Refactor V4L2 grabber (part 1) (#62) * Media Foundation grabber adapted to V4L2 change * Enable Media Foundation grabber on windows * Have fps as int, fix height typo * Added video standards to JsonAPI output * Error handling in source reader improved * Fix "Frame to small" error * Discovery VideoSources and Dynamically Update Editor * Hide all element when no video grabber discovered, upate naming * Do not show unsupported grabbers * Copy Log to Clipboard * Update Grabber schema and Defaults * Update access levels and validate crop ranges * Height and width in Qt grabber corrected * Correct formatting * Untabify * Global component states across instances * Components divided on the dashboard * refactor * Fix Merge-issues * Database migration aligning with updated grabber model * Align Grabber.js with new utility functions * Allow editor-validation for enum-lists * Handle "Show Explainations scenario" correctly * Grabber - Ensure save is only possible on valid content * Dashboard update + fix GlobalSignal connection * Ensure default database is populated with current release * Correct grabber4L2 access level * Display Signal detection area in preview * Write Hyperion version into default config on compiling. * Create defaultconfig.json dynamically * WebUI changes * Correct grabber config look-ups * Refactor i18n language loading * Fix en.json * Split global capture from instance capture config * Update grabber default values * Standalone grabber: Add --debug switch * Enhance showInputOptionsForKey for multiple keys * Add grabber instance link to system grabber config * Only show signal detection area, if grabber is enabled * Always show Active element on grabber page * Remote control - Only display gabber status, if global grabber is enabled * WebUI optimization (thx to @mkcologne) Start Grabber only when global settings are enabled Fixed an issue in the WebUI preview * V4L2/MF changes * Jsoneditor, Correct translation for default values * Refactor LED-Device handling in UI and make element naming consistent * MF Discovery extended * Fix LGTM finding * Support Grabber Bri, Hue, Sat and Con in UI, plus their defaults * Concider Access level for item filtering * Concider Access level for item filtering * Revert "Concider Access level for item filtering" This reverts commit 5b0ce3c0f2. * Disable fpsSoftwareDecimation for framegrabber, as not supported yet * JSON-Editor- Add updated schema for validation on dynamic elements * added V4L2 color IDs * LGTM findings fix * destroy SR callback only on exit * Grabber.js - Hide elements not supported by platform * Fixed freezing start effect * Grabber UI - Hardware controls - Show current values and allow to reset to defaults * Grabber - Discovery - Add current values to properties * Small things * Clean-up Effects and have ENDLESS consistently defined * Fix on/off/on priority during startup, by initializing _prevVisComp in line with background priority * Add missing translation mappings * DirectX Grabber reactivated/ QT Grabber size decimation fixed * typo in push-master workflow * Use PreciseTimer for Grabber to ensure stable FPS timing * Set default Screencapture rate consistently * Fix libjpeg-turbo download * Remove Zero character from file * docker-compile Add PLATFORM parameter, only copy output file after successful compile * Framebuffer, Dispmanx, OSX, AML Grabber discovery, various clean-up and consistencies across grabbers * Fix merge problem - on docker-compile Add PLATFORM parameter, only copy output file after successful compile * Fix definition * OSXFRameGrabber - Revert cast * Clean-ups nach Feedback * Disable certain libraries when building armlogic via standard stretch image as developer * Add CEC availability to ServerInfo to have it platform independent * Grabber UI - Fix problem that crop values are not populated when refining editor rage * Preserve value when updating json-editor range * LEDVisualisation - Clear image when source changes * Fix - Preserve value when updating json-editor range * LEDVisualisation - Clear image when no component is active * Allow to have password handled by Password-Manager (#1263) * Update default signal detection area to green assuming rainbow grabber * LED Visualisation - Handle empty priority update * Fix yuv420 in v4l2 grabber * V4L2-Grabber discovery - Only report grabbers with valid video input information * Grabber - Update static variables to have them working in release build * LED Visualisation - ClearImage when no priorities * LED Visualisation - Fix Logo resizing issue * LED Visualisation - Have nearly black background and negative logo Co-authored-by: LordGrey <lordgrey.emmel@gmail.com> Co-authored-by: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
2025-03-01 10:33:28 +00:00 · 2021-07-14 20:48:33 +02:00
parent b0e1510a78
commit c135d91986
163 changed files with 10756 additions and 5953 deletions
--- a/include/grabber/AmlogicGrabber.h
+++ b/include/grabber/AmlogicGrabber.h
@@ -14,12 +14,16 @@ public:
 	///
 	/// Construct a AmlogicGrabber that will capture snapshots with specified dimensions.
 	///
-	/// @param[in] width  The width of the captured screenshot
-	/// @param[in] height The heigth of the captured screenshot
 	///
-	AmlogicGrabber(unsigned width, unsigned height);
+	AmlogicGrabber();
 	~AmlogicGrabber() override;

+	///
+	/// @brief Setup a new capture screen, will free the previous one
+	/// @return True on success, false if no screen is found
+	///
+	bool setupScreen();
+
 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
 	/// provided image should have the same dimensions as the configured values (_width and
@@ -31,14 +35,51 @@ public:
 	///
 	int grabFrame(Image<ColorRgb> & image);

+	///
+	/// @brief Discover AmLogic screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);
+
+	///
+	/// Set the video mode (2D/3D)
+	/// @param[in] mode The new video mode
+	///
+	void setVideoMode(VideoMode mode) override;
+
+	///
+	/// @brief Apply new crop values, on errors reject the values
+	///
+	void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom) override;
+
+	///
+	/// @brief Apply new width/height values, on errors (collide with cropping) reject the values
+	/// @return True on success else false
+	///
+	bool setWidthHeight(int width, int height) override;
+
+	///
+	/// @brief Apply new framerate
+	/// @param fps framesPerSecond
+	///
+	bool setFramerate(int fps) override;
+
+	///
+	/// @brief  Apply new pixelDecimation
+	///
+	bool setPixelDecimation(int pixelDecimation) override;
+
 private:
 	/**
 	 * Returns true if video is playing over the amlogic chip
 	 * @return True if video is playing else false
 	 */
 	bool isVideoPlaying();
-	void closeDev(int &fd);
-	bool openDev(int &fd, const char* dev);
+	void closeDevice(int &fd);
+	bool openDevice(int &fd, const char* dev);

 	int grabFrame_amvideocap(Image<ColorRgb> & image);

--- a/include/grabber/AmlogicWrapper.h
+++ b/include/grabber/AmlogicWrapper.h
@@ -4,8 +4,8 @@
 #include <grabber/AmlogicGrabber.h>

 ///
-/// The DispmanxWrapper uses an instance of the DispmanxFrameGrabber to obtain ImageRgb's from the
-/// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
+/// The Amlogic uses an instance of the AmlogicGrabber to obtain ImageRgb's from the
+/// displayed content. This ImageRgb is processed to a ColorRgb for each led and committed to the
 /// attached Hyperion.
 ///
 class AmlogicWrapper : public GrabberWrapper
@@ -13,12 +13,14 @@ class AmlogicWrapper : public GrabberWrapper
 	Q_OBJECT
 public:
 	///
-	/// Constructs the dispmanx frame grabber with a specified grab size and update rate.
+	/// Constructs the Amlogic frame grabber
 	///
 	/// @param[in] grabWidth  The width of the grabbed image [pixels]
 	/// @param[in] grabHeight  The height of the grabbed images [pixels]
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	///
-	AmlogicWrapper(unsigned grabWidth, unsigned grabHeight);
+	AmlogicWrapper(int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
+					int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ);

 public slots:
 	///
--- a/include/grabber/DirectXGrabber.h
+++ b/include/grabber/DirectXGrabber.h
@@ -8,8 +8,14 @@

 // Hyperion-utils includes
 #include <utils/ColorRgb.h>
+#include <hyperion/GrabberWrapper.h>
 #include <hyperion/Grabber.h>

+// qt includes
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonDocument>
+
 ///
 /// @brief The DirectX9 capture implementation
 ///
@@ -17,33 +23,32 @@ class DirectXGrabber : public Grabber
 {
 public:

-	DirectXGrabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display);
+	DirectXGrabber(int display=0, int cropLeft=0, int cropRight=0, int cropTop=0, int cropBottom=0);

 	virtual ~DirectXGrabber();

 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
-	/// provided image should have the same dimensions as the configured values (_width and
-	/// _height)
+	/// provided image should have the same dimensions as the configured values (_width and _height)
 	///
 	/// @param[out] image  The snapped screenshot
 	///
-	virtual int grabFrame(Image<ColorRgb> & image);
+	int grabFrame(Image<ColorRgb> & image);

 	///
 	/// @brief Set a new video mode
 	///
-	virtual void setVideoMode(VideoMode mode);
+	void setVideoMode(VideoMode mode) override;

 	///
 	/// @brief Apply new width/height values, overwrite Grabber.h implementation
 	///
-	virtual bool setWidthHeight(int width, int height) { return true; };
+	bool setWidthHeight(int /* width */, int /*height*/) override { return true; }

 	///
 	/// @brief Apply new pixelDecimation
 	///
-	virtual void setPixelDecimation(int pixelDecimation);
+	bool setPixelDecimation(int pixelDecimation) override;

 	///
 	/// Set the crop values
@@ -52,12 +57,20 @@ public:
 	/// @param  cropTop     Top pixel crop
 	/// @param  cropBottom  Bottom pixel crop
 	///
-	virtual void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom);
+	void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom);

 	///
 	/// @brief Apply display index
 	///
-	void setDisplayIndex(int index) override;
+	bool setDisplayIndex(int index) override;
+
+	/// @brief Discover QT screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);

 private:
 	///
@@ -72,7 +85,6 @@ private:
 	void freeResources();

 private:
-	int _pixelDecimation;
 	unsigned _display;
 	unsigned _displayWidth;
 	unsigned _displayHeight;
--- a/include/grabber/DirectXWrapper.h
+++ b/include/grabber/DirectXWrapper.h
@@ -9,15 +9,21 @@ public:
 	///
 	/// Constructs the DirectX grabber with a specified grab size and update rate.
 	///
+	/// @param[in] updateRate_Hz     The image grab rate [Hz]
+	/// @param[in] display           Display to be grabbed
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	/// @param[in] cropLeft          Remove from left [pixels]
 	/// @param[in] cropRight 	     Remove from right [pixels]
 	/// @param[in] cropTop           Remove from top [pixels]
 	/// @param[in] cropBottom        Remove from bottom [pixels]
-	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
-	/// @param[in] display           The display used[index]
-	/// @param[in] updateRate_Hz     The image grab rate [Hz]
+
 	///
-	DirectXWrapper(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display, const unsigned updateRate_Hz);
+	DirectXWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+					int display=0,
+					int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
+					int cropLeft=0, int cropRight=0,
+					int cropTop=0, int cropBottom=0
+					);

 	///
 	/// Destructor of this DirectX grabber. Releases any claimed resources.
--- a/include/grabber/DispmanxFrameGrabber.h
+++ b/include/grabber/DispmanxFrameGrabber.h
@@ -14,8 +14,7 @@
 #include <hyperion/Grabber.h>

 ///
-/// The DispmanxFrameGrabber is used for creating snapshots of the display (screenshots) with a
-/// downsized and scaled resolution.
+/// The DispmanxFrameGrabber is used for creating snapshots of the display (screenshots) with a downsized and scaled resolution.
 ///
 class DispmanxFrameGrabber : public Grabber
 {
@@ -23,12 +22,16 @@ public:
 	///
 	/// Construct a DispmanxFrameGrabber that will capture snapshots with specified dimensions.
 	///
-	/// @param[in] width  The width of the captured screenshot
-	/// @param[in] height The heigth of the captured screenshot
-	///
-	DispmanxFrameGrabber(unsigned width, unsigned height);
+	DispmanxFrameGrabber();
 	~DispmanxFrameGrabber() override;

+	bool open();
+
+	///
+	/// @brief Setup a new capture screen, will free the previous one
+	/// @return True on success, false if no screen is found
+	///
+	bool setupScreen();

 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
@@ -44,13 +47,24 @@ public:
 	///@brief Set new width and height for dispmanx, overwrite Grabber.h impl
 	bool setWidthHeight(int width, int height) override;

+	QSize getScreenSize(int display=0) const;
+
+	///
+	/// @brief Discover DispmanX screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);
+
 private:
 	///
 	/// Updates the frame-grab flags as used by the VC library for frame grabbing
 	///
 	/// @param vc_flags  The snapshot grabbing mask
 	///
-	void setFlags(int vc_flags);
+	void setFlags(DISPMANX_TRANSFORM_T vc_flags);

 	///
 	/// @brief free _vc_resource and captureBuffer
@@ -63,11 +77,11 @@ private:
 	/// Handle to the resource for storing the captured snapshot
 	DISPMANX_RESOURCE_HANDLE_T _vc_resource;

-	/// Rectangle of the captured resource that is transfered to user space
+	/// Rectangle of the captured resource that is transferred to user space
 	VC_RECT_T _rectangle;

 	/// Flags (transforms) for creating snapshots
-	int _vc_flags;
+	DISPMANX_TRANSFORM_T _vc_flags;

 	// temp buffer when capturing with unsupported pitch size or
 	// when we need to crop the image
@@ -78,5 +92,4 @@ private:

 	// rgba output buffer
 	Image<ColorRgba>  _image_rgba;
-
 };
--- a/include/grabber/DispmanxFrameGrabberMock.h
+++ b/include/grabber/DispmanxFrameGrabberMock.h
@@ -16,6 +16,7 @@ typedef int DISPMANX_TRANSFORM_T;
 struct DISPMANX_MODEINFO_T {
 	int width;
 	int height;
+	uint32_t display_num;
 };

 struct VC_RECT_T {
@@ -34,6 +35,6 @@ DISPMANX_RESOURCE_HANDLE_T vc_dispmanx_resource_create(int,int width,int height,
 void vc_dispmanx_resource_delete(DISPMANX_RESOURCE_HANDLE_T resource);
 int  vc_dispmanx_resource_read_data(DISPMANX_RESOURCE_HANDLE_T vc_resource, VC_RECT_T *rectangle, void* capturePtr, unsigned capturePitch);
 void vc_dispmanx_rect_set(VC_RECT_T *rectangle, int left, int top, int width, int height);
-int vc_dispmanx_snapshot(int, DISPMANX_RESOURCE_HANDLE_T resource, int vc_flags);
+int vc_dispmanx_snapshot(int, DISPMANX_RESOURCE_HANDLE_T resource, DISPMANX_TRANSFORM_T vc_flags);

 #endif
--- a/include/grabber/DispmanxWrapper.h
+++ b/include/grabber/DispmanxWrapper.h
@@ -16,11 +16,14 @@ public:
 	///
 	/// Constructs the dispmanx frame grabber with a specified grab size and update rate.
 	///
-	/// @param[in] grabWidth  The width of the grabbed image [pixels]
-	/// @param[in] grabHeight  The height of the grabbed images [pixels]
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	/// @param[in] updateRate_Hz  The image grab rate [Hz]
 	///
-	DispmanxWrapper(unsigned grabWidth, unsigned grabHeight, unsigned updateRate_Hz);
+	DispmanxWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+					 int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION
+					 );
+
+	bool screenInit();

 public slots:
 	///
--- a/include/grabber/EncoderThread.h
+++ b/include/grabber/EncoderThread.h
@@ -0,0 +1,176 @@
+#pragma once
+
+// Qt includes
+#include <QThread>
+
+// util includes
+#include <utils/PixelFormat.h>
+#include <utils/ImageResampler.h>
+
+// Determine the cmake options
+#include <HyperionConfig.h>
+
+// Turbo JPEG decoder
+#ifdef HAVE_TURBO_JPEG
+	#include <turbojpeg.h>
+#endif
+
+/// Encoder thread for USB devices
+class EncoderThread : public QObject
+{
+	Q_OBJECT
+public:
+	explicit EncoderThread();
+	~EncoderThread();
+
+	void setup(
+		PixelFormat pixelFormat, uint8_t* sharedData,
+		int size, int width, int height, int lineLength,
+		unsigned cropLeft, unsigned cropTop, unsigned cropBottom, unsigned cropRight,
+		VideoMode videoMode, FlipMode flipMode, int pixelDecimation);
+
+	void process();
+
+	bool isBusy() { return _busy; }
+	QAtomicInt _busy = false;
+
+signals:
+	void newFrame(const Image<ColorRgb>& data);
+
+private:
+	PixelFormat			_pixelFormat;
+	uint8_t*			_localData,
+						*_flipBuffer;
+	int					_scalingFactorsCount,
+						_width,
+						_height,
+						_lineLength,
+						_currentFrame,
+						_pixelDecimation;
+	unsigned long		_size;
+	unsigned			_cropLeft,
+						_cropTop,
+						_cropBottom,
+						_cropRight;
+	FlipMode			_flipMode;
+	ImageResampler		_imageResampler;
+
+#ifdef HAVE_TURBO_JPEG
+	tjhandle			_transform, _decompress;
+	tjscalingfactor*	_scalingFactors;
+	tjtransform*		_xform;
+
+	void processImageMjpeg();
+#endif
+};
+
+template <typename TThread> class Thread : public QThread
+{
+public:
+	TThread *_thread;
+	explicit Thread(TThread *thread, QObject *parent = nullptr)
+		: QThread(parent)
+		, _thread(thread)
+	{
+		_thread->moveToThread(this);
+		start();
+	}
+
+	~Thread()
+	{
+		quit();
+		wait();
+	}
+
+	EncoderThread* thread() const { return qobject_cast<EncoderThread*>(_thread); }
+
+	void setup(
+		PixelFormat pixelFormat, uint8_t* sharedData,
+		int size, int width, int height, int lineLength,
+		unsigned cropLeft, unsigned cropTop, unsigned cropBottom, unsigned cropRight,
+		VideoMode videoMode, FlipMode flipMode, int pixelDecimation)
+	{
+		auto encThread = qobject_cast<EncoderThread*>(_thread);
+		if (encThread != nullptr)
+			encThread->setup(pixelFormat, sharedData,
+				size, width, height, lineLength,
+				cropLeft, cropTop, cropBottom, cropRight,
+				videoMode, flipMode, pixelDecimation);
+	}
+
+	bool isBusy()
+	{
+		auto encThread = qobject_cast<EncoderThread*>(_thread);
+		if (encThread != nullptr)
+			return encThread->isBusy();
+
+		return true;
+	}
+
+	void process()
+	{
+		auto encThread = qobject_cast<EncoderThread*>(_thread);
+		if (encThread != nullptr)
+			encThread->process();
+	}
+
+protected:
+	void run() override
+	{
+		QThread::run();
+		delete _thread;
+	}
+};
+
+class EncoderThreadManager : public QObject
+{
+    Q_OBJECT
+public:
+	explicit EncoderThreadManager(QObject *parent = nullptr)
+		: QObject(parent)
+		, _threadCount(qMax(QThread::idealThreadCount(), 1))
+		, _threads(nullptr)
+	{
+		_threads = new Thread<EncoderThread>*[_threadCount];
+		for (int i = 0; i < _threadCount; i++)
+		{
+			_threads[i] = new Thread<EncoderThread>(new EncoderThread, this);
+			_threads[i]->setObjectName("Encoder " + i);
+		}
+	}
+
+	~EncoderThreadManager()
+	{
+		if (_threads != nullptr)
+		{
+			for(int i = 0; i < _threadCount; i++)
+			{
+				_threads[i]->deleteLater();
+				_threads[i] = nullptr;
+			}
+
+			delete[] _threads;
+			_threads = nullptr;
+		}
+	}
+
+	void start()
+	{
+		if (_threads != nullptr)
+			for (int i = 0; i < _threadCount; i++)
+				connect(_threads[i]->thread(), &EncoderThread::newFrame, this, &EncoderThreadManager::newFrame);
+	}
+
+	void stop()
+	{
+		if (_threads != nullptr)
+			for(int i = 0; i < _threadCount; i++)
+				disconnect(_threads[i]->thread(), nullptr, nullptr, nullptr);
+	}
+
+	int					_threadCount;
+	Thread<EncoderThread>**	_threads;
+
+signals:
+	void newFrame(const Image<ColorRgb>& data);
+};
--- a/include/grabber/FramebufferFrameGrabber.h
+++ b/include/grabber/FramebufferFrameGrabber.h
@@ -1,5 +1,7 @@
 #pragma once

+#include <linux/fb.h>
+
 // Utils includes
 #include <utils/ColorRgb.h>
 #include <hyperion/Grabber.h>
@@ -14,10 +16,10 @@ public:
 	/// Construct a FramebufferFrameGrabber that will capture snapshots with specified dimensions.
 	///
 	/// @param[in] device The framebuffer device name/path
-	/// @param[in] width  The width of the captured screenshot
-	/// @param[in] height The heigth of the captured screenshot
 	///
-	FramebufferFrameGrabber(const QString & device, unsigned width, unsigned height);
+	FramebufferFrameGrabber(const QString & device="/dev/fb0");
+
+	~FramebufferFrameGrabber() override;

 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
@@ -30,11 +32,42 @@ public:
 	int grabFrame(Image<ColorRgb> & image);

 	///
-	/// @brief Overwrite Grabber.h implememtation
+	/// @brief Setup a new capture screen, will free the previous one
+	/// @return True on success, false if no screen is found
 	///
-	void setDevicePath(const QString& path) override;
+	bool setupScreen();
+
+
+	QSize getScreenSize() const;
+	QSize getScreenSize(const QString& device) const;
+
+	///
+	///@brief Set new width and height for framegrabber, overwrite Grabber.h implementation
+	bool setWidthHeight(int width, int height) override;
+
+	QString getPath() const {return _fbDevice;}
+
+	///
+	/// @brief Discover Framebuffer screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);

 private:
+
+	bool openDevice();
+	bool closeDevice();
+	bool getScreenInfo();
+
 	/// Framebuffer device e.g. /dev/fb0
 	QString _fbDevice;
+
+	int _fbfd;
+	struct fb_var_screeninfo _varInfo;
+	struct fb_fix_screeninfo _fixInfo;
+
+	PixelFormat _pixelFormat;
 };
--- a/include/grabber/FramebufferWrapper.h
+++ b/include/grabber/FramebufferWrapper.h
@@ -5,7 +5,7 @@

 ///
 /// The FramebufferWrapper uses an instance of the FramebufferFrameGrabber to obtain ImageRgb's from the
-/// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
+/// displayed content. This ImageRgb is processed to a ColorRgb for each led and committed to the
 /// attached Hyperion.
 ///
 class FramebufferWrapper: public GrabberWrapper
@@ -15,12 +15,14 @@ public:
 	///
 	/// Constructs the framebuffer frame grabber with a specified grab size and update rate.
 	///
-	/// @param[in] device Framebuffer device name/path
-	/// @param[in] grabWidth  The width of the grabbed image [pixels]
-	/// @param[in] grabHeight  The height of the grabbed images [pixels]
 	/// @param[in] updateRate_Hz  The image grab rate [Hz]
+	/// @param[in] device Framebuffer device name/path
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	///
-	FramebufferWrapper(const QString & device, unsigned grabWidth, unsigned grabHeight, unsigned updateRate_Hz);
+	FramebufferWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+						const QString & device = "/dev/fb0",
+						int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION
+						);

 public slots:
 	///
--- a/include/grabber/MFGrabber.h
+++ b/include/grabber/MFGrabber.h
@@ -0,0 +1,129 @@
+#pragma once
+
+// Windows include
+#include <Windows.h>
+
+// COM includes
+#include <Guiddef.h>
+
+// Qt includes
+#include <QObject>
+#include <QRectF>
+#include <QMap>
+#include <QMultiMap>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonDocument>
+
+// utils includes
+#include <utils/PixelFormat.h>
+#include <utils/Components.h>
+#include <hyperion/Grabber.h>
+
+// decoder thread includes
+#include <grabber/EncoderThread.h>
+
+/// Forward class declaration
+class SourceReaderCB;
+/// Forward struct declaration
+struct IMFSourceReader;
+
+///
+/// Media Foundation capture class
+///
+
+class MFGrabber : public Grabber
+{
+	Q_OBJECT
+	friend class SourceReaderCB;
+public:
+	struct DeviceProperties
+	{
+		QString symlink = QString();
+		int	width		= 0;
+		int	height		= 0;
+		int	fps			= 0;
+		int numerator	= 0;
+		int denominator = 0;
+		PixelFormat pf	= PixelFormat::NO_CHANGE;
+		GUID guid		= GUID_NULL;
+	};
+
+	struct DeviceControls
+	{
+		QString property = QString();
+		int minValue = 0;
+		int maxValue = 0;
+		int step = 0;
+		int default = 0;
+		int currentValue = 0;
+	};
+
+	MFGrabber();
+	~MFGrabber() override;
+
+	void receive_image(const void *frameImageBuffer, int size);
+	void setDevice(const QString& device);
+	bool setInput(int input) override;
+	bool setWidthHeight(int width, int height) override;
+	void setEncoding(QString enc);
+	void setBrightnessContrastSaturationHue(int brightness, int contrast, int saturation, int hue);
+	void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold, int noSignalCounterThreshold);
+	void setSignalDetectionOffset( double verticalMin, double horizontalMin, double verticalMax, double horizontalMax);
+	void setSignalDetectionEnable(bool enable);
+	bool reload(bool force = false);
+
+	///
+	/// @brief Discover available Media Foundation USB devices (for configuration).
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	/// @return A JSON structure holding a list of USB devices found
+	///
+	QJsonArray discover(const QJsonObject& params);
+
+public slots:
+	bool prepare();
+	bool start();
+	void stop();
+	void newThreadFrame(Image<ColorRgb> image);
+
+signals:
+	void newFrame(const Image<ColorRgb> & image);
+	void readError(const char* err);
+
+private:
+	bool init();
+	void uninit();
+	HRESULT init_device(QString device, DeviceProperties props);
+	void enumVideoCaptureDevices();
+	void start_capturing();
+	void process_image(const void *frameImageBuffer, int size);
+
+	QString										_currentDeviceName,
+												_newDeviceName;
+	QMap<QString, QList<DeviceProperties>>		_deviceProperties;
+	QMap<QString, QList<DeviceControls>>		_deviceControls;
+	HRESULT										_hr;
+	IMFSourceReader*							_sourceReader;
+	SourceReaderCB*								_sourceReaderCB;
+	EncoderThreadManager*						_threadManager;
+	PixelFormat									_pixelFormat,
+												_pixelFormatConfig;
+	int											_lineLength,
+												_frameByteSize,
+												_noSignalCounterThreshold,
+												_noSignalCounter,
+												_brightness,
+												_contrast,
+												_saturation,
+												_hue;
+	QAtomicInt									_currentFrame;
+	ColorRgb									_noSignalThresholdColor;
+	bool										_signalDetectionEnabled,
+												_noSignalDetected,
+												_initialized,
+												_reload;
+	double										_x_frac_min,
+												_y_frac_min,
+												_x_frac_max,
+												_y_frac_max;
+};
--- a/include/grabber/OsxFrameGrabber.h
+++ b/include/grabber/OsxFrameGrabber.h
@@ -21,12 +21,17 @@ public:
 	/// Construct a OsxFrameGrabber that will capture snapshots with specified dimensions.
 	///
 	/// @param[in] display The index of the display to capture
-	/// @param[in] width  The width of the captured screenshot
-	/// @param[in] height The heigth of the captured screenshot
+
 	///
-	OsxFrameGrabber(unsigned display, unsigned width, unsigned height);
+	OsxFrameGrabber(int display=kCGDirectMainDisplay);
 	~OsxFrameGrabber() override;

+	///
+	/// @brief Setup a new capture screen, will free the previous one
+	/// @return True on success, false if no screen is found
+	///
+	bool setupDisplay();
+
 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
 	/// provided image should have the same dimensions as the configured values (_width and
@@ -40,12 +45,21 @@ public:
 	///
 	/// @brief Overwrite Grabber.h implementation
 	///
-	void setDisplayIndex(int index) override;
+	bool setDisplayIndex(int index) override;
+
+	///
+	/// @brief Discover OSX screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);

 private:
 	/// display
-	unsigned _screenIndex;
+	int _screenIndex;

-	/// Reference to the captured diaplay
+	/// Reference to the captured display
 	CGDirectDisplayID _display;
 };
--- a/include/grabber/OsxFrameGrabberMock.h
+++ b/include/grabber/OsxFrameGrabberMock.h
@@ -4,31 +4,90 @@
 /*
 * this is a mock up for compiling and testing osx wrapper on no osx platform.
 * this will show a test image and rotate the colors.
+ *
+ * see https://github.com/phracker/MacOSX-SDKs/blob/master/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework/Versions/A/Headers
 * 
 */

 #include <utils/Image.h>
 #include <utils/ColorRgb.h>

-typedef int CGDirectDisplayID;
+enum _CGError {
+	kCGErrorSuccess = 0,
+	kCGErrorFailure = 1000,
+	kCGErrorIllegalArgument = 1001,
+	kCGErrorInvalidConnection = 1002,
+	kCGErrorInvalidContext = 1003,
+	kCGErrorCannotComplete = 1004,
+	kCGErrorNotImplemented = 1006,
+	kCGErrorRangeCheck = 1007,
+	kCGErrorTypeCheck = 1008,
+	kCGErrorInvalidOperation = 1010,
+	kCGErrorNoneAvailable = 1011,
+
+	/* Obsolete errors. */
+	kCGErrorNameTooLong = 1005,
+	kCGErrorNoCurrentPoint = 1009,
+	kCGErrorApplicationRequiresNewerSystem = 1015,
+	kCGErrorApplicationNotPermittedToExecute = 1016,
+	kCGErrorApplicationIncorrectExecutableFormatFound = 1023,
+	kCGErrorApplicationIsLaunching = 1024,
+	kCGErrorApplicationAlreadyRunning = 1025,
+	kCGErrorApplicationCanOnlyBeRunInOneSessionAtATime = 1026,
+	kCGErrorClassicApplicationsMustBeLaunchedByClassic = 1027,
+	kCGErrorForkFailed = 1028,
+	kCGErrorRetryRegistration = 1029,
+	kCGErrorFirst = 1000,
+	kCGErrorLast = 1029
+};
+typedef int32_t CGError;
+typedef double CGFloat;
+
+struct CGSize {
+	CGFloat width;
+	CGFloat height;
+};
+typedef struct CGSize CGSize;
+
+struct CGPoint {
+	float x;
+	float y;
+};
+typedef struct CGPoint CGPoint;
+
+struct CGRect {
+	CGPoint origin;
+	CGSize size;
+};
+typedef struct CGRect CGRect;
+
+typedef CGError CGDisplayErr;
+typedef uint32_t CGDirectDisplayID;
+typedef uint32_t CGDisplayCount;;
+typedef struct CGDisplayMode *CGDisplayModeRef;
+
 typedef Image<ColorRgb> CGImage;
 typedef CGImage* CGImageRef;
 typedef unsigned char CFData;
 typedef CFData* CFDataRef;
-typedef unsigned CGDisplayCount;

 const int kCGDirectMainDisplay = 0;

-void           CGGetActiveDisplayList(int max, CGDirectDisplayID *displays, CGDisplayCount *displayCount);
-CGImageRef     CGDisplayCreateImage(CGDirectDisplayID display);
-void           CGImageRelease(CGImageRef image);
-CGImageRef     CGImageGetDataProvider(CGImageRef image);
-CFDataRef      CGDataProviderCopyData(CGImageRef image);
-unsigned char* CFDataGetBytePtr(CFDataRef imgData);
-unsigned       CGImageGetWidth(CGImageRef image);
-unsigned       CGImageGetHeight(CGImageRef image);
-unsigned       CGImageGetBitsPerPixel(CGImageRef image);
-unsigned       CGImageGetBytesPerRow(CGImageRef image);
-void           CFRelease(CFDataRef imgData);
+CGError CGGetActiveDisplayList(uint32_t maxDisplays, CGDirectDisplayID *activeDisplays, uint32_t *displayCount);
+CGDisplayModeRef CGDisplayCopyDisplayMode(CGDirectDisplayID display);
+CGRect           CGDisplayBounds(CGDirectDisplayID display);
+void             CGDisplayModeRelease(CGDisplayModeRef mode);
+
+CGImageRef       CGDisplayCreateImage(CGDirectDisplayID display);
+void             CGImageRelease(CGImageRef image);
+CGImageRef       CGImageGetDataProvider(CGImageRef image);
+CFDataRef        CGDataProviderCopyData(CGImageRef image);
+unsigned char*   CFDataGetBytePtr(CFDataRef imgData);
+unsigned         CGImageGetWidth(CGImageRef image);
+unsigned         CGImageGetHeight(CGImageRef image);
+unsigned         CGImageGetBitsPerPixel(CGImageRef image);
+unsigned         CGImageGetBytesPerRow(CGImageRef image);
+void             CFRelease(CFDataRef imgData);
+

 #endif
--- a/include/grabber/OsxWrapper.h
+++ b/include/grabber/OsxWrapper.h
@@ -4,9 +4,8 @@
 #include <grabber/OsxFrameGrabber.h>

 ///
-/// The OsxWrapper uses an instance of the OsxFrameGrabber to obtain ImageRgb's from the
-/// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
-/// attached Hyperion.
+/// The OsxWrapper uses an instance of the OsxFrameGrabber to obtain ImageRgb's from the displayed content.
+/// This ImageRgb is processed to a ColorRgb for each led and committed to the attached Hyperion.
 ///
 class OsxWrapper: public GrabberWrapper
 {
@@ -15,12 +14,14 @@ public:
 	///
 	/// Constructs the osx frame grabber with a specified grab size and update rate.
 	///
-	/// @param[in] display Index of the display to grab
-	/// @param[in] grabWidth  The width of the grabbed image [pixels]
-	/// @param[in] grabHeight  The height of the grabbed images [pixels]
 	/// @param[in] updateRate_Hz  The image grab rate [Hz]
+	/// @param[in] display Index of the display to grab
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	///
-	OsxWrapper(unsigned display, unsigned grabWidth, unsigned grabHeight, unsigned updateRate_Hz);
+	OsxWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+				int display = kCGDirectMainDisplay,
+				int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION
+				);

 public slots:
 	///
--- a/include/grabber/QtGrabber.h
+++ b/include/grabber/QtGrabber.h
@@ -15,14 +15,13 @@ class QtGrabber : public Grabber
 {
 public:

-	QtGrabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display);
+	QtGrabber(int display=0, int cropLeft=0, int cropRight=0, int cropTop=0, int cropBottom=0);

 	~QtGrabber() override;

 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
-	/// provided image should have the same dimensions as the configured values (_width and
-	/// _height)
+	/// provided image should have the same dimensions as the configured values (_width and _height)
 	///
 	/// @param[out] image  The snapped screenshot (should be initialized with correct width and
 	/// height)
@@ -37,12 +36,12 @@ public:
 	///
 	/// @brief Apply new width/height values, overwrite Grabber.h implementation as qt doesn't use width/height, just pixelDecimation to calc dimensions
 	///
-	bool setWidthHeight(int width, int height) override { return true; }
+	bool setWidthHeight(int /*width*/, int /*height*/) override { return true; }

 	///
 	/// @brief Apply new pixelDecimation
 	///
-	void setPixelDecimation(int pixelDecimation) override;
+	bool setPixelDecimation(int pixelDecimation) override;

 	///
 	/// Set the crop values
@@ -51,14 +50,37 @@ public:
 	/// @param  cropTop     Top pixel crop
 	/// @param  cropBottom  Bottom pixel crop
 	///
-	void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
+	void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom) override;

 	///
 	/// @brief Apply display index
 	///
-	void setDisplayIndex(int index) override;
+	bool setDisplayIndex(int index) override;
+
+	///
+	/// @brief Discover QT screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);
+
+	///
+	/// @brief Setup a new capture display, will free the previous one
+	/// @return True on success, false if no display is found
+	///
+	bool setupDisplay();
+
+	///
+	/// @brief Opens the input device.
+	///
+	/// @return Zero, on success (i.e. device is ready), else negative
+	///
+	bool open();

 private slots:
+
 	///
 	/// @brief is called whenever the current _screen changes it's geometry
 	/// @param geo   The new geometry
@@ -66,11 +88,6 @@ private slots:
 	void geometryChanged(const QRect &geo);

 private:
-	///
-	/// @brief Setup a new capture display, will free the previous one
-	/// @return True on success, false if no display is found
-	///
-	bool setupDisplay();

 	///
 	/// @brief Is called whenever we need new screen dimension calculations based on window geometry
@@ -84,13 +101,19 @@ private:

 private:

-	unsigned _display;
-	int _pixelDecimation;
-	unsigned _screenWidth;
-	unsigned _screenHeight;
-	unsigned _src_x;
-	unsigned _src_y;
-	unsigned _src_x_max;
-	unsigned _src_y_max;
+	int _display;
+	int _numberOfSDisplays;
+
+	int _calculatedWidth;
+	int _calculatedHeight;
+	int _src_x;
+	int _src_y;
+	int _src_x_max;
+	int _src_y_max;
+	bool _isWayland;
+
 	QScreen* _screen;
+	bool _isVirtual;
+
+	Logger * _logger;
 };
--- a/include/grabber/QtWrapper.h
+++ b/include/grabber/QtWrapper.h
@@ -10,16 +10,28 @@ class QtWrapper: public GrabberWrapper
 {
 public:
 	///
-	/// Constructs the framebuffer frame grabber with a specified grab size and update rate.
+	/// Constructs the QT frame grabber with a specified grab size and update rate.
 	///
+	/// @param[in] updateRate_Hz     The image grab rate [Hz]
+	/// @param[in] display           Display to be grabbed
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	/// @param[in] cropLeft          Remove from left [pixels]
 	/// @param[in] cropRight 	     Remove from right [pixels]
 	/// @param[in] cropTop           Remove from top [pixels]
 	/// @param[in] cropBottom        Remove from bottom [pixels]
-	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
-	/// @param[in] updateRate_Hz     The image grab rate [Hz]
+
 	///
-	QtWrapper(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display, unsigned updateRate_Hz);
+	QtWrapper( int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+			   int display=0,
+			   int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
+			   int cropLeft=0, int cropRight=0,
+			   int cropTop=0, int cropBottom=0
+			   );
+
+	///
+	/// Starts the grabber which produces led values with the specified update rate
+	///
+	bool open() override;

 public slots:
 	///
--- a/include/grabber/V4L2Grabber.h
+++ b/include/grabber/V4L2Grabber.h
@@ -14,30 +14,24 @@
 // util includes
 #include <utils/PixelFormat.h>
 #include <hyperion/Grabber.h>
-#include <grabber/VideoStandard.h>
+#include <hyperion/GrabberWrapper.h>
+#include <utils/VideoStandard.h>
 #include <utils/Components.h>
-#include <cec/CECEvent.h>

-// general JPEG decoder includes
-#ifdef HAVE_JPEG_DECODER
-	#include <QImage>
-	#include <QColor>
-#endif
-
-// System JPEG decoder
-#ifdef HAVE_JPEG
-	#include <jpeglib.h>
-	#include <csetjmp>
-#endif
-
-// TurboJPEG decoder
-#ifdef HAVE_TURBO_JPEG
-	#include <turbojpeg.h>
+// decoder thread includes
+#include <grabber/EncoderThread.h>
+
+// Determine the cmake options
+#include <HyperionConfig.h>
+
+#if defined(ENABLE_CEC)
+	#include <cec/CECEvent.h>
 #endif

+///
 /// Capture class for V4L2 devices
 ///
-/// @see http://linuxtv.org/downloads/v4l-dvb-apis/capture-example.html
+
 class V4L2Grabber : public Grabber
 {
 	Q_OBJECT
@@ -45,118 +39,67 @@ class V4L2Grabber : public Grabber
 public:
 	struct DeviceProperties
 	{
-		QString					name		= QString();
-		QMultiMap<QString, int>	inputs		= QMultiMap<QString, int>();
-		QStringList				resolutions	= QStringList();
-		QStringList				framerates	= QStringList();
+		QString name = QString();
+		struct InputProperties
+		{
+			QString inputName = QString();
+			QList<VideoStandard> standards = QList<VideoStandard>();
+			struct EncodingProperties
+			{
+				int width		= 0;
+				int height		= 0;
+				QList<int> framerates	= QList<int>();
+			};
+			QMultiMap<PixelFormat, EncodingProperties> encodingFormats = QMultiMap<PixelFormat, EncodingProperties>();
+		};
+		QMap<int, InputProperties> inputs = QMap<int, InputProperties>();
 	};

-	V4L2Grabber(const QString & device,
-			const unsigned width,
-			const unsigned height,
-			const unsigned fps,
-			const unsigned input,
-			VideoStandard videoStandard,
-			PixelFormat pixelFormat,
-			int pixelDecimation
-	);
+	struct DeviceControls
+	{
+		QString property = QString();
+		int minValue = 0;
+		int maxValue = 0;
+		int step = 0;
+		int defaultValue = 0;
+		int currentValue = 0;
+	};
+
+	V4L2Grabber();
 	~V4L2Grabber() override;

-	QRectF getSignalDetectionOffset() const
-	{
-		return QRectF(_x_frac_min, _y_frac_min, _x_frac_max, _y_frac_max);
-	}
-
-	bool getSignalDetectionEnabled() const { return _signalDetectionEnabled; }
-	bool getCecDetectionEnabled() const { return _cecDetectionEnabled; }
-
 	int grabFrame(Image<ColorRgb> &);
-
-	///
-	/// @brief  set new PixelDecimation value to ImageResampler
-	/// @param  pixelDecimation  The new pixelDecimation value
-	///
-	void setPixelDecimation(int pixelDecimation) override;
-
-	///
-	/// @brief  overwrite Grabber.h implementation
-	///
-	void setSignalThreshold(
-					double redSignalThreshold,
-					double greenSignalThreshold,
-					double blueSignalThreshold,
-					int noSignalCounterThreshold = 50) override;
-
-	///
-	/// @brief  overwrite Grabber.h implementation
-	///
-	void setSignalDetectionOffset(
-					double verticalMin,
-					double horizontalMin,
-					double verticalMax,
-					double horizontalMax) override;
-	///
-	/// @brief  overwrite Grabber.h implementation
-	///
-	void setSignalDetectionEnable(bool enable) override;
-
-	///
-	/// @brief  overwrite Grabber.h implementation
-	///
-	void setCecDetectionEnable(bool enable) override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
-	void setDeviceVideoStandard(QString device, VideoStandard videoStandard) override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
+	void setDevice(const QString& devicePath, const QString& deviceName);
 	bool setInput(int input) override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
 	bool setWidthHeight(int width, int height) override;
+	void setEncoding(QString enc);
+	void setBrightnessContrastSaturationHue(int brightness, int contrast, int saturation, int hue);
+	void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold, int noSignalCounterThreshold = 50);
+	void setSignalDetectionOffset( double verticalMin, double horizontalMin, double verticalMax, double horizontalMax);
+	void setSignalDetectionEnable(bool enable);
+	void setCecDetectionEnable(bool enable);
+	bool reload(bool force = false);
+
+	QRectF getSignalDetectionOffset() const { return QRectF(_x_frac_min, _y_frac_min, _x_frac_max, _y_frac_max); } //used from hyperion-v4l2
+
+

 	///
-	/// @brief overwrite Grabber.h implementation
+	/// @brief Discover available V4L2 USB devices (for configuration).
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	/// @return A JSON structure holding a list of USB devices found
 	///
-	bool setFramerate(int fps) override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
-	QStringList getV4L2devices() const override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
-	QString getV4L2deviceName(const QString& devicePath) const override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
-	QMultiMap<QString, int> getV4L2deviceInputs(const QString& devicePath) const override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
-	QStringList getResolutions(const QString& devicePath) const override;
-
-	///
-	/// @brief overwrite Grabber.h implementation
-	///
-	QStringList getFramerates(const QString& devicePath) const override;
+	QJsonArray discover(const QJsonObject& params);

 public slots:
-
+	bool prepare();
 	bool start();
-
 	void stop();
+	void newThreadFrame(Image<ColorRgb> image);

+#if defined(ENABLE_CEC)
 	void handleCecEvent(CECEvent event);
+#endif

 signals:
 	void newFrame(const Image<ColorRgb> & image);
@@ -166,36 +109,19 @@ private slots:
 	int read_frame();

 private:
-	void getV4Ldevices();
-
 	bool init();
-
 	void uninit();
-
 	bool open_device();
-
 	void close_device();
-
 	void init_read(unsigned int buffer_size);
-
 	void init_mmap();
-
 	void init_userp(unsigned int buffer_size);
-
 	void init_device(VideoStandard videoStandard);
-
 	void uninit_device();
-
 	void start_capturing();
-
 	void stop_capturing();
-
 	bool process_image(const void *p, int size);
-
-	void process_image(const uint8_t *p, int size);
-
 	int xioctl(int request, void *arg);
-
 	int xioctl(int fileDescriptor, int request, void *arg);

 	void throw_exception(const QString & error)
@@ -222,56 +148,28 @@ private:
 			size_t  length;
 	};

-#ifdef HAVE_JPEG
-	struct errorManager
-	{
-		jpeg_error_mgr pub;
-		jmp_buf setjmp_buffer;
-	};
-
-	static void errorHandler(j_common_ptr cInfo)
-	{
-		errorManager* mgr = reinterpret_cast<errorManager*>(cInfo->err);
-		longjmp(mgr->setjmp_buffer, 1);
-	}
-
-	static void outputHandler(j_common_ptr cInfo)
-	{
-		// Suppress fprintf warnings.
-	}
-
-	jpeg_decompress_struct* _decompress;
-	errorManager* _error;
-#endif
-
-#ifdef HAVE_TURBO_JPEG
-	tjhandle _decompress = nullptr;
-	int _subsamp;
-#endif
-
 private:
-	QString _deviceName;
-	std::map<QString, QString> _v4lDevices;
+	QString _currentDevicePath, _currentDeviceName;
+	EncoderThreadManager* _threadManager;
 	QMap<QString, V4L2Grabber::DeviceProperties> _deviceProperties;
+	QMap<QString, QList<DeviceControls>> _deviceControls;

-	VideoStandard       _videoStandard;
 	io_method           _ioMethod;
 	int                 _fileDescriptor;
 	std::vector<buffer> _buffers;

-	PixelFormat _pixelFormat;
-	int         _pixelDecimation;
+	PixelFormat _pixelFormat, _pixelFormatConfig;
 	int         _lineLength;
 	int         _frameByteSize;

+	QAtomicInt _currentFrame;
+
 	// signal detection
 	int      _noSignalCounterThreshold;
 	ColorRgb _noSignalThresholdColor;
-	bool     _signalDetectionEnabled;
-	bool     _cecDetectionEnabled;
-	bool     _cecStandbyActivated;
-	bool     _noSignalDetected;
+	bool     _cecDetectionEnabled, _cecStandbyActivated, _signalDetectionEnabled, _noSignalDetected;
 	int      _noSignalCounter;
+	int		_brightness, _contrast, _saturation, _hue;
 	double   _x_frac_min;
 	double   _y_frac_min;
 	double   _x_frac_max;
@@ -279,9 +177,9 @@ private:

 	QSocketNotifier *_streamNotifier;

-	bool _initialized;
-	bool _deviceAutoDiscoverEnabled;
+	bool _initialized, _reload;

 protected:
-	void enumFrameIntervals(QStringList &framerates, int fileDescriptor, int pixelformat, int width, int height);
+	void enumVideoCaptureDevices();
+	void enumFrameIntervals(QList<int> &framerates, int fileDescriptor, int pixelformat, int width, int height);
 };
--- a/include/grabber/V4L2Wrapper.h
+++ b/include/grabber/V4L2Wrapper.h
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <hyperion/GrabberWrapper.h>
-#include <grabber/V4L2Grabber.h>
-
-class V4L2Wrapper : public GrabberWrapper
-{
-	Q_OBJECT
-
-public:
-	V4L2Wrapper(const QString & device,
-			const unsigned grabWidth,
-			const unsigned grabHeight,
-			const unsigned fps,
-			const unsigned input,
-			VideoStandard videoStandard,
-			PixelFormat pixelFormat,
-			int pixelDecimation );
-	~V4L2Wrapper() override;
-
-	bool getSignalDetectionEnable() const;
-	bool getCecDetectionEnable() const;
-
-public slots:
-	bool start() override;
-	void stop() override;
-
-	void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold);
-	void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
-	void setSignalDetectionOffset(double verticalMin, double horizontalMin, double verticalMax, double horizontalMax);
-	void setSignalDetectionEnable(bool enable);
-	void setCecDetectionEnable(bool enable);
-	void setDeviceVideoStandard(const QString& device, VideoStandard videoStandard);
-	void handleCecEvent(CECEvent event);
-	void handleSettingsUpdate(settings::type type, const QJsonDocument& config) override;
-
-private slots:
-	void newFrame(const Image<ColorRgb> & image);
-	void readError(const char* err);
-
-	void action() override;
-
-private:
-	/// The V4L2 grabber
-	V4L2Grabber _grabber;
-};
--- a/include/grabber/VideoStandard.h
+++ b/include/grabber/VideoStandard.h
@@ -1,33 +0,0 @@
-#pragma once
-
-/**
- * Enumeration of the possible video standards the grabber can be set to
- */
-enum class VideoStandard {
-	PAL,
-	NTSC,
-	SECAM,
-	NO_CHANGE
-};
-
-inline VideoStandard parseVideoStandard(const QString& videoStandard)
-{
-	// convert to lower case
-	QString standard = videoStandard.toLower();
-
-	if (standard == "pal")
-	{
-		return VideoStandard::PAL;
-	}
-	else if (standard == "ntsc")
-	{
-		return VideoStandard::NTSC;
-	}
-	else if (standard == "secam")
-	{
-		return VideoStandard::SECAM;
-	}
-
-	// return the default NO_CHANGE
-	return VideoStandard::NO_CHANGE;
-}
--- a/include/grabber/VideoWrapper.h
+++ b/include/grabber/VideoWrapper.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <HyperionConfig.h> // Required to determine the cmake options
+#include <hyperion/GrabberWrapper.h>
+
+#if defined(ENABLE_MF)
+	#include <grabber/MFGrabber.h>
+#elif defined(ENABLE_V4L2)
+	#include <grabber/V4L2Grabber.h>
+#endif
+
+#if defined(ENABLE_CEC)
+	#include <cec/CECEvent.h>
+#endif
+
+class VideoWrapper : public GrabberWrapper
+{
+	Q_OBJECT
+
+public:
+	VideoWrapper();
+	~VideoWrapper() override;
+
+public slots:
+	bool start() override;
+	void stop() override;
+
+#if defined(ENABLE_CEC)
+	void handleCecEvent(CECEvent event);
+#endif
+
+	void handleSettingsUpdate(settings::type type, const QJsonDocument& config) override;
+
+private slots:
+	void newFrame(const Image<ColorRgb> & image);
+	void readError(const char* err);
+
+	void action() override;
+
+private:
+	/// The Media Foundation or V4L2 grabber
+#if defined(ENABLE_MF)
+	MFGrabber _grabber;
+#elif defined(ENABLE_V4L2)
+	V4L2Grabber _grabber;
+#endif
+};
--- a/include/grabber/X11Grabber.h
+++ b/include/grabber/X11Grabber.h
@@ -2,7 +2,13 @@
 #include <QAbstractEventDispatcher>
 #include <QAbstractNativeEventFilter>
 #include <QCoreApplication>
+
+// QT includes
 #include <QObject>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonDocument>
+

 // Hyperion-utils includes
 #include <utils/ColorRgb.h>
@@ -20,11 +26,13 @@ class X11Grabber : public Grabber , public QAbstractNativeEventFilter
 {
 public:

-	X11Grabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation);
+	X11Grabber(int cropLeft=0, int cropRight=0, int cropTop=0, int cropBottom=0);

 	~X11Grabber() override;

-	bool Setup();
+	bool open();
+
+	bool setupDisplay();

 	///
 	/// Captures a single snapshot of the display and writes the data to the given image. The
@@ -50,7 +58,7 @@ public:
 	///
 	/// @brief Apply new pixelDecimation
 	///
-	void setPixelDecimation(int pixelDecimation) override;
+	bool setPixelDecimation(int pixelDecimation) override;

 	///
 	/// Set the crop values
@@ -59,22 +67,33 @@ public:
 	/// @param  cropTop     Top pixel crop
 	/// @param  cropBottom  Bottom pixel crop
 	///
-	void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
+	void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom) override;
+
+	///
+	/// @brief Discover X11 screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);

 protected:
 	bool nativeEventFilter(const QByteArray & eventType, void * message, long int * result) override;

 private:
-	bool _XShmAvailable, _XShmPixmapAvailable, _XRenderAvailable,  _XRandRAvailable;

-	XImage* _xImage;
-	XShmSegmentInfo _shminfo;
+	void freeResources();
+	void setupResources();

 	/// Reference to the X11 display (nullptr if not opened)
 	Display* _x11Display;
 	Window _window;
 	XWindowAttributes _windowAttr;

+	XImage* _xImage;
+	XShmSegmentInfo _shminfo;
+
 	Pixmap _pixmap;
 	XRenderPictFormat* _srcFormat;
 	XRenderPictFormat* _dstFormat;
@@ -85,15 +104,19 @@ private:
 	int _XRandREventBase;

 	XTransform _transform;
-	int _pixelDecimation;

-	unsigned _screenWidth;
-	unsigned _screenHeight;
+	unsigned _calculatedWidth;
+	unsigned _calculatedHeight;
 	unsigned _src_x;
 	unsigned _src_y;

-	Image<ColorRgb> _image;
+	bool _XShmAvailable;
+	bool _XShmPixmapAvailable;
+	bool _XRenderAvailable;
+	bool _XRandRAvailable;
+	bool _isWayland;

-	void freeResources();
-	void setupResources();
+	Logger * _logger;
+
+	Image<ColorRgb> _image;
 };
--- a/include/grabber/X11Wrapper.h
+++ b/include/grabber/X11Wrapper.h
@@ -9,25 +9,26 @@


 ///
-/// The X11Wrapper uses an instance of the X11Grabber to obtain ImageRgb's from the
-/// displayed content. This ImageRgb is processed to a ColorRgb for each led and commmited to the
-/// attached Hyperion.
+/// The X11Wrapper uses an instance of the X11Grabber to obtain ImageRgb's from the displayed content.
+/// This ImageRgb is processed to a ColorRgb for each led and committed to the attached Hyperion.
 ///
 class X11Wrapper: public GrabberWrapper
 {
 public:
 	///
-	/// Constructs the framebuffer frame grabber with a specified grab size and update rate.
+	/// Constructs the X11 frame grabber with a specified grab size and update rate.
 	///
-	/// @param[in] device X11 device name/path
-	/// @param[in] grabWidth  The width of the grabbed image [pixels]
-	/// @param[in] grabHeight  The height of the grabbed images [pixels]
 	/// @param[in] updateRate_Hz  The image grab rate [Hz]
+	/// @param[in] pixelDecimation   Decimation factor for image [pixels]
 	///
-	X11Wrapper(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, unsigned updateRate_Hz);
+	X11Wrapper(	int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+				int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
+				int cropLeft=0, int cropRight=0,
+				int cropTop=0, int cropBottom=0
+				);

 	///
-	/// Destructor of this framebuffer frame grabber. Releases any claimed resources.
+	/// Destructor of this frame grabber. Releases any claimed resources.
 	///
 	~X11Wrapper() override;

--- a/include/grabber/XcbGrabber.h
+++ b/include/grabber/XcbGrabber.h
@@ -1,7 +1,11 @@
 #pragma once

 #include <QAbstractNativeEventFilter>
+// QT includes
 #include <QObject>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonDocument>

 #include <utils/ColorRgb.h>
 #include <hyperion/Grabber.h>
@@ -21,16 +25,28 @@ class XcbGrabber : public Grabber, public QAbstractNativeEventFilter
 	Q_OBJECT

 public:
-	XcbGrabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation);
+	XcbGrabber(int cropLeft=0, int cropRight=0, int cropTop=0, int cropBottom=0);
+
 	~XcbGrabber() override;

-	bool Setup();
+	bool open();
+	bool setupDisplay();
+
 	int grabFrame(Image<ColorRgb> & image, bool forceUpdate = false);
 	int updateScreenDimensions(bool force = false);
 	void setVideoMode(VideoMode mode) override;
 	bool setWidthHeight(int width, int height) override { return true; }
-	void setPixelDecimation(int pixelDecimation) override;
-	void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom) override;
+	bool setPixelDecimation(int pixelDecimation) override;
+	void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom) override;
+
+	///
+	/// @brief Discover XCB screens available (for configuration).
+	///
+	/// @param[in] params Parameters used to overwrite discovery default behaviour
+	///
+	/// @return A JSON structure holding a list of devices found
+	///
+	QJsonObject discover(const QJsonObject& params);

 private:
 	bool nativeEventFilter(const QByteArray & eventType, void * message, long int * result) override;
@@ -52,8 +68,7 @@ private:
 	xcb_render_transform_t _transform;
 	xcb_shm_seg_t  _shminfo;

-	int _pixelDecimation;
-
+	int _screen_num;
 	unsigned _screenWidth;
 	unsigned _screenHeight;
 	unsigned _src_x;
@@ -63,6 +78,8 @@ private:
 	bool _XcbRandRAvailable;
 	bool _XcbShmAvailable;
 	bool _XcbShmPixmapAvailable;
+	bool _isWayland;
+
 	Logger * _logger;

 	uint8_t * _shmData;
--- a/include/grabber/XcbWrapper.h
+++ b/include/grabber/XcbWrapper.h
@@ -11,7 +11,12 @@
 class XcbWrapper: public GrabberWrapper
 {
 public:
-	XcbWrapper(int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, const unsigned updateRate_Hz);
+	XcbWrapper(	int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
+				int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
+				int cropLeft=0, int cropRight=0,
+				int cropTop=0, int cropBottom=0
+				);
+
 	~XcbWrapper() override;

 public slots: