- refactored framebuffer grabber to use ImageResampler

- added OsxGrabber for OSX
- added binary for imx6 (cubox-i) and updated install script

Author: Gamadril

CMakeLists.txt

@@ -35,10 +35,21 @@ 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)
 
+if(ENABLE_FB AND ENABLE_OSX)
+	message(FATAL_ERROR "osx grabber and framebuffer grabber cannot be used at the same time")
+endif(ENABLE_FB AND ENABLE_OSX)
+
+if(ENABLE_OSX AND ENABLE_DISPMANX)
+	message(FATAL_ERROR "dispmanx grabber and osx grabber cannot be used at the same time")
+endif(ENABLE_OSX AND ENABLE_DISPMANX)
+
 # Createt the configuration file
 # configure a header file to pass some of the CMake settings
 # to the source code
@@ -89,6 +100,10 @@ if(NOT APPLE)
 	link_directories(${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
 endif()
 
+if(ENABLE_OSX)
+	set(CMAKE_EXE_LINKER_FLAGS "-framework CoreGraphics")
+endif()
+
 configure_file(bin/install_hyperion.sh ${LIBRARY_OUTPUT_PATH} @ONLY)
 configure_file(config/hyperion.config.json ${LIBRARY_OUTPUT_PATH} @ONLY)
 configure_file(config/hyperion_x86.config.json ${LIBRARY_OUTPUT_PATH} @ONLY)

CompileHowto.txt

@@ -28,6 +28,10 @@ cmake ..
 cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_X11=ON ..
 # as an alternative for the dispmanx grabber on non-rpi devices (e.g. cubox-i) you could try the framebuffer grabber
 cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_FB=ON ..
+# for OSX build you need XCode, qt4 libraries and cmake. You can use macport (homebrew might work too) to install them
+sudo port install qt4-mac
+sudo port install cmake
+cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_V4L2=OFF -DENABLE_OSX=ON .
 
 # run make to build Hyperion
 make

HyperionConfig.h.in

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

bin/install_hyperion.sh

@@ -10,6 +10,9 @@ IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
 IS_RASPBMC=`cat /etc/issue | grep Raspbmc | wc -l`
 IS_OPENELEC=`cat /etc/issue | grep -m 1 OpenELEC | wc -l`
 
+# Find out if its an imx6 device
+IS_IMX6=`cat /proc/cpuinfo | grep i.MX6 | wc -l`
+
 # check which init script we should use
 USE_INITCTL=`which /sbin/initctl | wc -l`
 USE_SERVICE=`which /usr/sbin/service | wc -l`
@@ -34,14 +37,21 @@ fi
 echo 'Downloading hyperion'
 if [ $IS_OPENELEC -eq 1 ]; then
 	# OpenELEC has a readonly file system. Use alternative location
+if [ $IS_IMX6 -eq 1 ]; then
+	curl -L --get https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion_imx6.tar.gz | tar -C /storage -xz
+else
 	curl -L --get https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz | tar -C /storage -xz
+fi
 	curl -L --get https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.deps.openelec-rpi.tar.gz | tar -C /storage/hyperion/bin -xz
-
 	# modify the default config to have a correct effect path
 	sed -i 's:/opt:/storage:g' /storage/hyperion/config/hyperion.config.json
+else
+if [ $IS_IMX6 -eq 1 ]; then
+	wget https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion_imx6.tar.gz -O - | tar -C /opt -xz
 else
 	wget https://raw.githubusercontent.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
 fi
+fi
 
 # create links to the binaries
 if [ $IS_OPENELEC -ne 1 ]; then
@@ -51,7 +61,7 @@ if [ $IS_OPENELEC -ne 1 ]; then
 fi
 
 # create link to the gpio changer (gpio->spi)
-if [ $IS_RASPBMC -eq 1 ]; then
+if [ $IS_RASPBMC -eq 1 ] && [ $IS_IMX6 -ne 1 ]; then
 	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
 fi
 

deploy/hyperion_imx6.tar.gz

@@ -7,7 +7,6 @@
 // Utils includes
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
-#include <utils/ColorRgba.h>
 #include <utils/GrabbingMode.h>
 #include <utils/VideoMode.h>
 
@@ -81,7 +80,7 @@ public slots:
 	QTimer _timer;
 
 	/// The image used for grabbing frames
-	Image<ColorRgba> _image;
+	Image<ColorRgb> _image;
 	/// The actual grabber
 	FramebufferFrameGrabber * _frameGrabber;
 	/// The processor for transforming images to led colors

include/grabber/FramebufferWrapper.h

@@ -0,0 +1,95 @@
+#pragma once
+
+// QT includes
+#include <QObject>
+#include <QTimer>
+
+// Utils includes
+#include <utils/Image.h>
+#include <utils/ColorRgb.h>
+#include <utils/ColorRgba.h>
+#include <utils/GrabbingMode.h>
+#include <utils/VideoMode.h>
+
+// Forward class declaration
+class OsxFrameGrabber;
+class Hyperion;
+class ImageProcessor;
+
+///
+/// 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.
+///
+class OsxWrapper: public QObject
+{
+	Q_OBJECT
+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] hyperion  The instance of Hyperion used to write the led values
+	///
+	OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion);
+
+	///
+	/// Destructor of this osx frame grabber. Releases any claimed resources.
+	///
+	virtual ~OsxWrapper();
+
+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<ColorRgb> _image;
+	/// The actual grabber
+	OsxFrameGrabber * _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/grabber/OsxWrapper.h

@@ -9,6 +9,8 @@
 enum PixelFormat {
 	PIXELFORMAT_YUYV,
 	PIXELFORMAT_UYVY,
+	PIXELFORMAT_BGR16,
+	PIXELFORMAT_BGR24,
     PIXELFORMAT_RGB32,
     PIXELFORMAT_BGR32,
     PIXELFORMAT_NO_CHANGE
@@ -27,6 +29,14 @@ inline PixelFormat parsePixelFormat(std::string pixelFormat)
 	{
 		return PIXELFORMAT_UYVY;
 	}
+    else if (pixelFormat == "bgr16")
+    {
+        return PIXELFORMAT_BGR16;
+    }
+    else if (pixelFormat == "bgr24")
+    {
+        return PIXELFORMAT_BGR24;
+    }
     else if (pixelFormat == "rgb32")
     {
         return PIXELFORMAT_RGB32;

include/utils/PixelFormat.h

@@ -13,3 +13,7 @@ endif (ENABLE_V4L2)
 if (ENABLE_X11)
 	add_subdirectory(x11)
 endif()
+
+if (ENABLE_OSX)
+	add_subdirectory(osx)
+endif()