Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-20 00:05:41 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Move responsibility of cascade init to ObjDetectParameters

Browse Source
This commit is contained in:
WarmUpTill
2025-05-23 21:27:02 +02:00
committed by WarmUpTill
parent 0e5f56b562
commit 32d29875ed
4 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/video/macro-condition-video.cpp
View File

@@ -86,18 +86,6 @@ const static std::map<tesseract::PageSegMode, std::string> pageSegModes = {
"AdvSceneSwitcher.condition.video.ocrMode.sparseTextOSD"},
};
static cv::CascadeClassifier initObjectCascade(std::string &path)
{
cv::CascadeClassifier cascade;
try {
cascade.load(path);
} catch (...) {
blog(LOG_WARNING, "failed to load model data \"%s\"",
path.c_str());
}
return cascade;
}
static bool requiresFileInput(VideoCondition t)
{
return t == VideoCondition::MATCH || t == VideoCondition::DIFFER ||
@@ -212,10 +200,6 @@ bool MacroConditionVideo::Load(obs_data_t *obj)
(void)LoadImageFromFile();
}
if (_condition == VideoCondition::OBJECT) {
LoadModelData(_objMatchParameters.modelPath);
}
return true;
}
@@ -265,18 +249,6 @@ bool MacroConditionVideo::LoadImageFromFile()
return true;
}
bool MacroConditionVideo::LoadModelData(std::string &path)
{
_objMatchParameters.modelPath = path;
_objMatchParameters.cascade = initObjectCascade(path);
return !_objMatchParameters.cascade.empty();
}
std::string MacroConditionVideo::GetModelDataPath() const
{
return _objMatchParameters.modelPath;
}
void MacroConditionVideo::SetPageSegMode(tesseract::PageSegMode mode)
{
_ocrParameters.SetPageMode(mode);
@@ -344,8 +316,11 @@ bool MacroConditionVideo::OutputChanged()
bool MacroConditionVideo::ScreenshotContainsObject()
{
auto objects = MatchObject(_screenshotData.GetImage(),
_objMatchParameters.cascade,
auto model = _objMatchParameters.GetModel();
if (!model) {
return false;
}
auto objects = MatchObject(_screenshotData.GetImage(), *model,
_objMatchParameters.scaleFactor,
_objMatchParameters.minNeighbors,
_objMatchParameters.minSize.CV(),
@@ -936,7 +911,7 @@ ObjectDetectEdit::ObjectDetectEdit(
layout->addLayout(sizeLayout);
setLayout(layout);
_modelDataPath->SetPath(_entryData->GetModelDataPath());
_modelDataPath->SetPath(_entryData->_objMatchParameters.GetModelPath());
_objectScaleThreshold->SetDoubleValue(
_entryData->_objMatchParameters.scaleFactor);
_minNeighbors->setValue(_entryData->_objMatchParameters.minNeighbors);
@@ -987,7 +962,7 @@ void ObjectDetectEdit::ModelPathChanged(const QString &text)
{
auto lock = LockContext();
std::string path = text.toStdString();
dataLoaded = _entryData->LoadModelData(path);
dataLoaded = _entryData->_objMatchParameters.SetModelPath(path);
}
if (!dataLoaded) {
DisplayMessage(obs_module_text(
@@ -1416,12 +1391,6 @@ void MacroConditionVideoEdit::ConditionChanged(int idx)
_previewDialog.PatternMatchParametersChanged(
_entryData->_patternMatchParameters);
if (_entryData->GetCondition() == VideoCondition::OBJECT) {
auto path = _entryData->GetModelDataPath();
_entryData->_objMatchParameters.cascade =
initObjectCascade(path);
}
SetupPreviewDialogParams();
}