Commits from @MartB and more ...

- Commit: 1d9165f403
- New default QT capture implementation
- UploadHandler added to Effects Configurator to allow uploading GIF files
- Docker compile script and instruction
- Travis Fix

src/hyperion-qt/CMakeLists.txt

@@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.0.0)
+project(hyperion-qt)
+
+find_package(Qt5Widgets REQUIRED)
+
+include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/flatbufserver
+	${FLATBUFFERS_INCLUDE_DIRS}
+)
+
+set(Hyperion_QT_HEADERS
+	QtWrapper.h
+)
+
+set(Hyperion_QT_SOURCES
+	QtWrapper.cpp
+	hyperion-qt.cpp
+)
+
+add_executable(${PROJECT_NAME}
+	${Hyperion_QT_HEADERS}
+	${Hyperion_QT_SOURCES}
+)
+
+target_link_libraries(${PROJECT_NAME}
+	commandline
+	qt-grabber
+	flatbufserver
+	flatbuffers
+	ssdp
+	Qt5::Core
+	Qt5::Widgets
+	Qt5::Network
+)
+
+install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
+
+if(CMAKE_HOST_UNIX)
+	install(CODE "EXECUTE_PROCESS(COMMAND ln -sf \"../share/hyperion/bin/${PROJECT_NAME}\" \"${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}\" )" COMPONENT  "${PLATFORM}" )
+	install(FILES "${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}" DESTINATION "bin" RENAME "${PROJECT_NAME}" COMPONENT "${PLATFORM}" )
+	install(CODE "FILE (REMOVE ${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME} )" COMPONENT  "${PLATFORM}" )
+endif(CMAKE_HOST_UNIX)

src/hyperion-qt/QtWrapper.cpp

@@ -0,0 +1,42 @@
+
+// Hyperion-qt includes
+#include "QtWrapper.h"
+
+QtWrapper::QtWrapper(int grabInterval, int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display) :
+	_timer(this),
+	_grabber(cropLeft, cropRight, cropTop, cropBottom, pixelDecimation, display)
+{
+	_timer.setInterval(grabInterval);
+	// Connect capturing to the timeout signal of the timer
+	connect(&_timer, SIGNAL(timeout()), this, SLOT(capture()));
+}
+
+const Image<ColorRgb> & QtWrapper::getScreenshot()
+{
+	_grabber.grabFrame(_screenshot);
+	return _screenshot;
+}
+
+void QtWrapper::start()
+{
+	_timer.start();
+}
+
+void QtWrapper::stop()
+{
+	_timer.stop();
+}
+
+void QtWrapper::capture()
+{
+	if(unsigned(_grabber.getImageWidth()) != unsigned(_screenshot.width()) || unsigned(_grabber.getImageHeight()) != unsigned(_screenshot.height()))
+		_screenshot.resize(_grabber.getImageWidth(),_grabber.getImageHeight());
+
+	_grabber.grabFrame(_screenshot);
+	emit sig_screenshot(_screenshot);
+}
+
+void QtWrapper::setVideoMode(const VideoMode mode)
+{
+	_grabber.setVideoMode(mode);
+}

src/hyperion-qt/QtWrapper.h

@@ -0,0 +1,51 @@
+
+// QT includes
+#include <QTimer>
+
+// Hyperion-Qt includes
+#include <grabber/QtGrabber.h>
+
+//Utils includes
+#include <utils/VideoMode.h>
+
+class QtWrapper : public QObject
+{
+	Q_OBJECT
+public:
+	QtWrapper(int grabInterval, int cropLeft, int cropRight, int cropTop, int cropBottom, int pixelDecimation, int display);
+
+	const Image<ColorRgb> & getScreenshot();
+
+	///
+	/// Starts the timed capturing of screenshots
+	///
+	void start();
+
+	void stop();
+
+signals:
+	void sig_screenshot(const Image<ColorRgb> & screenshot);
+
+public slots:
+	///
+	/// Set the video mode (2D/3D)
+	/// @param[in] mode The new video mode
+	///
+	void setVideoMode(const VideoMode videoMode);
+
+private slots:
+	///
+	/// Performs a single screenshot capture and publishes the capture screenshot on the screenshot
+	/// signal.
+	///
+	void capture();
+
+private:
+	/// The QT timer to generate capture-publish events
+	QTimer _timer;
+
+	/// The grabber for creating screenshots
+	QtGrabber _grabber;
+
+	Image<ColorRgb>  _screenshot;
+};

src/hyperion-qt/hyperion-qt.cpp

@@ -0,0 +1,111 @@
+
+// QT includes
+#include <QCoreApplication>
+#include <QImage>
+
+#include "QtWrapper.h"
+#include <utils/ColorRgb.h>
+#include <utils/Image.h>
+#include <commandline/Parser.h>
+
+//flatbuf sending
+#include <flatbufserver/FlatBufferConnection.h>
+
+// ssdp discover
+#include <ssdp/SSDPDiscover.h>
+
+using namespace commandline;
+
+// save the image as screenshot
+void saveScreenshot(QString filename, const Image<ColorRgb> & image)
+{
+	// store as PNG
+	QImage pngImage((const uint8_t *) image.memptr(), image.width(), image.height(), 3*image.width(), QImage::Format_RGB888);
+	pngImage.save(filename);
+}
+
+int main(int argc, char ** argv)
+{
+	//QCoreApplication app(argc, argv);
+	QGuiApplication app(argc, argv);
+
+	try
+	{
+		// create the option parser and initialize all parameters
+		Parser parser("Qt interface capture application for Hyperion");
+
+		Option        & argDisplay         = parser.add<Option>       ('d', "display",    "Set the display to capture [default: %1]","0");
+		IntOption     & argFps             = parser.add<IntOption>    ('f', "framerate",  "Capture frame rate [default: %1]", "10", 1, 25);
+		IntOption     & argCropLeft        = parser.add<IntOption>    (0x0, "crop-left", "Number of pixels to crop from the left of the picture before decimation (overrides --crop-width)");
+		IntOption     & argCropRight       = parser.add<IntOption>    (0x0, "crop-right", "Number of pixels to crop from the right of the picture before decimation (overrides --crop-width)");
+		IntOption     & argCropTop         = parser.add<IntOption>    (0x0, "crop-top", "Number of pixels to crop from the top of the picture before decimation (overrides --crop-height)");
+		IntOption     & argCropBottom      = parser.add<IntOption>    (0x0, "crop-bottom", "Number of pixels to crop from the bottom of the picture before decimation (overrides --crop-height)");
+		IntOption     & argSizeDecimation  = parser.add<IntOption>    ('s', "size-decimator", "Decimation factor for the output image size [default=%1]", "8", 1);
+		BooleanOption & argScreenshot      = parser.add<BooleanOption>(0x0, "screenshot",   "Take a single screenshot, save it to file and quit");
+		Option        & argAddress         = parser.add<Option>       ('a', "address",    "Set the address of the hyperion server [default: %1]", "127.0.0.1:19445");
+		IntOption     & argPriority        = parser.add<IntOption>    ('p', "priority",   "Use the provided priority channel (suggested 100-199) [default: %1]", "150");
+		BooleanOption & argSkipReply       = parser.add<BooleanOption>(0x0, "skip-reply", "Do not receive and check reply messages from Hyperion");
+		BooleanOption & argHelp            = parser.add<BooleanOption>('h', "help",        "Show this help message and exit");
+
+		// parse all arguments
+		parser.process(app);
+
+		// check if we need to display the usage. exit if we do.
+		if (parser.isSet(argHelp))
+		{
+			parser.showHelp(0);
+		}
+
+		QtWrapper grabber(
+			1000 / argFps.getInt(parser),
+			argCropLeft.getInt(parser),
+			argCropRight.getInt(parser),
+			argCropTop.getInt(parser),
+			argCropBottom.getInt(parser),
+			argSizeDecimation.getInt(parser),
+			parser.isSet(argDisplay));
+
+		if (parser.isSet(argScreenshot))
+		{
+			// Capture a single screenshot and finish
+			const Image<ColorRgb> &screenshot = grabber.getScreenshot();
+			saveScreenshot("screenshot.png", screenshot);
+		}
+		else
+		{
+			// server searching by ssdp
+			QString address;
+			if(parser.isSet(argAddress))
+			{
+				address = argAddress.value(parser);
+			}
+			else
+			{
+				SSDPDiscover discover;
+				address = discover.getFirstService(STY_FLATBUFSERVER);
+				if(address.isEmpty())
+				{
+					address = argAddress.value(parser);
+				}
+			}
+			// Create the Flabuf-connection
+			FlatBufferConnection flatbuf("Qt Standalone", address, argPriority.getInt(parser), parser.isSet(argSkipReply));
+
+			// Connect the screen capturing to flatbuf connection processing
+			QObject::connect(&grabber, SIGNAL(sig_screenshot(const Image<ColorRgb> &)), &flatbuf, SLOT(setImage(Image<ColorRgb>)));
+
+			// Start the capturing
+			grabber.start();
+
+			// Start the application
+			app.exec();
+		}
+	}
+	catch (const std::runtime_error & e)
+	{
+		// An error occured. Display error and quit
+		Error(Logger::getInstance("QTGRABBER"), "%s", e.what());
+		return -1;
+	}
+	return 0;
+}

src/hyperiond/CMakeLists.txt

@@ -1,4 +1,4 @@
-find_package(PythonLibs 3.5 REQUIRED)
+find_package(PythonLibs 3.4 REQUIRED)
 include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}/..)
 
 add_executable(hyperiond
@@ -55,7 +55,9 @@ if (ENABLE_X11)
 	target_link_libraries(hyperiond	x11-grabber	)
 endif ()
 
-qt5_use_modules(hyperiond Core Gui Network Widgets)
+if (ENABLE_QT)
+	target_link_libraries(hyperiond	qt-grabber	)
+endif ()
 
 install ( TARGETS hyperiond DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
 install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/service DESTINATION "share/hyperion/" COMPONENT  "${PLATFORM}" )

src/hyperiond/hyperiond.cpp

@@ -60,6 +60,7 @@ HyperionDaemon::HyperionDaemon(QString configFile, const QString rootPath, QObje
 	, _amlGrabber(nullptr)
 	, _fbGrabber(nullptr)
 	, _osxGrabber(nullptr)
+	, _qtGrabber(nullptr)
 	, _hyperion(nullptr)
 	, _stats(nullptr)
 	, _ssdp(nullptr)
@@ -155,7 +156,8 @@ void HyperionDaemon::freeObjects()
 	delete _dispmanx;
 	delete _fbGrabber;
 	delete _osxGrabber;
-	
+	delete _qtGrabber;
+
 	for(V4L2Wrapper* grabber : _v4l2Grabbers)
 	{
 		delete grabber;
@@ -168,6 +170,7 @@ void HyperionDaemon::freeObjects()
 	_dispmanx       = nullptr;
 	_fbGrabber      = nullptr;
 	_osxGrabber     = nullptr;
+	_qtGrabber      = nullptr;
 	_webserver      = nullptr;
 	_jsonServer     = nullptr;
 	_udpListener    = nullptr;
@@ -269,10 +272,10 @@ void HyperionDaemon::handleSettingsUpdate(const settings::type& type, const QJso
 			{
 				type = "x11";
 			}
-			// framebuffer -> if nothing other applies
+			// qt -> if nothing other applies
 			else
 			{
-				type = "framebuffer";
+				type = "qt";
 			}
 		}
 
@@ -296,6 +299,9 @@ void HyperionDaemon::handleSettingsUpdate(const settings::type& type, const QJso
 			#ifdef ENABLE_X11
 			if(_x11Grabber != nullptr) _x11Grabber->stop();
 			#endif
+			#ifdef ENABLE_QT
+			if(_qtGrabber != nullptr) _qtGrabber->stop();
+			#endif
 
 			// create/start capture interface
 			if(type == "framebuffer")
@@ -338,6 +344,19 @@ void HyperionDaemon::handleSettingsUpdate(const settings::type& type, const QJso
 				_x11Grabber->start();
 				#endif
 			}
+			else if(type == "qt")
+			{
+				if(_qtGrabber == nullptr)
+					createGrabberQt(grabberConfig);
+				#ifdef ENABLE_QT
+				_qtGrabber->start();
+				#endif
+			}
+			else
+			{
+				Error(_log,"Unknown platform capture type: %s", QSTRING_CSTR(type));
+				return;
+			}
 			_prevType = type;
 		}
 	}
@@ -446,6 +465,24 @@ void HyperionDaemon::createGrabberX11(const QJsonObject & grabberConfig)
 #endif
 }
 
+void HyperionDaemon::createGrabberQt(const QJsonObject & grabberConfig)
+{
+#ifdef ENABLE_QT
+	_qtGrabber = new QtWrapper(
+				_grabber_cropLeft, _grabber_cropRight, _grabber_cropTop, _grabber_cropBottom,
+				grabberConfig["pixelDecimation"].toInt(8),
+				grabberConfig["display"].toInt(0),
+				_grabber_frequency );
+
+	// connect to HyperionDaemon signal
+	connect(this, &HyperionDaemon::videoMode, _qtGrabber, &QtWrapper::setVideoMode);
+	connect(this, &HyperionDaemon::settingsChanged, _qtGrabber, &QtWrapper::handleSettingsUpdate);
+
+	Info(_log, "Qt grabber created");
+#else
+	Error(_log, "The Qt grabber can not be instantiated, because it has been left out from the build");
+#endif
+}
 
 void HyperionDaemon::createGrabberFramebuffer(const QJsonObject & grabberConfig)
 {

src/hyperiond/hyperiond.h

@@ -39,6 +39,12 @@
 	typedef QObject X11Wrapper;
 #endif
 
+#ifdef ENABLE_QT
+	#include <grabber/QtWrapper.h>
+#else
+	typedef QObject QtWrapper;
+#endif
+
 #include <utils/Logger.h>
 #include <utils/Image.h>
 #include <utils/VideoMode.h>
@@ -122,6 +128,7 @@ private:
 	void createGrabberFramebuffer(const QJsonObject & grabberConfig);
 	void createGrabberOsx(const QJsonObject & grabberConfig);
 	void createGrabberX11(const QJsonObject & grabberConfig);
+	void createGrabberQt(const QJsonObject & grabberConfig);
 
 	Logger*                _log;
 	BonjourBrowserWrapper* _bonjourBrowserWrapper;
@@ -135,6 +142,7 @@ private:
 	AmlogicWrapper*        _amlGrabber;
 	FramebufferWrapper*    _fbGrabber;
 	OsxWrapper*            _osxGrabber;
+	QtWrapper*             _qtGrabber;
 	Hyperion*              _hyperion;
 	Stats*                 _stats;
 	SSDPHandler*           _ssdp;