Fix Pipewire crash on stream pause

awawa-dev · Mar 16, 2024 · f48842e · f48842e
1 parent fc83579
commit f48842e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/sources/grabber/pipewire/PipewireGrabber.cpp b/sources/grabber/pipewire/PipewireGrabber.cpp
@@ -352,8 +352,8 @@ void PipewireGrabber::grabFrame()
 		{
 			if (data.isError)
 			{
-				QString err = QString("%1").arg(_getPipewireError());
-				Error(_log, "Could not capture pipewire frame: %s", QSTRING_CSTR(err));
+				//QString err = QString("%1").arg(_getPipewireError());
+				Error(_log, "Could not capture pipewire frame. The grabber is reporting an error");
 				stopNow = true;
 			}
 		}

diff --git a/sources/grabber/pipewire/PipewireHandler.cpp b/sources/grabber/pipewire/PipewireHandler.cpp
@@ -250,6 +250,11 @@ void PipewireHandler::closeSession()
 
 void PipewireHandler::releaseWorkingFrame()
 {
+	if (_isError)
+	{
+		_image.data = nullptr;
+		_image.isError = _isError;
+	}
 }
 
 QString PipewireHandler::getSessionToken()
@@ -699,7 +704,7 @@ void PipewireHandler::captureFrame()
 	uint8_t* mappedMemory = nullptr;
 	uint8_t* frameBuffer = nullptr;	
 
-	if (_pwStream == nullptr)
+	if (_pwStream == nullptr || _framePaused)
 		return;
 
 	_hasFrame = false;
@@ -714,7 +719,12 @@ void PipewireHandler::captureFrame()
 	while ((dequeueFrame = pw_stream_dequeue_buffer(_pwStream)) != nullptr)
 	{
 		if (newFrame != nullptr)
+		{
+			if (pw_stream_get_state(_pwStream, NULL) != PW_STREAM_STATE_STREAMING)
+				return;
+
 			pw_stream_queue_buffer(_pwStream, newFrame);
+		}
 		newFrame = dequeueFrame;
 	}
 
@@ -881,7 +891,12 @@ void PipewireHandler::captureFrame()
 		munmap(mappedMemory, newFrame->buffer->datas->maxsize + newFrame->buffer->datas->mapoffset);
 
 	if (newFrame != nullptr)
+	{
+		if (pw_stream_get_state(_pwStream, NULL) != PW_STREAM_STATE_STREAMING)
+			return;
+
 		pw_stream_queue_buffer(_pwStream, newFrame);
+	}
 
 	// goodbye
 	_infoUpdated = true;