Merge branch 'add_aml_grabber'

Author: tvdzwan

CMakeLists.txt

@@ -7,37 +7,40 @@ cmake_minimum_required(VERSION 2.8)
 #set(CMAKE_TOOLCHAIN_FILE /opt/raspberrypi/Toolchain-RaspberryPi.cmake)
 
 # set the build options
+option(ENABLE_AMLOGIC "Enable the AMLOGIC video grabber" OFF)
+message(STATUS "ENABLE_AMLOGIC = " ${ENABLE_AMLOGIC})
+
 option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ON)
 message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
 
+option(ENABLE_FB "Enable the framebuffer grabber" OFF)
+message(STATUS "ENABLE_FB = " ${ENABLE_FB})
+
+option(ENABLE_OSX "Enable the osx grabber" OFF)
+message(STATUS "ENABLE_OSX = " ${ENABLE_OSX})
+
+option(ENABLE_PROTOBUF "Enable PROTOBUF server" ON)
+message(STATUS "ENABLE_PROTOBUF = " ${ENABLE_PROTOBUF})
+
 option(ENABLE_SPIDEV   "Enable the SPIDEV device" ON)
 message(STATUS "ENABLE_SPIDEV   = " ${ENABLE_SPIDEV})
 
-option(ENABLE_WS2812BPWM   "Enable the WS2812b-PWM device" OFF)
-message(STATUS "ENABLE_WS2812BPWM = " ${ENABLE_WS2812BPWM})
+option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
+message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
 
 option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
 message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 
+option(ENABLE_WS2812BPWM   "Enable the WS2812b-PWM device" OFF)
+message(STATUS "ENABLE_WS2812BPWM = " ${ENABLE_WS2812BPWM})
+
 option(ENABLE_X11 "Enable the X11 grabber" OFF)
 message(STATUS "ENABLE_X11 = " ${ENABLE_X11})
 
-option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
-message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
-
-option(ENABLE_PROTOBUF "Enable PROTOBUF server" ON)
-message(STATUS "ENABLE_PROTOBUF = " ${ENABLE_PROTOBUF})
-
 if(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
 	message(FATAL_ERROR "V4L2 grabber requires PROTOBUF. Disable V4L2 or enable PROTOBUF")
 endif(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
 
-option(ENABLE_FB "Enable the framebuffer grabber" OFF)
-message(STATUS "ENABLE_FB = " ${ENABLE_FB})
-
-option(ENABLE_OSX "Enable the osx grabber" OFF)
-message(STATUS "ENABLE_OSX = " ${ENABLE_OSX})
-
 if(ENABLE_FB AND ENABLE_DISPMANX)
 	message(FATAL_ERROR "dispmanx grabber and framebuffer grabber cannot be used at the same time")
 endif(ENABLE_FB AND ENABLE_DISPMANX)
@@ -89,10 +92,6 @@ find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
 find_package(libusb-1.0 REQUIRED)
 find_package(Threads REQUIRED)
 
-if (ENABLE_TINKERFORGE)
-	#find_package(libtinkerforge-1.0 REQUIRED)
-endif (ENABLE_TINKERFORGE)
-
 include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 # TODO[TvdZ]: This linking directory should only be added if we are cross compiling

HyperionConfig.h.in

@@ -21,6 +21,9 @@
 // Define to enable the framebuffer grabber
 #cmakedefine ENABLE_FB
 
+// Define to enable the amlogic grabber
+#cmakedefine ENABLE_AMLOGIC
+
 // Define to enable the osx grabber
 #cmakedefine ENABLE_OSX
 

include/grabber/AmlogicWrapper.h

@@ -0,0 +1,94 @@
+#pragma once
+
+// QT includes
+#include <QObject>
+#include <QTimer>
+
+// Utils includes
+#include <utils/Image.h>
+#include <utils/ColorBgr.h>
+#include <utils/ColorRgb.h>
+#include <utils/GrabbingMode.h>
+#include <utils/VideoMode.h>
+
+// Forward class declaration
+class AmlogicGrabber;
+class Hyperion;
+class ImageProcessor;
+
+///
+/// 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
+/// attached Hyperion.
+///
+class AmlogicWrapper : public QObject
+{
+	Q_OBJECT
+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] updateRate_Hz  The image grab rate [Hz]
+	/// @param[in] hyperion  The instance of Hyperion used to write the led values
+	///
+	AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion);
+
+	///
+	/// Destructor of this dispmanx frame grabber. Releases any claimed resources.
+	///
+	virtual ~AmlogicWrapper();
+
+public slots:
+	///
+	/// Starts the grabber wich produces led values with the specified update rate
+	///
+	void start();
+
+	///
+	/// Performs a single frame grab and computes the led-colors
+	///
+	void action();
+
+	///
+	/// Stops the grabber
+	///
+	void stop();
+
+	///
+	/// Set the grabbing mode
+	/// @param[in] mode The new grabbing mode
+	///
+	void setGrabbingMode(const GrabbingMode mode);
+
+	///
+	/// Set the video mode (2D/3D)
+	/// @param[in] mode The new video mode
+	///
+	void setVideoMode(const VideoMode videoMode);
+
+private:
+	/// The update rate [Hz]
+	const int _updateInterval_ms;
+	/// The timeout of the led colors [ms]
+	const int _timeout_ms;
+	/// The priority of the led colors
+	const int _priority;
+
+	/// The timer for generating events with the specified update rate
+	QTimer _timer;
+
+	/// The image used for grabbing frames
+	Image<ColorBgr> _image;
+	/// The actual grabber
+	AmlogicGrabber * _frameGrabber;
+	/// The processor for transforming images to led colors
+	ImageProcessor * _processor;
+
+	/// The list with computed led colors
+	std::vector<ColorRgb> _ledColors;
+
+	/// Pointer to Hyperion for writing led values
+	Hyperion * _hyperion;
+};

include/utils/ColorBgr.h

@@ -0,0 +1,63 @@
+#pragma once
+
+// STL includes
+#include <cstdint>
+#include <iostream>
+
+struct ColorBgr;
+
+///
+/// Plain-Old-Data structure containing the red-green-blue color specification. Size of the
+/// structure is exactly 3-bytes for easy writing to led-device
+///
+struct ColorBgr
+{
+	/// The blue color channel
+	uint8_t blue;
+	/// The green color channel
+	uint8_t green;
+	/// The red color channel
+	uint8_t red;
+
+	/// 'Black' RgbColor (0, 0, 0)
+	static ColorBgr BLACK;
+	/// 'Red' RgbColor (255, 0, 0)
+	static ColorBgr RED;
+	/// 'Green' RgbColor (0, 255, 0)
+	static ColorBgr GREEN;
+	/// 'Blue' RgbColor (0, 0, 255)
+	static ColorBgr BLUE;
+	/// 'Yellow' RgbColor (255, 255, 0)
+	static ColorBgr YELLOW;
+	/// 'White' RgbColor (255, 255, 255)
+	static ColorBgr WHITE;
+};
+
+/// Assert to ensure that the size of the structure is 'only' 3 bytes
+static_assert(sizeof(ColorBgr) == 3, "Incorrect size of ColorRgb");
+
+///
+/// Stream operator to write ColorRgb to an outputstream (format "'{'[red]','[green]','[blue]'}'")
+///
+/// @param os The output stream
+/// @param color The color to write
+/// @return The output stream (with the color written to it)
+///
+inline std::ostream& operator<<(std::ostream& os, const ColorBgr& color)
+{
+	os << "{" << unsigned(color.red) << "," << unsigned(color.green) << "," << unsigned(color.blue) << "}";
+	return os;
+}
+
+
+/// Compare operator to check if a color is 'smaller' than another color
+inline bool operator<(const ColorBgr & lhs, const ColorBgr & rhs)
+{
+	return (lhs.red < rhs.red) && (lhs.green < rhs.green) && (lhs.blue < rhs.blue);
+}
+
+/// Compare operator to check if a color is 'smaller' than or 'equal' to another color
+inline bool operator<=(const ColorBgr & lhs, const ColorBgr & rhs)
+{
+	return (lhs.red <= rhs.red) && (lhs.green <= rhs.green) && (lhs.blue <= rhs.blue);
+}

libsrc/grabber/CMakeLists.txt

@@ -1,3 +1,7 @@
+if (ENABLE_AMLOGIC)
+	add_subdirectory(amlogic)
+endif (ENABLE_AMLOGIC)
+
 if (ENABLE_DISPMANX)
 	add_subdirectory(dispmanx)
 endif (ENABLE_DISPMANX)
@@ -6,14 +10,14 @@ if (ENABLE_FB)
 	add_subdirectory(framebuffer)
 endif (ENABLE_FB)
 
+if (ENABLE_OSX)
+	add_subdirectory(osx)
+endif()
+
 if (ENABLE_V4L2)
 	add_subdirectory(v4l2)
 endif (ENABLE_V4L2)
 
 if (ENABLE_X11)
 	add_subdirectory(x11)
 endif()
-
-if (ENABLE_OSX)
-	add_subdirectory(osx)
-endif()