Added reading the enable flag for the border detector

Former-commit-id: d2cf4df9a7684107b30f9bc01d5aa90b321ce1b5
This commit is contained in:
johan
2013-10-20 22:27:05 +02:00
parent 0e8997f554
commit 293a2e7c19
8 changed files with 31 additions and 8 deletions

View File

@@ -99,7 +99,7 @@ Hyperion::Hyperion(const Json::Value &jsonConfig) :
_device(constructDevice(jsonConfig["device"])),
_timer()
{
ImageProcessorFactory::getInstance().init(_ledString);
ImageProcessorFactory::getInstance().init(_ledString, jsonConfig["blackborderdetector"].get("enable", true).asBool());
_timer.setSingleShot(true);
QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(update()));

View File

@@ -10,9 +10,9 @@
using namespace hyperion;
ImageProcessor::ImageProcessor(const LedString& ledString) :
ImageProcessor::ImageProcessor(const LedString& ledString, bool enableBlackBorderDetector) :
mLedString(ledString),
_enableBlackBorderRemoval(true),
_enableBlackBorderRemoval(enableBlackBorderDetector),
_borderProcessor(new BlackBorderProcessor(600, 50, 1)),
mImageToLeds(nullptr)
{

View File

@@ -10,12 +10,13 @@ ImageProcessorFactory& ImageProcessorFactory::getInstance()
return instance;
}
void ImageProcessorFactory::init(const LedString& ledString)
void ImageProcessorFactory::init(const LedString& ledString, bool enableBlackBorderDetector)
{
_ledString = ledString;
_enableBlackBorderDetector = enableBlackBorderDetector;
}
ImageProcessor* ImageProcessorFactory::newImageProcessor() const
{
return new ImageProcessor(_ledString);
return new ImageProcessor(_ledString, _enableBlackBorderDetector);
}

View File

@@ -169,6 +169,18 @@
"additionalProperties" : false
}
},
"blackborderdetector" :
{
"type" : "object",
"required" : false,
"properties" : {
"enable" : {
"type" : "boolean",
"required" : true
}
},
"additionalProperties" : false
},
"xbmcVideoChecker" :
{
"type" : "object",