frontend: Allow 5 multitrack reconnect attempts before re-running GCC

Author: dsaedtler

frontend/plugins/vertical-canvas/version.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#define PROJECT_VERSION "1.5.2"
+#define PROJECT_VERSION_MAJOR 1
+#define PROJECT_VERSION_MINOR 5
+#define PROJECT_VERSION_PATCH 2

frontend/utility/MultitrackVideoOutput.cpp

@@ -17,6 +17,9 @@
 
 #include <cinttypes>
 
+// Maximum reconnect attempts with an invalid key error before giving up (roughly 30 seconds with default start value).
+static constexpr uint8_t MAX_RECONNECT_ATTEMPTS = 5;
+
 Qt::ConnectionType BlockingConnectionTypeFor(QObject *object)
 {
 	return object->thread() == QThread::currentThread() ? Qt::DirectConnection : Qt::BlockingQueuedConnection;
@@ -395,10 +398,11 @@ void MultitrackVideoOutput::PrepareStreaming(QWidget *parent, const char *servic
 	obs_output_add_packet_callback(output, bpm_inject, NULL);
 
 	// Set callback to prevent reconnection attempts once the stream key has become invalid
-	static auto reconnect_cb = [](void *, obs_output_t *, int code) -> bool {
-		return code != OBS_OUTPUT_INVALID_STREAM;
+	static auto reconnect_cb = [](void *param, obs_output_t *, int code) -> bool {
+		auto _this = static_cast<MultitrackVideoOutput *>(param);
+		return code != OBS_OUTPUT_INVALID_STREAM || (_this->reconnect_attempts++ < MAX_RECONNECT_ATTEMPTS);
 	};
-	obs_output_set_reconnect_callback(output, reconnect_cb, nullptr);
+	obs_output_set_reconnect_callback(output, reconnect_cb, this);
 
 	OBSSignal start_streaming;
 	OBSSignal stop_streaming;
@@ -810,6 +814,7 @@ void StreamStartHandler(void *arg, calldata_t *)
 {
 	auto self = static_cast<MultitrackVideoOutput *>(arg);
 	self->restart_on_error = true;
+	self->reconnect_attempts = 0;
 }
 
 void StreamStopHandler(void *arg, calldata_t *data)

frontend/utility/MultitrackVideoOutput.hpp

@@ -63,6 +63,7 @@ struct MultitrackVideoOutput {
 	std::optional<OBSOutputObjects> current_stream_dump;
 
 	bool restart_on_error = false;
+	uint8_t reconnect_attempts = 0;
 
 	friend void StreamStartHandler(void *arg, calldata_t *data);
 	friend void StreamStopHandler(void *arg, calldata_t *data);