grabber api and feature unification (#462)

* move setvideomode to common place

* implement more croping and 3d support

* more api unification

* more refactoring

* osx fix

* next step

* add a mock for osx grabber. Now it is possible to test compile on none osx platforms.

* more unifications ...

* remove obsolete includes and grabbers are not dyn allocated. dispmanx needs rework an probaly not work atm

* first version of dispmanx mock. it compiles, but outputs a black image

* now dispmanx mock works!

* activate mocks in travis linux build
prepare dispmanx to rgb image out

* dispmanx now with image rgb output
fix deadlock with w/h -1 in grabber v4l
cleanups

* fix json

* fix some runtime stuff

* Update FramebufferWrapper.cpp

fix missing code

* unify grabframe

* 3d and croping for amlogic

* fix setimage not working

* make use of templates
save some codelines

* save more code lines

libsrc/hyperion/Grabber.cpp

@@ -3,16 +3,19 @@
 
 Grabber::Grabber(QString grabberName, int width, int height, int cropLeft, int cropRight, int cropTop, int cropBottom)
 	: _imageResampler()
+	, _useImageResampler(true)
 	, _videoMode(VIDEO_2D)
 	, _width(width)
 	, _height(height)
-	, _cropLeft(cropLeft)
-	, _cropRight(cropRight)
-	, _cropTop(cropTop)
-	, _cropBottom(cropBottom)
+	, _cropLeft(0)
+	, _cropRight(0)
+	, _cropTop(0)
+	, _cropBottom(0)
 	, _log(Logger::getInstance(grabberName))
 
 {
+	setVideoMode(VIDEO_2D);
+	setCropping(cropLeft, cropRight, cropTop, cropBottom);
 }
 
 Grabber::~Grabber()
@@ -22,6 +25,41 @@ Grabber::~Grabber()
 
 void Grabber::setVideoMode(VideoMode mode)
 {
+	Debug(_log,"setvideomode %d", mode);
 	_videoMode = mode;
-	_imageResampler.set3D(_videoMode);
+	if ( _useImageResampler )
+	{
+		_imageResampler.setVideoMode(_videoMode);
+	}
+}
+
+void Grabber::setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom)
+{
+	if (_width>0 && _height>0)
+	{
+		if (cropLeft + cropRight >= (unsigned)_width || cropTop + cropBottom >= (unsigned)_height)
+		{
+			Error(_log, "Rejecting invalid crop values: left: %d, right: %d, top: %d, bottom: %d", cropLeft, cropRight, cropTop, cropBottom);
+			return;
+		}
+	}
+
+	_cropLeft   = cropLeft;
+	_cropRight  = cropRight;
+	_cropTop    = cropTop;
+	_cropBottom = cropBottom;
+
+	if ( _useImageResampler )
+	{
+		_imageResampler.setCropping(cropLeft, cropRight, cropTop, cropBottom);
+	}
+	else
+	{
+		_imageResampler.setCropping(0, 0, 0, 0);
+	}
+
+	if (cropLeft > 0 || cropRight > 0 || cropTop > 0 || cropBottom > 0)
+	{
+		Info(_log, "Cropping image: width=%d height=%d; crop: left=%d right=%d top=%d bottom=%d ", _width, _height, cropLeft, cropRight, cropTop, cropBottom);
+	}
 }

libsrc/hyperion/GrabberWrapper.cpp

@@ -2,20 +2,32 @@
 #include <hyperion/ImageProcessorFactory.h>
 #include <hyperion/ImageProcessor.h>
 #include <hyperion/GrabberWrapper.h>
+#include <hyperion/Grabber.h>
 #include <HyperionConfig.h>
 
-GrabberWrapper::GrabberWrapper(QString grabberName, const int priority, hyperion::Components grabberComponentId)
+GrabberWrapper::GrabberWrapper(QString grabberName, Grabber * ggrabber, unsigned width, unsigned height, const unsigned updateRate_Hz, const int priority, hyperion::Components grabberComponentId)
 	: _grabberName(grabberName)
 	, _hyperion(Hyperion::getInstance())
 	, _priority(priority)
 	, _timer()
+	, _updateInterval_ms(1000/updateRate_Hz)
+	, _timeout_ms(2 * _updateInterval_ms)
 	, _log(Logger::getInstance(grabberName))
 	, _forward(true)
 	, _processor(ImageProcessorFactory::getInstance().newImageProcessor())
 	, _grabberComponentId(grabberComponentId)
+	, _ggrabber(ggrabber)
+	, _image(0,0)
+	, _ledColors(Hyperion::getInstance()->getLedCount(), ColorRgb{0,0,0})
+	, _imageProcessorEnabled(true)
 {
 	_timer.setSingleShot(false);
+	// Configure the timer to generate events every n milliseconds
+	_timer.setInterval(_updateInterval_ms);
 
+	_image.resize(width, height);
+	_processor->setSize(width, height);
+	
 	_forward = _hyperion->getForwarder()->protoForwardingEnabled();
 	_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_BLACKBORDER, _processor->blackBorderDetectorEnabled());
 	qRegisterMetaType<hyperion::Components>("hyperion::Components");
@@ -26,6 +38,7 @@ GrabberWrapper::GrabberWrapper(QString grabberName, const int priority, hyperion
 	connect(_hyperion, SIGNAL(videoMode(VideoMode)), this, SLOT(setVideoMode(VideoMode)));
 	connect(this, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), _hyperion, SLOT(setImage(int, const Image<ColorRgb>&, const int)) );
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(action()));
+
 }
 
 GrabberWrapper::~GrabberWrapper()
@@ -139,3 +152,24 @@ QStringList GrabberWrapper::availableGrabbers()
 
 	return grabbers;
 }
+
+
+void GrabberWrapper::setVideoMode(const VideoMode mode)
+{
+	if (_ggrabber != nullptr)
+	{
+		Info(_log,"setvideomode");
+		_ggrabber->setVideoMode(mode);
+	}
+}
+
+void GrabberWrapper::setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom)
+{
+	_ggrabber->setCropping(cropLeft, cropRight, cropTop, cropBottom);
+}
+
+void GrabberWrapper::setImageProcessorEnabled(bool enable)
+{
+	_imageProcessorEnabled = enable;
+}
+

libsrc/hyperion/Hyperion.cpp

@@ -487,14 +487,15 @@ unsigned Hyperion::addSmoothingConfig(int settlingTime_ms, double ledUpdateFrequ
 
 void Hyperion::freeObjects(bool emitCloseSignal)
 {
+	// switch off all leds
+	clearall(true);
+	_device->switchOff();
+
 	if (emitCloseSignal)
 	{
 		emit closing();
 	}
 
-	// switch off all leds
-	clearall();
-	_device->switchOff();
 
 	// delete components on exit of hyperion core
 	delete _effectEngine;
@@ -740,9 +741,9 @@ void Hyperion::clear(int priority)
 	_effectEngine->channelCleared(priority);
 }
 
-void Hyperion::clearall()
+void Hyperion::clearall(bool forceClearAll)
 {
-	_muxer.clearAll();
+	_muxer.clearAll(forceClearAll);
 	setSourceAutoSelectEnabled(true);
 
 	// update leds

libsrc/hyperion/ImageProcessor.cpp

@@ -44,7 +44,7 @@ void ImageProcessor::setSize(const unsigned width, const unsigned height)
 	delete _imageToLeds;
 
 	// Construct a new buffer and mapping
-	_imageToLeds = new ImageToLedsMap(width, height, 0, 0, _ledString.leds());
+	_imageToLeds = (width>0 && height>0) ? (new ImageToLedsMap(width, height, 0, 0, _ledString.leds())) : nullptr;
 }
 
 void ImageProcessor::enableBlackBorderDetector(bool enable)

libsrc/hyperion/ImageToLedsMap.cpp

@@ -17,6 +17,8 @@ ImageToLedsMap::ImageToLedsMap(
 	// Sanity check of the size of the borders (and width and height)
 	Q_ASSERT(_width  > 2*_verticalBorder);
 	Q_ASSERT(_height > 2*_horizontalBorder);
+	Q_ASSERT(_width  < 10000);
+	Q_ASSERT(_height < 10000);
 
 	// Reserve enough space in the map for the leds
 	_colorsMap.reserve(leds.size());

libsrc/hyperion/PriorityMuxer.cpp

@@ -78,13 +78,22 @@ void PriorityMuxer::clearInput(const int priority)
 	}
 }
 
-void PriorityMuxer::clearAll()
+void PriorityMuxer::clearAll(bool forceClearAll)
 {
-	for(auto key : _activeInputs.keys())
+	if (forceClearAll)
 	{
-		if (key < LOWEST_PRIORITY-1)
+		_activeInputs.clear();
+		_currentPriority = LOWEST_PRIORITY;
+		_activeInputs[_currentPriority] = _lowestPriorityInfo;
+	}
+	else
+	{
+		for(auto key : _activeInputs.keys())
 		{
-			_activeInputs.remove(key);
+			if (key < LOWEST_PRIORITY-1)
+			{
+				_activeInputs.remove(key);
+			}
 		}
 	}
 }

libsrc/hyperion/schema/schema-grabberV4L2.json

@@ -46,8 +46,8 @@
 			{
 				"type" : "integer",
 				"title" : "edt_conf_v4l2_width_title",
-				"minimum" : -1,
-				"default" : -1,
+				"minimum" : 0,
+				"default" : 0,
 				"append" : "edt_append_pixel",
 				"propertyOrder" : 5
 			},
@@ -55,8 +55,8 @@
 			{
 				"type" : "integer",
 				"title" : "edt_conf_v4l2_height_title",
-				"minimum" : -1,
-				"default" : -1,
+				"minimum" : 0,
+				"default" : 0,
 				"append" : "edt_append_pixel",
 				"propertyOrder" : 6
 			},