- refactored framebuffer grabber to use ImageResampler

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


Former-commit-id: 2c55e292c842c67e54ce36bd91e4f6303b98687a

libsrc/grabber/osx/CMakeLists.txt

@@ -0,0 +1,30 @@
+# Define the current source locations
+SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
+SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/osx)
+
+# Group the headers that go through the MOC compiler
+SET(OsxGrabberQT_HEADERS
+		${CURRENT_HEADER_DIR}/OsxWrapper.h
+)
+
+SET(OsxGrabberHEADERS
+		${CURRENT_SOURCE_DIR}/OsxFrameGrabber.h
+)
+
+SET(OsxGrabberSOURCES
+		${CURRENT_SOURCE_DIR}/OsxWrapper.cpp
+		${CURRENT_SOURCE_DIR}/OsxFrameGrabber.cpp
+)
+
+QT4_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS})
+
+add_library(osx-grabber
+		${OsxGrabberHEADERS}
+		${OsxGrabberQT_HEADERS}
+		${OsxGrabberHEADERS_MOC}
+		${OsxGrabberSOURCES}
+)
+
+target_link_libraries(osx-grabber
+		hyperion
+		${QT_LIBRARIES})

libsrc/grabber/osx/OsxFrameGrabber.cpp

@@ -0,0 +1,82 @@
+// STL includes
+#include <cassert>
+#include <iostream>
+
+// Local includes
+#include "OsxFrameGrabber.h"
+
+OsxFrameGrabber::OsxFrameGrabber(const unsigned display, const unsigned width, const unsigned height) :
+	_screenIndex(display),
+	_width(width),
+	_height(height),
+	_imgResampler(new ImageResampler())
+{
+	CGImageRef image;
+	CGDisplayCount displayCount;
+	CGDirectDisplayID displays[8];
+
+	// get list of displays
+	CGGetActiveDisplayList(8, displays, &displayCount);
+	if (_screenIndex + 1 > displayCount)
+	{
+		std::cerr << "OSX display with index " << _screenIndex << " is not available. Using main display" << std::endl;
+		_display = kCGDirectMainDisplay;
+	} else {
+		_display = displays[_screenIndex];
+	}
+		
+	image = CGDisplayCreateImage(_display);
+	assert(image != NULL);
+
+	std::cout << "OSX display opened with resolution: " << CGImageGetWidth(image) << "x" << CGImageGetHeight(image) << "@" << CGImageGetBitsPerPixel(image) << "bit" << std::endl;
+
+	CGImageRelease(image);
+}
+
+OsxFrameGrabber::~OsxFrameGrabber()
+{
+	delete _imgResampler;
+}
+
+void OsxFrameGrabber::setVideoMode(const VideoMode videoMode)
+{
+	_imgResampler->set3D(videoMode);
+}
+
+void OsxFrameGrabber::grabFrame(Image<ColorRgb> & image)
+{
+	CGImageRef dispImage;
+	CFDataRef imgData;
+	unsigned char * pImgData;	
+	unsigned dspWidth, dspHeight;
+	
+	dispImage = CGDisplayCreateImage(_display);
+	
+	// dsiplay lost, use main
+	if (dispImage == NULL && _display)
+	{
+		dispImage = CGDisplayCreateImage(kCGDirectMainDisplay);
+		// no displays connected, return
+		if (dispImage == NULL)
+		{
+			std::cerr << "OSX no display connected..." << std::endl;
+			return;
+		}
+	}
+	imgData = CGDataProviderCopyData(CGImageGetDataProvider(dispImage));
+	pImgData = (unsigned char*) CFDataGetBytePtr(imgData);
+	dspWidth = CGImageGetWidth(dispImage);
+	dspHeight = CGImageGetHeight(dispImage);
+	
+	_imgResampler->setHorizontalPixelDecimation(dspWidth/_width);
+	_imgResampler->setVerticalPixelDecimation(dspHeight/_height);
+	_imgResampler->processImage( pImgData,
+								dspWidth,
+								dspHeight,
+								CGImageGetBytesPerRow(dispImage),
+								PIXELFORMAT_BGR32,
+								image);
+	
+	CFRelease(imgData);
+	CGImageRelease(dispImage);
+}

libsrc/grabber/osx/OsxFrameGrabber.h

@@ -0,0 +1,59 @@
+#pragma once
+
+// OSX includes
+#include <CoreGraphics/CoreGraphics.h>
+
+// Utils includes
+#include <utils/Image.h>
+#include <utils/ColorRgb.h>
+#include <utils/VideoMode.h>
+#include <utils/ImageResampler.h>
+
+///
+/// The OsxFrameGrabber is used for creating snapshots of the display (screenshots) 
+///
+class OsxFrameGrabber
+{
+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(const unsigned display, const unsigned width, const unsigned height);
+	~OsxFrameGrabber();
+
+	///
+	/// Set the video mode (2D/3D)
+	/// @param[in] mode The new video mode
+	///
+	void setVideoMode(const VideoMode videoMode);
+
+	///
+	/// 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)
+	///
+	/// @param[out] image  The snapped screenshot (should be initialized with correct width and
+	/// height)
+	///
+	void grabFrame(Image<ColorRgb> & image);
+
+private:	
+	/// display
+	const unsigned _screenIndex;
+	
+	/// With of the captured snapshot [pixels]
+	const unsigned _width;
+	
+	/// Height of the captured snapshot [pixels]
+	const unsigned _height;
+	
+	/// Reference to the captured diaplay
+	CGDirectDisplayID _display;
+	
+	/// Image resampler for downscaling the image
+	ImageResampler * _imgResampler;
+};

libsrc/grabber/osx/OsxWrapper.cpp

@@ -0,0 +1,79 @@
+// Hyperion includes
+#include <hyperion/Hyperion.h>
+#include <hyperion/ImageProcessorFactory.h>
+#include <hyperion/ImageProcessor.h>
+
+// Osx grabber includes
+#include <grabber/OsxWrapper.h>
+#include "OsxFrameGrabber.h"
+
+OsxWrapper::OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) :
+	_updateInterval_ms(1000/updateRate_Hz),
+	_timeout_ms(2 * _updateInterval_ms),
+	_priority(1000),
+	_timer(),
+	_image(grabWidth, grabHeight),
+	_frameGrabber(new OsxFrameGrabber(display, grabWidth, grabHeight)),
+	_processor(ImageProcessorFactory::getInstance().newImageProcessor()),
+	_ledColors(hyperion->getLedCount(), ColorRgb{0,0,0}),
+	_hyperion(hyperion)
+{
+	// Configure the timer to generate events every n milliseconds
+	_timer.setInterval(_updateInterval_ms);
+	_timer.setSingleShot(false);
+
+	_processor->setSize(grabWidth, grabHeight);
+
+	// Connect the QTimer to this
+	QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(action()));
+}
+
+OsxWrapper::~OsxWrapper()
+{
+	// Cleanup used resources (ImageProcessor and FrameGrabber)
+	delete _processor;
+	delete _frameGrabber;
+}
+
+void OsxWrapper::start()
+{
+	// Start the timer with the pre configured interval
+	_timer.start();
+}
+
+void OsxWrapper::action()
+{
+	// Grab frame into the allocated image
+	_frameGrabber->grabFrame(_image);
+
+	_processor->process(_image, _ledColors);
+
+	_hyperion->setColors(_priority, _ledColors, _timeout_ms);
+}
+void OsxWrapper::stop()
+{
+	// Stop the timer, effectivly stopping the process
+	_timer.stop();
+}
+
+void OsxWrapper::setGrabbingMode(const GrabbingMode mode)
+{
+	switch (mode)
+	{
+	case GRABBINGMODE_VIDEO:
+	case GRABBINGMODE_AUDIO:
+	case GRABBINGMODE_PHOTO:
+	case GRABBINGMODE_MENU:
+	case GRABBINGMODE_INVALID:
+		start();
+		break;
+	case GRABBINGMODE_OFF:
+		stop();
+		break;
+	}
+}
+
+void OsxWrapper::setVideoMode(const VideoMode mode)
+{
+	_frameGrabber->setVideoMode(mode);
+}