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

Cleanup screenshot helper

Browse Source
This commit is contained in:
WarmUpTill
2024-09-22 10:09:03 +02:00
committed by WarmUpTill
parent c39ea0854a
commit 55ab096e49
9 changed files with 165 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/base/macro-action-screenshot.cpp
View File

@@ -32,8 +32,8 @@ void MacroActionScreenshot::CustomScreenshot(OBSWeakSource &source)
return;
}
auto s = obs_weak_source_get_source(source);
_screenshot.~ScreenshotHelper();
new (&_screenshot) ScreenshotHelper(s, QRect(), false, 0, true, _path);
_screenshot.~Screenshot();
new (&_screenshot) Screenshot(s, QRect(), false, 0, true, _path);
obs_source_release(s);
}
@@ -230,11 +230,7 @@ void MacroActionScreenshotEdit::UpdateEntryData()
void MacroActionScreenshotEdit::SceneChanged(const SceneSelection &s)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_scene = s;
emit HeaderInfoChanged(
QString::fromStdString(_entryData->GetShortDesc()));

2
plugins/base/macro-action-screenshot.hpp
View File

@@ -42,7 +42,7 @@ private:
void FrontendScreenshot(OBSWeakSource &);
void CustomScreenshot(OBSWeakSource &);
ScreenshotHelper _screenshot;
Screenshot _screenshot;
static bool _registered;
static const std::string id;

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

@@ -1,4 +1,5 @@
#include "macro-condition-video.hpp"
#include "screenshot-dialog.hpp"
#include <layout-helpers.hpp>
#include <macro-condition-edit.hpp>
@@ -147,12 +148,12 @@ bool MacroConditionVideo::CheckCondition()
GetScreenshot(true);
}
if (_screenshotData.done) {
if (_screenshotData.IsDone()) {
match = Compare();
_lastMatchResult = match;
if (!requiresFileInput(_condition)) {
_matchImage = std::move(_screenshotData.image);
_matchImage = std::move(_screenshotData.GetImage());
}
_getNextScreenshot = true;
} else {
@@ -225,7 +226,7 @@ std::string MacroConditionVideo::GetShortDesc() const
void MacroConditionVideo::GetScreenshot(bool blocking)
{
auto source = obs_weak_source_get_source(_video.GetVideo());
_screenshotData.~ScreenshotHelper();
_screenshotData.~Screenshot();
QRect screenshotArea;
if (_areaParameters.enable && _condition != VideoCondition::NO_IMAGE) {
screenshotArea.setRect(_areaParameters.area.x,
@@ -233,8 +234,8 @@ void MacroConditionVideo::GetScreenshot(bool blocking)
_areaParameters.area.width,
_areaParameters.area.height);
}
new (&_screenshotData) ScreenshotHelper(source, screenshotArea,
blocking, GetIntervalValue());
new (&_screenshotData) Screenshot(source, screenshotArea, blocking,
GetIntervalValue());
obs_source_release(source);
_getNextScreenshot = false;
}
@@ -293,7 +294,7 @@ void MacroConditionVideo::SetCondition(VideoCondition condition)
bool MacroConditionVideo::ScreenshotContainsPattern()
{
cv::Mat result;
MatchPattern(_screenshotData.image, _patternImageData,
MatchPattern(_screenshotData.GetImage(), _patternImageData,
_patternMatchParameters.threshold, result, nullptr,
_patternMatchParameters.useAlphaAsMask,
_patternMatchParameters.matchMode);
@@ -319,12 +320,12 @@ bool MacroConditionVideo::FileInputIsUpToDate() const
bool MacroConditionVideo::OutputChanged()
{
if (!_patternMatchParameters.useForChangedCheck) {
return _screenshotData.image != _matchImage;
return _screenshotData.GetImage() != _matchImage;
}
cv::Mat result;
_patternImageData = CreatePatternData(_matchImage);
MatchPattern(_screenshotData.image, _patternImageData,
MatchPattern(_screenshotData.GetImage(), _patternImageData,
_patternMatchParameters.threshold, result, nullptr,
_patternMatchParameters.useAlphaAsMask,
_patternMatchParameters.matchMode);
@@ -336,7 +337,7 @@ bool MacroConditionVideo::OutputChanged()
bool MacroConditionVideo::ScreenshotContainsObject()
{
auto objects = MatchObject(_screenshotData.image,
auto objects = MatchObject(_screenshotData.GetImage(),
_objMatchParameters.cascade,
_objMatchParameters.scaleFactor,
_objMatchParameters.minNeighbors,
@@ -349,7 +350,8 @@ bool MacroConditionVideo::ScreenshotContainsObject()
bool MacroConditionVideo::CheckBrightnessThreshold()
{
_currentBrightness = GetAvgBrightness(_screenshotData.image) / 255.;
_currentBrightness =
GetAvgBrightness(_screenshotData.GetImage()) / 255.;
SetTempVarValue("brightness", std::to_string(_currentBrightness));
return _currentBrightness > _brightnessThreshold;
}
@@ -360,7 +362,7 @@ bool MacroConditionVideo::CheckOCR()
return false;
}
auto text = RunOCR(_ocrParameters.GetOCR(), _screenshotData.image,
auto text = RunOCR(_ocrParameters.GetOCR(), _screenshotData.GetImage(),
_ocrParameters.color, _ocrParameters.colorThreshold);
SetVariableValue(text);
SetTempVarValue("text", text);
@@ -373,14 +375,14 @@ bool MacroConditionVideo::CheckOCR()
bool MacroConditionVideo::CheckColor()
{
const bool ret = ContainsPixelsInColorRange(
_screenshotData.image, _colorParameters.color,
_screenshotData.GetImage(), _colorParameters.color,
_colorParameters.colorThreshold,
_colorParameters.matchThreshold);
// Way too slow for now
//SetTempVarValue("dominantColor", GetDominantColor(_screenshotData.image, 3)
// .name(QColor::HexArgb)
// .toStdString());
SetTempVarValue("color", GetAverageColor(_screenshotData.image)
SetTempVarValue("color", GetAverageColor(_screenshotData.GetImage())
.name(QColor::HexArgb)
.toStdString());
return ret;
@@ -394,15 +396,15 @@ bool MacroConditionVideo::Compare()
switch (_condition) {
case VideoCondition::MATCH:
return _screenshotData.image == _matchImage;
return _screenshotData.GetImage() == _matchImage;
case VideoCondition::DIFFER:
return _screenshotData.image != _matchImage;
return _screenshotData.GetImage() != _matchImage;
case VideoCondition::HAS_CHANGED:
return OutputChanged();
case VideoCondition::HAS_NOT_CHANGED:
return !OutputChanged();
case VideoCondition::NO_IMAGE:
return _screenshotData.image.isNull();
return _screenshotData.GetImage().isNull();
case VideoCondition::PATTERN:
return ScreenshotContainsPattern();
case VideoCondition::OBJECT:
@@ -1418,11 +1420,6 @@ void MacroConditionVideoEdit::ImageBrowseButtonClicked()
}
} else {
auto source = obs_weak_source_get_source(
_entryData->_video.GetVideo());
ScreenshotHelper screenshot(source);
obs_source_release(source);
path = QFileDialog::getSaveFileName(
this, "",
FileSelection::ValidPathOrDesktop(
@@ -1435,22 +1432,13 @@ void MacroConditionVideoEdit::ImageBrowseButtonClicked()
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
return;
}
if (!screenshot.done) { // Screenshot usually completed by now
std::this_thread::sleep_for(std::chrono::seconds(1));
}
if (!screenshot.done) {
DisplayMessage(obs_module_text(
"AdvSceneSwitcher.condition.video.screenshotFail"));
auto source = OBSGetStrongRef(_entryData->_video.GetVideo());
auto screenshot = ScreenshotDialog::AskForScreenshot(source);
if (!screenshot) {
return;
}
if (_entryData->_areaParameters.enable) {
screenshot.image = screenshot.image.copy(
_entryData->_areaParameters.area.x,
_entryData->_areaParameters.area.y,
_entryData->_areaParameters.area.width,
_entryData->_areaParameters.area.height);
}
screenshot.image.save(path);
screenshot->save(path);
}
_imagePath->SetPath(path);
ImagePathChanged(path);
@@ -1458,11 +1446,7 @@ void MacroConditionVideoEdit::ImageBrowseButtonClicked()
void MacroConditionVideoEdit::UsePatternForChangedCheckChanged(int value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_patternMatchParameters.useForChangedCheck = value;
SetWidgetVisibility();
}
@@ -1470,11 +1454,7 @@ void MacroConditionVideoEdit::UsePatternForChangedCheckChanged(int value)
void MacroConditionVideoEdit::PatternThresholdChanged(
const DoubleVariable &value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_patternMatchParameters.threshold = value;
_previewDialog.PatternMatchParametersChanged(
_entryData->_patternMatchParameters);
@@ -1482,21 +1462,13 @@ void MacroConditionVideoEdit::PatternThresholdChanged(
void MacroConditionVideoEdit::ReduceLatencyChanged(int value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_blockUntilScreenshotDone = value;
}
void MacroConditionVideoEdit::UseAlphaAsMaskChanged(int value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_patternMatchParameters.useAlphaAsMask = value;
_entryData->LoadImageFromFile();
_previewDialog.PatternMatchParametersChanged(
@@ -1505,11 +1477,7 @@ void MacroConditionVideoEdit::UseAlphaAsMaskChanged(int value)
void MacroConditionVideoEdit::PatternMatchModeChanged(int idx)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_patternMatchParameters.matchMode =
static_cast<cv::TemplateMatchModes>(
_patternMatchMode->itemData(idx).toInt());
@@ -1519,22 +1487,14 @@ void MacroConditionVideoEdit::PatternMatchModeChanged(int idx)
void MacroConditionVideoEdit::ThrottleEnableChanged(int value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_throttleEnabled = value;
_throttleCount->setEnabled(value);
}
void MacroConditionVideoEdit::ThrottleCountChanged(int value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_throttleCount = value / GetIntervalValue();
}

2
plugins/video/macro-condition-video.hpp
View File

@@ -90,7 +90,7 @@ private:
VideoCondition _condition = VideoCondition::MATCH;
bool _getNextScreenshot = true;
ScreenshotHelper _screenshotData;
Screenshot _screenshotData;
QImage _matchImage;
PatternImageData _patternImageData;

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

@@ -277,17 +277,18 @@ void PreviewImage::CreateImage(const VideoInput &video, PreviewType type,
areaParams.area.width,
areaParams.area.height);
}
ScreenshotHelper screenshot(source, screenshotArea, true);
Screenshot screenshot(source, screenshotArea, true);
obs_source_release(source);
if (!video.ValidSelection() || !screenshot.done) {
if (!video.ValidSelection() || !screenshot.IsDone()) {
emit StatusUpdate(obs_module_text(
"AdvSceneSwitcher.condition.video.screenshotFail"));
emit ImageReady(QPixmap());
return;
}
if (screenshot.image.width() == 0 || screenshot.image.height() == 0) {
if (screenshot.GetImage().width() == 0 ||
screenshot.GetImage().height() == 0) {
emit StatusUpdate(obs_module_text(
"AdvSceneSwitcher.condition.video.screenshotEmpty"));
emit ImageReady(QPixmap());
@@ -297,14 +298,14 @@ void PreviewImage::CreateImage(const VideoInput &video, PreviewType type,
if (type == PreviewType::SHOW_MATCH) {
std::unique_lock<std::mutex> lock(_mtx);
// Will emit status label update
MarkMatch(screenshot.image, patternMatchParams,
MarkMatch(screenshot.GetImage(), patternMatchParams,
patternImageData, objDetectParams, ocrParams,
condition);
} else {
emit StatusUpdate(obs_module_text(
"AdvSceneSwitcher.condition.video.selectArea.status"));
}
emit ImageReady(QPixmap::fromImage(screenshot.image));
emit ImageReady(QPixmap::fromImage(screenshot.GetImage()));
}
void PreviewImage::MarkMatch(QImage &screenshot,