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

Split macro-condition-video.cpp UI into per-widget files
Some checks failed
debian-build / build (push) Has been cancelled
Details
Push to master / Check Formatting 🔍 (push) Has been cancelled
Details
Push to master / Build Project 🧱 (push) Has been cancelled
Details
Push to master / Create Release 🛫 (push) Has been cancelled
Details

Browse Source 
This makes it easier to conditionally exclude video-edit-object.cpp
from the build when OpenCV >= 5 drops CascadeClassifier support.
This commit is contained in:
WarmUpTill
2026-07-18 22:13:54 +02:00
committed by WarmUpTill
parent 1030868a75
commit 107d77f1b8
23 changed files with 1098 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/video/preview-dialog.cpp
View File

@@ -1,9 +1,9 @@
#include "preview-dialog.hpp"
#include "opencv-helpers.hpp"
#include "screenshot-helper.hpp"
#include "ui-helpers.hpp"
#include <QLayout>
#include <screenshot-helper.hpp>
namespace advss {
@@ -131,10 +131,11 @@ void PreviewDialog::PatternMatchParametersChanged(
_patternImageData = CreatePatternData(_patternMatchParams.image);
}
void PreviewDialog::ObjDetectParametersChanged(const ObjDetectParameters &params)
void PreviewDialog::CascadeClassifierParametersChanged(
const CascadeClassifierParameters &params)
{
std::unique_lock<std::mutex> lock(_mtx);
_objDetectParams = std::make_shared<ObjDetectParameters>(params);
_cascadeParams = std::make_shared<CascadeClassifierParameters>(params);
}
void PreviewDialog::OCRParametersChanged(const OCRParameters &params)
@@ -185,7 +186,7 @@ void PreviewDialog::UpdateImage(const QPixmap &image)
DrawFrame();
}
emit NeedImage(_video, _type, _patternMatchParams, _patternImageData,
_objDetectParams, _ocrParams, _areaParams, _condition);
_cascadeParams, _ocrParams, _areaParams, _condition);
}
void PreviewDialog::Start()
@@ -215,7 +216,7 @@ void PreviewDialog::Start()
_thread.start();
emit NeedImage(_video, _type, _patternMatchParams, _patternImageData,
_objDetectParams, _ocrParams, _areaParams, _condition);
_cascadeParams, _ocrParams, _areaParams, _condition);
}
void PreviewDialog::DrawFrame()
@@ -266,7 +267,7 @@ void PreviewImage::CreateImage(
const VideoInput &video, PreviewType type,
const PatternMatchParameters &patternMatchParams,
const PatternImageData &patternImageData,
std::shared_ptr<ObjDetectParameters> objDetectParams,
std::shared_ptr<CascadeClassifierParameters> cascadeParams,
std::shared_ptr<OCRParameters> ocrParams,
const AreaParameters &areaParams, VideoCondition condition)
{
@@ -299,7 +300,7 @@ void PreviewImage::CreateImage(
std::unique_lock<std::mutex> lock(_mtx);
// Will emit status label update
MarkMatch(screenshot.GetImage(), patternMatchParams,
patternImageData, objDetectParams, ocrParams,
patternImageData, cascadeParams, ocrParams,
condition);
} else {
emit StatusUpdate(obs_module_text(
@@ -311,14 +312,16 @@ void PreviewImage::CreateImage(
void PreviewImage::MarkMatch(
QImage &screenshot, const PatternMatchParameters &patternMatchParams,
const PatternImageData &patternImageData,
std::shared_ptr<ObjDetectParameters> objDetectParams,
std::shared_ptr<CascadeClassifierParameters> cascadeParams,
std::shared_ptr<OCRParameters> ocrParams, VideoCondition condition)
{
if (condition == VideoCondition::PATTERN) {
MarkPatternMatch(screenshot, patternMatchParams,
patternImageData);
} else if (condition == VideoCondition::OBJECT) {
MarkObjectMatch(screenshot, objDetectParams);
} else if (condition == VideoCondition::OBJECT_CASCADE) {
MarkObjectsFromDetector(
screenshot,
cascadeParams ? cascadeParams->GetDetector() : nullptr);
} else if (condition == VideoCondition::OCR) {
MarkOCRMatch(screenshot, ocrParams);
}
@@ -347,26 +350,15 @@ void PreviewImage::MarkPatternMatch(
}
}
void PreviewImage::MarkObjectMatch(
QImage &screenshot,
const std::shared_ptr<ObjDetectParameters> &objDetectParams)
void PreviewImage::MarkObjectsFromDetector(QImage &screenshot,
ObjectDetector *detector)
{
if (!objDetectParams) {
if (!detector) {
emit StatusUpdate(obs_module_text(
"AdvSceneSwitcher.condition.video.objectMatchFail"));
return;
}
auto model = objDetectParams->GetModel();
if (!model) {
emit StatusUpdate(obs_module_text(
"AdvSceneSwitcher.condition.video.objectMatchFail"));
return;
}
auto objects = MatchObject(screenshot, *model,
objDetectParams->scaleFactor,
objDetectParams->minNeighbors,
objDetectParams->minSize.CV(),
objDetectParams->maxSize.CV());
auto objects = detector->Detect(screenshot);
if (objects.empty()) {
emit StatusUpdate(obs_module_text(
"AdvSceneSwitcher.condition.video.objectMatchFail"));