Video

.github/actions/run-clang-format/action.yaml

@@ -29,6 +29,7 @@ runs:
         eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
         echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
         echo "/home/linuxbrew/.linuxbrew/opt/clang-format@16/bin" >> $GITHUB_PATH
+        brew update
         brew install --quiet zsh
         echo ::endgroup::
 
@@ -52,6 +53,7 @@ runs:
 
         if (( ${changes[(I)(*.c|*.h|*.cpp|*.hpp|*.m|*.mm)]} )) {
           echo ::group::Install clang-format-16
+          brew update
           brew install --quiet obsproject/tools/clang-format@16
           echo ::endgroup::
 

.github/scripts/.Wingetfile

@@ -1,4 +1,4 @@
 package 'cmake', path: 'Cmake\bin', bin: 'cmake'
 package 'innosetup', path: 'Inno Setup 6', bin: 'iscc'
-package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
+package 'OpenSSL', path: 'OpenSSL', bin: 'openssl', version: '3.6.2'
 package 'Microsoft.VisualStudio.Locator', path: 'vswhere', bin: 'vswhere'

.github/workflows/build-project.yaml

@@ -6,7 +6,7 @@ on:
         description: "Project name detected by parsing build spec file"
         value: ${{ jobs.check-event.outputs.pluginName }}
 env:
-  DEP_DIR: .deps/advss-build-dependencies-4
+  DEP_DIR: .deps/advss-build-dependencies-5
 jobs:
   check-event:
     name: Check GitHub Event Data 🔎

data/locale/en-US.ini

@@ -2352,6 +2352,14 @@ AdvSceneSwitcher.tempVar.video.similarity="Similarity Rating"
 AdvSceneSwitcher.tempVar.video.similarity.description="Values range from 0 to 1, where 0 means dissimilar and 1 means highly similar."
 AdvSceneSwitcher.tempVar.video.patternCount="Pattern count"
 AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame."
+AdvSceneSwitcher.tempVar.video.matchX="Match X coordinate"
+AdvSceneSwitcher.tempVar.video.matchX.description="The X coordinate of the top-left corner of the best pattern match.\nIf the 'check area' option is enabled, the coordinate is relative to the video source, not the area.\nSet to -1 if no match was found."
+AdvSceneSwitcher.tempVar.video.matchY="Match Y coordinate"
+AdvSceneSwitcher.tempVar.video.matchY.description="The Y coordinate of the top-left corner of the best pattern match.\nIf the 'check area' option is enabled, the coordinate is relative to the video source, not the area.\nSet to -1 if no match was found."
+AdvSceneSwitcher.tempVar.video.matchWidth="Match width"
+AdvSceneSwitcher.tempVar.video.matchWidth.description="The width of the matched pattern in pixels."
+AdvSceneSwitcher.tempVar.video.matchHeight="Match height"
+AdvSceneSwitcher.tempVar.video.matchHeight.description="The height of the matched pattern in pixels."
 AdvSceneSwitcher.tempVar.video.objectCount="Object count"
 AdvSceneSwitcher.tempVar.video.objectCount.description="The number of objects the given model has identified in a given video input frame."
 AdvSceneSwitcher.tempVar.video.brightness="Average brightness"

lib/macro/macro-segment-copy-paste.cpp

@@ -57,6 +57,8 @@ void MacroEdit::PasteMacroSegment()
 	OBSDataAutoRelease data = obs_data_create();
 	copyInfo.segment->Save(data);
 
+	const MacroSegment *const original = copyInfo.segment.get();
+
 	switch (copyInfo.type) {
 	case MacroSegmentCopyInfo::Type::CONDITION: {
 		const auto condition = std::static_pointer_cast<MacroCondition>(
@@ -72,15 +74,26 @@ void MacroEdit::PasteMacroSegment()
 		}
 		AddMacroCondition(macro.get(), macro->Conditions().size(),
 				  copyInfo.segment->GetId(), data.Get(), logic);
+		if (!macro->Conditions().empty()) {
+			macro->Conditions().back()->FixupVarMappingRefs(
+				original);
+		}
 		break;
 	}
 	case MacroSegmentCopyInfo::Type::ACTION:
 		AddMacroAction(macro.get(), macro->Actions().size(),
 			       copyInfo.segment->GetId(), data.Get());
+		if (!macro->Actions().empty()) {
+			macro->Actions().back()->FixupVarMappingRefs(original);
+		}
 		break;
 	case MacroSegmentCopyInfo::Type::ELSE:
 		AddMacroElseAction(macro.get(), macro->ElseActions().size(),
 				   copyInfo.segment->GetId(), data.Get());
+		if (!macro->ElseActions().empty()) {
+			macro->ElseActions().back()->FixupVarMappingRefs(
+				original);
+		}
 		break;
 	default:
 		break;

lib/macro/macro-segment.cpp

@@ -54,6 +54,23 @@ const std::vector<VarMapping> &MacroSegment::GetVarMappings() const
 void MacroSegment::SetVarMappings(const std::vector<VarMapping> &mappings)
 {
 	_varMappings = mappings;
+	IncrementTempVarInUseGeneration();
+}
+
+void MacroSegment::FixupVarMappingRefs(const MacroSegment *originalSegment)
+{
+	for (auto &mapping : _varMappings) {
+		auto refSeg = mapping.tempVar._segment.lock();
+		if (refSeg.get() != originalSegment) {
+			continue;
+		}
+		for (const auto &var : _tempVariables) {
+			if (var.ID() == mapping.tempVar._id) {
+				mapping.tempVar = var.GetRef();
+				break;
+			}
+		}
+	}
 }
 
 std::vector<TempVariable> MacroSegment::GetOwnTempVars() const

lib/macro/macro-segment.hpp

@@ -57,6 +57,7 @@ class EXPORT MacroSegment : public Lockable {
 	const std::vector<VarMapping> &GetVarMappings() const;
 	void SetVarMappings(const std::vector<VarMapping> &mappings);
 	std::vector<TempVariable> GetOwnTempVars() const;
+	void FixupVarMappingRefs(const MacroSegment *originalSegment);
 
 protected:
 	friend bool SupportsVariableValue(MacroSegment *);

lib/utils/source-helpers.cpp

@@ -172,11 +172,12 @@ void SourceActiveKeeper::SetActive(bool active)
 	if (_active == active) {
 		return;
 	}
-	_active = active;
-	if (_active) {
+	if (active) {
+		_active = true;
 		AcquireRef();
 	} else {
 		ReleaseRef();
+		_active = false;
 	}
 }
 

lib/utils/temp-variable.hpp

@@ -87,6 +87,7 @@ class TempVariableRef {
 
 	friend TempVariable;
 	friend TempVariableSelection;
+	friend MacroSegment;
 };
 
 class ADVSS_EXPORT TempVariableSelection : public QWidget {

plugins/base/utils/profile-helpers.cpp

@@ -25,6 +25,9 @@ void PopulateProfileSelection(QComboBox *box)
 std::string GetPathInProfileDir(const char *filePath)
 {
 	auto path = obs_frontend_get_current_profile_path();
+	if (!path) {
+		return "";
+	}
 	std::string result(path);
 	bfree(path);
 	return result + "/" + filePath;

plugins/video/macro-condition-video.cpp

@@ -124,6 +124,10 @@ void MacroConditionVideo::UpdateActiveKeeper()
 	if (_video.type == VideoInput::Type::OBS_MAIN_OUTPUT) {
 		return;
 	}
+	if (!_keepActive) {
+		_lastActiveKeeperSource = nullptr;
+		return;
+	}
 	auto videoSource = _video.GetVideo();
 	if (videoSource == _lastActiveKeeperSource) {
 		return;
@@ -296,13 +300,41 @@ bool MacroConditionVideo::ScreenshotContainsPattern()
 			     _patternMatchParameters.threshold, result,
 			     _patternMatchParameters.useAlphaAsMask,
 			     _patternMatchParameters.matchMode);
+
 	if (result.total() == 0) {
 		SetTempVarValue("similarity", std::to_string(bestMatchValue));
 		SetTempVarValue("patternCount", "0");
+		SetTempVarValue("matchX", "-1");
+		SetTempVarValue("matchY", "-1");
+		SetTempVarValue("matchWidth", "0");
+		SetTempVarValue("matchHeight", "0");
 		return false;
 	}
 
 	SetTempVarValue("similarity", std::to_string(bestMatchValue));
+	SetTempVarValue("matchWidth",
+			std::to_string(_patternImageData.rgbaPattern.cols));
+	SetTempVarValue("matchHeight",
+			std::to_string(_patternImageData.rgbaPattern.rows));
+
+	if (IsTempVarInUse("matchX") || IsTempVarInUse("matchY")) {
+		double maxVal;
+		cv::Point maxLoc;
+		cv::minMaxLoc(result, nullptr, &maxVal, nullptr, &maxLoc);
+		if (maxVal > 0.0) {
+			int matchX = maxLoc.x;
+			int matchY = maxLoc.y;
+			if (_areaParameters.enable) {
+				matchX += _areaParameters.area.x;
+				matchY += _areaParameters.area.y;
+			}
+			SetTempVarValue("matchX", std::to_string(matchX));
+			SetTempVarValue("matchY", std::to_string(matchY));
+		} else {
+			SetTempVarValue("matchX", "-1");
+			SetTempVarValue("matchY", "-1");
+		}
+	}
 
 	if (IsTempVarInUse("patternCount")) {
 		const auto count = CountPatternMatches(
@@ -473,6 +505,30 @@ void MacroConditionVideo::SetupTempVars()
 				"AdvSceneSwitcher.tempVar.video.patternCount"),
 			obs_module_text(
 				"AdvSceneSwitcher.tempVar.video.patternCount.description"));
+		AddTempvar(
+			"matchX",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchX"),
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchX.description"));
+		AddTempvar(
+			"matchY",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchY"),
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchY.description"));
+		AddTempvar(
+			"matchWidth",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchWidth"),
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchWidth.description"));
+		AddTempvar(
+			"matchHeight",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchHeight"),
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.video.matchHeight.description"));
 		break;
 	case VideoCondition::OBJECT:
 		AddTempvar(

plugins/video/opencv-helpers.cpp

@@ -231,10 +231,9 @@ std::optional<std::string> RunOCR(tesseract::TessBaseAPI *ocr,
 				  const QImage &image, const QColor &color,
 				  double colorDiff)
 {
-	(void)ocr;
 	(void)color;
 	(void)colorDiff;
-	if (image.isNull()) {
+	if (!ocr || image.isNull()) {
 		return {};
 	}
 

plugins/video/parameter-wrappers.hpp

@@ -108,7 +108,10 @@ class OCRParameters {
 	void SetCustomConfigFile(const std::string &);
 	std::string GetCustomConfigFile() const { return configFile; }
 	tesseract::PageSegMode GetPageMode() const { return pageSegMode; }
-	tesseract::TessBaseAPI *GetOCR() const { return ocr.get(); }
+	tesseract::TessBaseAPI *GetOCR() const
+	{
+		return initDone ? ocr.get() : nullptr;
+	}
 
 	StringVariable text = obs_module_text("AdvSceneSwitcher.enterText");
 	RegexConfig regex = RegexConfig::PartialMatchRegexConfig();

plugins/video/preview-dialog.cpp

@@ -391,6 +391,7 @@ void PreviewImage::MarkOCRMatch(QImage &screenshot,
 	if (!text) {
 		emit StatusUpdate(obs_module_text(
 			"AdvSceneSwitcher.condition.video.ocrMatchFail"));
+		return;
 	}
 
 	QString status(obs_module_text(