Configurable blackborder threshold added

Former-commit-id: 95b77dee2869b41bf556e0e374bea3c5e4534e61

libsrc/hyperion/BlackBorderDetector.cpp

@@ -4,7 +4,8 @@
 
 using namespace hyperion;
 
-BlackBorderDetector::BlackBorderDetector()
+BlackBorderDetector::BlackBorderDetector(uint8_t blackborderThreshold) :
+	_blackborderThreshold(blackborderThreshold)
 {
 	// empty
 }

libsrc/hyperion/BlackBorderProcessor.cpp

@@ -4,14 +4,14 @@
 
 using namespace hyperion;
 
-BlackBorderProcessor::BlackBorderProcessor(
-		const unsigned unknownFrameCnt,
+BlackBorderProcessor::BlackBorderProcessor(const unsigned unknownFrameCnt,
 		const unsigned borderFrameCnt,
-		const unsigned blurRemoveCnt) :
+		const unsigned blurRemoveCnt,
+		uint8_t blackborderThreshold) :
 	_unknownSwitchCnt(unknownFrameCnt),
 	_borderSwitchCnt(borderFrameCnt),
 	_blurRemoveCnt(blurRemoveCnt),
-	_detector(),
+	_detector(blackborderThreshold),
 	_currentBorder({true, -1, -1}),
 	_previousDetectedBorder({true, -1, -1}),
 	_consistentCnt(0)

libsrc/hyperion/Hyperion.cpp

@@ -270,7 +270,10 @@ Hyperion::Hyperion(const Json::Value &jsonConfig) :
 		throw std::runtime_error("Color transformation incorrectly set");
 	}
 	// initialize the image processor factory
-	ImageProcessorFactory::getInstance().init(_ledString, jsonConfig["blackborderdetector"].get("enable", true).asBool());
+	ImageProcessorFactory::getInstance().init(
+				_ledString,
+				jsonConfig["blackborderdetector"].get("enable", true).asBool(),
+				jsonConfig["blackborderdetector"].get("threshold", 0.01).asDouble());
 
 	// initialize the color smoothing filter
 	_device = createColorSmoothing(jsonConfig["color"]["smoothing"], _device);

libsrc/hyperion/ImageProcessor.cpp

@@ -6,46 +6,46 @@
 
 using namespace hyperion;
 
-ImageProcessor::ImageProcessor(const LedString& ledString, bool enableBlackBorderDetector) :
-	mLedString(ledString),
+ImageProcessor::ImageProcessor(const LedString& ledString, bool enableBlackBorderDetector, uint8_t blackborderThreshold) :
+	_ledString(ledString),
 	_enableBlackBorderRemoval(enableBlackBorderDetector),
-	_borderProcessor(new BlackBorderProcessor(600, 50, 1)),
-	mImageToLeds(nullptr)
+	_borderProcessor(new BlackBorderProcessor(600, 50, 1, blackborderThreshold)),
+	_imageToLeds(nullptr)
 {
 	// empty
 }
 
 ImageProcessor::~ImageProcessor()
 {
-	delete mImageToLeds;
+	delete _imageToLeds;
 	delete _borderProcessor;
 }
 
 unsigned ImageProcessor::getLedCount() const
 {
-	return mLedString.leds().size();
+	return _ledString.leds().size();
 }
 
 void ImageProcessor::setSize(const unsigned width, const unsigned height)
 {
 	// Check if the existing buffer-image is already the correct dimensions
-	if (mImageToLeds && mImageToLeds->width() == width && mImageToLeds->height() == height)
+	if (_imageToLeds && _imageToLeds->width() == width && _imageToLeds->height() == height)
 	{
 		return;
 	}
 
 	// Clean up the old buffer and mapping
-	delete mImageToLeds;
+	delete _imageToLeds;
 
 	// Construct a new buffer and mapping
-	mImageToLeds = new ImageToLedsMap(width, height, 0, 0, mLedString.leds());
+	_imageToLeds = new ImageToLedsMap(width, height, 0, 0, _ledString.leds());
 }
 
 bool ImageProcessor::getScanParameters(size_t led, double &hscanBegin, double &hscanEnd, double &vscanBegin, double &vscanEnd) const
 {
-	if (led < mLedString.leds().size())
+	if (led < _ledString.leds().size())
 	{
-		const Led & l = mLedString.leds()[led];
+		const Led & l = _ledString.leds()[led];
 		hscanBegin = l.minX_frac;
 		hscanEnd = l.maxX_frac;
 		vscanBegin = l.minY_frac;

libsrc/hyperion/ImageProcessorFactory.cpp

@@ -10,13 +10,25 @@ ImageProcessorFactory& ImageProcessorFactory::getInstance()
 	return instance;
 }
 
-void ImageProcessorFactory::init(const LedString& ledString, bool enableBlackBorderDetector)
+void ImageProcessorFactory::init(const LedString& ledString, bool enableBlackBorderDetector, double blackborderThreshold)
 {
 	_ledString = ledString;
 	_enableBlackBorderDetector = enableBlackBorderDetector;
+
+	int threshold = int(std::ceil(blackborderThreshold * 255));
+	if (threshold < 0)
+		threshold = 0;
+	else if (threshold > 255)
+		threshold = 255;
+	_blackborderThreshold = uint8_t(threshold);
+
+	if (_enableBlackBorderDetector)
+	{
+		std::cout << "Black border threshold set to " << blackborderThreshold << " (" << int(_blackborderThreshold) << ")" << std::endl;
+	}
 }
 
 ImageProcessor* ImageProcessorFactory::newImageProcessor() const
 {
-	return new ImageProcessor(_ledString, _enableBlackBorderDetector);
+	return new ImageProcessor(_ledString, _enableBlackBorderDetector, _blackborderThreshold);
 }

libsrc/hyperion/hyperion.schema.json

@@ -223,6 +223,12 @@
                 "enable" : {
                     "type" : "boolean",
                     "required" : true
+                },
+                "threshold" : {
+                    "type" : "number",
+                    "required" : false,
+                    "minimum" : 0.0,
+                    "maximum" : 1.0
                 }
             },
             "additionalProperties" : false