Restart Pipewire grabber only when it's needed

Author: awawa-dev

include/grabber/linux/pipewire/PipewireHandler.h

@@ -96,6 +96,7 @@ class PipewireHandler : public QObject
 	void startSession(QString restorationToken, uint32_t requestedFPS, bool enableEGL, int targetMaxSize);
 	void closeSession();
 	bool hasError();
+	bool isRestartNeeded();
 
 	int		getVersion();
 	QString getToken();

include/grabber/linux/pipewire/smartPipewire.h

@@ -17,4 +17,5 @@ extern "C" void initPipewireDisplay(const char* restorationToken, uint32_t reque
 extern "C" void uninitPipewireDisplay();
 extern "C" PipewireImage getFramePipewire();
 extern "C" void releaseFramePipewire();
+extern "C" bool isRestartNeeded();
 

sources/grabber/linux/pipewire/PipewireGrabber.cpp

@@ -58,6 +58,7 @@ namespace
 	PipewireImage(*_getFramePipewire)() = nullptr;
 	void (*_releaseFramePipewire)() = nullptr;
 	const char* (*_getPipewireToken)() = nullptr;
+	bool (*_isRestartNeeded)() = nullptr;
 }
 
 PipewireGrabber::PipewireGrabber(const QString& device, const QString& configurationPath)
@@ -91,11 +92,13 @@ PipewireGrabber::PipewireGrabber(const QString& device, const QString& configura
 		_uninitPipewireDisplay = (void (*)()) dlsym(_library, "uninitPipewireDisplay");
 		_getFramePipewire = (PipewireImage (*)()) dlsym(_library, "getFramePipewire");
 		_releaseFramePipewire = (void (*)()) dlsym(_library, "releaseFramePipewire");
+		_isRestartNeeded = (bool (*)()) dlsym(_library, "isRestartNeeded");
 	}
 	else
 		Warning(_log, "Could not load Pipewire proxy library. Error: {:s}", dlerror());
 
-	if (_library && (_getPipewireToken == nullptr || _hasPipewire == nullptr || _releaseFramePipewire == nullptr || _initPipewireDisplay == nullptr || _uninitPipewireDisplay == nullptr || _getFramePipewire == nullptr))
+	if (_library && (_getPipewireToken == nullptr || _hasPipewire == nullptr || _releaseFramePipewire == nullptr ||
+		_initPipewireDisplay == nullptr || _uninitPipewireDisplay == nullptr || _getFramePipewire == nullptr || _isRestartNeeded == nullptr))
 	{
 		Error(_log, "Could not load Pipewire proxy library definition. Error: {:s}", dlerror());
 
@@ -115,14 +118,21 @@ void PipewireGrabber::restart()
 {
 	if (!_isActive)
 	{
-		Info(_log, "Restarting the grabber");
-		uninit();
-		QTimer::singleShot(1000, this, [this]() {
-			if (_retryTimer->isActive())
-			{
-				this->start();
-			}
-		});
+		if (_isRestartNeeded())
+		{
+			Info(_log, "Restarting the grabber");
+			uninit();
+			QTimer::singleShot(1000, this, [this]() {
+				if (_retryTimer->isActive())
+				{
+						this->start();
+				}
+			});
+		}
+		else
+		{
+			Info(_log, "The grabber restart is not needed.");
+		}
 		_retryTimer->start();
 	}
 	else

sources/grabber/linux/pipewire/PipewireHandler.cpp

@@ -310,6 +310,11 @@ bool PipewireHandler::hasError()
 	return _isError;
 }
 
+bool PipewireHandler::isRestartNeeded()
+{
+	return _isError || _replySessionPath.isEmpty() || (_startReplyPath.isEmpty() && !_portalStatus);
+}
+
 int PipewireHandler::getVersion()
 {
 	return _version;
@@ -494,9 +499,11 @@ void PipewireHandler::selectSourcesResponse(uint response)
 	{
 		auto responseSignalHandler = [this] (uint32_t resultCode, std::map<std::string, sdbus::Variant> results)
 		{
+			_startReplyPath = "";
+
 			if (resultCode != 0)
 			{
-				qWarning().nospace() << "Start session returned an error code: " << ((resultCode == 1) ? "cancelled" : "other");
+				reportError(QString("Start session returned an error code: %1").arg(((resultCode == 1) ? "cancelled" : "other")));
 				return;
 			}
 
@@ -516,7 +523,7 @@ void PipewireHandler::selectSourcesResponse(uint response)
 				auto streamsIter = results.find("streams");
 				if (streamsIter == results.end())
 				{
-					qCritical().nospace() << "Start session didnt return streams";
+					reportError("Start session didnt return streams");
 				}
 				else
 				{

sources/grabber/linux/pipewire/smartPipewire.cpp

@@ -131,3 +131,7 @@ PipewireImage getFramePipewire()
 	return retVal;
 }
 
+bool isRestartNeeded()
+{
+	return pipewireHandler.isRestartNeeded();
+}