Improved, faster Pipewire + option to disable EGL

Author: awawa-dev

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 awawa-dev
+Copyright (c) 2020-2026 awawa-dev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmake/cmake_modules/FindQmqtt.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2025 awawa-dev
+# Copyright (c) 2020-2026 awawa-dev
 if (NOT WIN32)	
 	if (QMQTT_LIBRARIES AND QMQTT_INCLUDE_DIRS)
 		set(QMQTT_FOUND TRUE)

cmake/osx/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 awawa-dev
+Copyright (c) 2020-2026 awawa-dev
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

include/grabber/linux/pipewire/PipewireHandler.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QDebug>
 #include <QObject>
 #include <QVector>
 #include <QList>
@@ -13,8 +14,11 @@
 #include <spa/debug/types.h>
 #include <grabber/linux/pipewire/smartPipewire.h>
 #include <linux/types.h>
+#include <sys/mman.h>
 #include <HyperhdrConfig.h>
 #include <memory>
+#include <atomic>
+#include <array>
 
 #if !PW_CHECK_VERSION(0, 3, 29)
 #define SPA_POD_PROP_FLAG_MANDATORY (1u << 3)
@@ -40,16 +44,25 @@ typedef EGLBoolean (*eglDestroyImageKHRFun)(EGLDisplay dpy, EGLImageKHR image);
 typedef EGLContext(*eglCreateContextFun)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list);
 typedef EGLBoolean(*eglDestroyContextFun)(EGLDisplay display, EGLContext context);
 typedef EGLBoolean(*eglMakeCurrentFun)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
+typedef EGLContext(*eglGetCurrentContextFun)(void);
 typedef EGLBoolean(*eglBindAPIFun)(EGLenum api);
 typedef void (*glEGLImageTargetTexture2DOESFun)(GLenum target, GLeglImageOES image);
 
-typedef void* (*glXGetProcAddressARBFun)(const char*);
 typedef void (*glBindTextureFun)(GLenum target, GLuint texture);
 typedef void (*glDeleteTexturesFun)(GLsizei n, const GLuint* textures);
 typedef void (*glGenTexturesFun)(GLsizei n, GLuint* textures);
 typedef GLenum (*glGetErrorFun)(void);
 typedef void (*glGetTexImageFun)(GLenum target, GLint level, GLenum format, GLenum type, void* pixels);
 typedef void (*glTexParameteriFun)(GLenum target, GLenum pname, GLint param);
+typedef void (*glGenerateMipmapFun)(GLenum target);
+typedef void (*glPixelStoreiFun)(GLenum pname,GLint param);
+typedef void (*glGenFramebuffersFun)(GLsizei n, GLuint* ids);
+typedef void (*glBindFramebufferFun)(GLenum target, GLuint framebuffer);
+typedef void (*glFramebufferTexture2DFun)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (*glReadPixelsFun)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* data);
+typedef void (*glDeleteFramebuffersFun)(GLsizei n, GLuint* framebuffers);
+typedef void (*glBlitFramebufferFun)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (*glTexImage2DFun)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* data);
 
 #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \
 				 ((__u32)(c) << 16) | ((__u32)(d) << 24))
@@ -79,14 +92,18 @@ class PipewireHandler : public QObject
 
 	PipewireHandler();
 	~PipewireHandler();
-	void startSession(QString restorationToken, uint32_t requestedFPS);
+
+	void startSession(QString restorationToken, uint32_t requestedFPS, bool enableEGL, int targetMaxSize);
 	void closeSession();
 	bool hasError();
 
 	int		getVersion();
 	QString getToken();
 	QString getError();
 
+	pw_stream* getPipewireStream();
+	bool hasIncomingFrame(struct pw_buffer* dequeueFrame);
+
 	static int	readVersion();
 
 	struct PipewireStructure
@@ -107,6 +124,7 @@ public Q_SLOTS:
 	void onStateChanged(enum pw_stream_state old, enum pw_stream_state state, const char* error);
 	void onProcessFrame();
 	void onCoreError(uint32_t id, int seq, int res, const char *message);
+	void onReleaseBuffer(struct pw_buffer* buffer);
 
 signals:
 	void onParamsChangedSignal(uint32_t id, const struct spa_pod* param);
@@ -117,7 +135,7 @@ public Q_SLOTS:
 private:
 	uint8_t* createMemory(int size);
 	void reportError(const QString& input);
-	const QString fourCCtoString(int64_t val);
+	QString fourCCtoString(int64_t val);
 
 	pw_stream*	createCapturingStream();
 	QString		getSessionToken();
@@ -146,14 +164,15 @@ public Q_SLOTS:
 	struct pw_buffer*		_backupFrame;
 	struct pw_buffer*		_workingFrame;
 
+	int		_targetMaxSize;
 	int		_frameWidth;
 	int		_frameHeight;
 	bool	_frameOrderRgb;
-	bool	_framePaused;
 	uint32_t _requestedFPS;
-	bool	_hasFrame;
-	bool	_infoUpdated;
+	std::atomic<struct pw_buffer*> _incomingFrame;
+	int		_infoUpdate;
 	bool	_initEGL;
+	bool	_enableEGL;
 	void*	_libEglHandle;
 	void*	_libGlHandle;
 	int64_t _frameDrmFormat;
@@ -181,19 +200,31 @@ public Q_SLOTS:
 	eglCreateContextFun eglCreateContext = nullptr;
 	eglDestroyContextFun eglDestroyContext = nullptr;
 	eglMakeCurrentFun eglMakeCurrent = nullptr;
+	eglGetCurrentContextFun eglGetCurrentContext = nullptr;
 	glEGLImageTargetTexture2DOESFun glEGLImageTargetTexture2DOES = nullptr;
 	eglBindAPIFun eglBindAPI = nullptr;
 
-	glXGetProcAddressARBFun glXGetProcAddressARB = nullptr;
 	glBindTextureFun glBindTexture = nullptr;
 	glDeleteTexturesFun glDeleteTextures = nullptr;
 	glGenTexturesFun glGenTextures = nullptr;
 	glGetErrorFun glGetError = nullptr;
 	glGetTexImageFun glGetTexImage = nullptr;
 	glTexParameteriFun glTexParameteri = nullptr;
+	glGenerateMipmapFun glGenerateMipmap = nullptr;
+	glPixelStoreiFun glPixelStorei = nullptr;
+	glGenFramebuffersFun glGenFramebuffers = nullptr;
+	glBindFramebufferFun glBindFramebuffer = nullptr;
+	glFramebufferTexture2DFun glFramebufferTexture2D = nullptr;
+	glReadPixelsFun glReadPixels = nullptr;
+	glDeleteFramebuffersFun glDeleteFramebuffers = nullptr;
+	glBlitFramebufferFun glBlitFramebuffer = nullptr;
+	glTexImage2DFun glTexImage2D = nullptr;
 
 	EGLDisplay displayEgl = EGL_NO_DISPLAY;
 	EGLContext contextEgl = EGL_NO_CONTEXT;
+	GLuint _eglTexture = 0;
+	GLuint _eglScratchTex = 0;
+	std::array<GLuint, 2> _eglFbos = { 0, 0 };
 
 	const char* eglErrorToString(EGLint error_number);
 	const char* glErrorToString(GLenum errorType);
@@ -214,7 +245,16 @@ public Q_SLOTS:
 			{ DRM_FORMAT_XBGR8888, SPA_VIDEO_FORMAT_RGBx, GL_RGBA, "DRM_FORMAT_XBGR8888", false},
 			{ DRM_FORMAT_ABGR8888, SPA_VIDEO_FORMAT_RGBA, GL_RGBA, "DRM_FORMAT_ABGR8888", false}
 	};
-
 #endif
 
+	struct PipewireCache {
+
+	#ifdef ENABLE_PIPEWIRE_EGL
+		EGLImageKHR eglImage = EGL_NO_IMAGE_KHR;
+	#endif
+
+		void* mmapPtr = MAP_FAILED;
+		size_t mmapSize = 0;
+
+	};
 };

include/grabber/linux/pipewire/smartPipewire.h

@@ -13,7 +13,7 @@ struct PipewireImage
 extern "C" const char* getPipewireToken();
 extern "C" const char* getPipewireError();
 extern "C" bool hasPipewire();
-extern "C" void initPipewireDisplay(const char* restorationToken, uint32_t requestedFPS);
+extern "C" void initPipewireDisplay(const char* restorationToken, uint32_t requestedFPS, bool enableEGL, int targetMaxSize);
 extern "C" void uninitPipewireDisplay();
 extern "C" PipewireImage getFramePipewire();
 extern "C" void releaseFramePipewire();

sources/base/schema/schema-systemGrabber.json

@@ -29,7 +29,7 @@
 			"type" : "integer",
 			"format": "stepper",
 			"title" : "edt_conf_stream_framerate_title",
-			"default" : 10,
+			"default" : 20,
 			"minimum" : 5,
 			"maximum" : 120,
 			"append" : "fps",			

sources/grabber/linux/pipewire/PipewireGrabber.cpp

@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2025 awawa-dev
+*  Copyright (c) 2020-2026 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *
@@ -53,7 +53,7 @@ namespace
 {
 	bool (*_hasPipewire)() = nullptr;
 	const char* (*_getPipewireError)() = nullptr;
-	void (*_initPipewireDisplay)(const char* restorationToken, uint32_t requestedFPS) = nullptr;
+	void (*_initPipewireDisplay)(const char* restorationToken, uint32_t requestedFPS, bool enableEGL, int targetMaxSize) = nullptr;
 	void (*_uninitPipewireDisplay)() = nullptr;
 	PipewireImage(*_getFramePipewire)() = nullptr;
 	void (*_releaseFramePipewire)() = nullptr;
@@ -81,7 +81,7 @@ PipewireGrabber::PipewireGrabber(const QString& device, const QString& configura
 		_getPipewireToken = (const char* (*)()) dlsym(_library, "getPipewireToken");
 		_getPipewireError = (const char* (*)()) dlsym(_library, "getPipewireError");
 		_hasPipewire = (bool (*)()) dlsym(_library, "hasPipewire");
-		_initPipewireDisplay = (void (*)(const char*, uint32_t)) dlsym(_library, "initPipewireDisplay");
+		_initPipewireDisplay = (void (*)(const char*, uint32_t, bool, int)) dlsym(_library, "initPipewireDisplay");
 		_uninitPipewireDisplay = (void (*)()) dlsym(_library, "uninitPipewireDisplay");
 		_getFramePipewire = (PipewireImage (*)()) dlsym(_library, "getFramePipewire");
 		_releaseFramePipewire = (void (*)()) dlsym(_library, "releaseFramePipewire");
@@ -154,7 +154,7 @@ void PipewireGrabber::uninit()
 		Debug(_log, "Uninit grabber: {:s}", (_deviceName));
 	}
 
-
+	_isActive = false;
 	_initialized = false;
 }
 
@@ -263,12 +263,12 @@ void PipewireGrabber::stop()
 	{
 		_timer.stop();
 
-		_uninitPipewireDisplay();
-		_isActive = false;
+		_uninitPipewireDisplay();		
 		_initialized = false;
 
 		Info(_log, "Stopped");
 	}
+	_isActive = false;
 }
 
 bool PipewireGrabber::init_device(int _display)
@@ -282,14 +282,9 @@ bool PipewireGrabber::init_device(int _display)
 		token = "";
 	else
 		Info(_log, "Loading restoration token: {:s}", (maskToken(token)));
-	_initPipewireDisplay(token.toLatin1().constData(), _fps);
-
-	_isActive = true;
-
-	if (!_isActive)
-		Error(_log, "Could not initialized Pipewire grabber");
+	_initPipewireDisplay(token.toLatin1().constData(), _fps, _hardware, _width);
 
-	return _isActive;
+	return true;
 }
 
 QString PipewireGrabber::maskToken(const QString& token) const
@@ -319,7 +314,7 @@ void PipewireGrabber::grabFrame()
 	bool stopNow = false;
 
 
-	if (_initialized && _isActive)
+	if (_initialized)
 	{
 		PipewireImage data = _getFramePipewire();
 
@@ -360,6 +355,7 @@ void PipewireGrabber::grabFrame()
 		}
 		else
 		{
+			_isActive = true;
 			_actualWidth = data.width;
 			_actualHeight = data.height;
 
@@ -374,7 +370,19 @@ void PipewireGrabber::grabFrame()
 
 	if (stopNow)
 	{
+		bool lastActive = _isActive;
 		uninit();
+		_isActive = lastActive;
+		if (_isActive)
+		{
+			QTimer::singleShot(3000, this, [this]() {
+				if (_isActive)
+				{
+					_isActive = false;
+					start();
+				}
+			});
+		}
 	}
 }