frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

3line detection

Browse Source 
Former-commit-id: a63c03bc276ef218981213fbb9743a3d6d12d8b6
This commit is contained in:
wisc
2016-01-04 00:20:47 +01:00
parent 469ea42f49
commit 633985930b
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc/blackborder/BlackBorderProcessor.cpp
View File

@@ -1,4 +1,4 @@
//#include <iostream>
// Blackborder includes
#include <blackborder/BlackBorderProcessor.h>
@@ -29,7 +29,10 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
// set the consistency counter
if (newDetectedBorder == _previousDetectedBorder)
{
++_consistentCnt;
if (_consistentCnt < 100000)
{
++_consistentCnt;
}
}
else
{
@@ -37,6 +40,8 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
_consistentCnt = 0;
}
// std::cout << "new: " << newDetectedBorder.verticalSize << " " << newDetectedBorder.horizontalSize << " cur: " << _currentBorder.verticalSize << " " << _currentBorder.horizontalSize << " cc " << _consistentCnt << std::endl;
// check if there is a change
if (_currentBorder == newDetectedBorder)
{
@@ -48,7 +53,8 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
if (newDetectedBorder.unknown)
{
// apply the unknown border if we consistently can't determine a border
if (_consistentCnt == _unknownSwitchCnt)
// if (_consistentCnt == _unknownSwitchCnt)
if (_consistentCnt >= _unknownSwitchCnt)
{
_currentBorder = newDetectedBorder;
borderChanged = true;
@@ -57,7 +63,8 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
else
{
// apply the detected border if it has been detected consistently
if (_currentBorder.unknown || _consistentCnt == _borderSwitchCnt)
// if (_currentBorder.unknown || _consistentCnt == _borderSwitchCnt)
if (_currentBorder.unknown || _consistentCnt >= _borderSwitchCnt)
{
_currentBorder = newDetectedBorder;
borderChanged = true;
@@ -65,13 +72,15 @@ bool BlackBorderProcessor::updateBorder(const BlackBorder & newDetectedBorder)
else
{
// apply smaller borders immediately
if (newDetectedBorder.verticalSize < _currentBorder.verticalSize)
// if (newDetectedBorder.verticalSize < _currentBorder.verticalSize)
if ( (newDetectedBorder.verticalSize < _currentBorder.verticalSize) && (_consistentCnt >= 1) )// almost immediatly - avoid switching for "abnormal" frames
{
_currentBorder.verticalSize = newDetectedBorder.verticalSize;
borderChanged = true;
}
if (newDetectedBorder.horizontalSize < _currentBorder.horizontalSize)
// if (newDetectedBorder.horizontalSize < _currentBorder.horizontalSize)
if ( (newDetectedBorder.horizontalSize < _currentBorder.horizontalSize) && (_consistentCnt >= 1) )
{
_currentBorder.horizontalSize = newDetectedBorder.horizontalSize;
borderChanged = true;