mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

wpe: Add support for SHM without requiring EGLDisplay

Browse source 
The previous version of the SHM export support still required a valid
EGLDisplay. The upcoming WPEBackend-FDO 1.8.x aims to remove this requirement,
hence allowing wpesrc to be used without GPU.
This commit is contained in:
Philippe Normand 2020-04-03 15:45:02 +01:00 committed by GStreamer Merge Bot
parent 04f3f4be4f
commit 991bcb22d5
2 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
ext/wpe/WPEThreadedView.cpp
View file

@ -31,6 +31,10 @@
#include <cstdio> #include <cstdio>
#include <mutex> #include <mutex>
#if ENABLE_SHM_BUFFER_SUPPORT
#include <wpe/unstable/fdo-shm.h>
#endif
GST_DEBUG_CATEGORY_EXTERN (wpe_src_debug); GST_DEBUG_CATEGORY_EXTERN (wpe_src_debug);
#define GST_CAT_DEFAULT wpe_src_debug #define GST_CAT_DEFAULT wpe_src_debug
@ -187,18 +191,10 @@ bool WPEThreadedView::initialize(GstWpeSrc* src, GstGLContext* context, GstGLDis
#endif #endif
}); });
EGLDisplay eglDisplay; EGLDisplay eglDisplay = EGL_NO_DISPLAY;
if (context && display) if (context && display)
eglDisplay = gst_gl_display_egl_get_from_native(GST_GL_DISPLAY_TYPE_WAYLAND, eglDisplay = gst_gl_display_egl_get_from_native(GST_GL_DISPLAY_TYPE_WAYLAND,
gst_gl_display_get_handle(display)); gst_gl_display_get_handle(display));
else {
eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
if (eglDisplay == EGL_NO_DISPLAY)
return false;
if (!eglInitialize(eglDisplay, nullptr, nullptr) || !eglBindAPI(EGL_OPENGL_ES_API))
return false;
}
GST_DEBUG("eglDisplay %p", eglDisplay); GST_DEBUG("eglDisplay %p", eglDisplay);
struct InitializeContext { struct InitializeContext {
@ -229,15 +225,31 @@ bool WPEThreadedView::initialize(GstWpeSrc* src, GstGLContext* context, GstGLDis
view.wpe.width = initializeContext.width; view.wpe.width = initializeContext.width;
view.wpe.height = initializeContext.height; view.wpe.height = initializeContext.height;
if (initializeContext.eglDisplay) {
initializeContext.result = wpe_fdo_initialize_for_egl_display(initializeContext.eglDisplay); initializeContext.result = wpe_fdo_initialize_for_egl_display(initializeContext.eglDisplay);
GST_DEBUG("FDO EGL display initialisation result: %d", initializeContext.result); GST_DEBUG("FDO EGL display initialisation result: %d", initializeContext.result);
} else {
#if ENABLE_SHM_BUFFER_SUPPORT
initializeContext.result = wpe_fdo_initialize_shm();
GST_DEBUG("FDO SHM initialisation result: %d", initializeContext.result);
#else
GST_WARNING("FDO SHM support is available only in WPEBackend-FDO 1.7.0");
#endif
}
if (!initializeContext.result) { if (!initializeContext.result) {
g_cond_signal(&view.threading.cond); g_cond_signal(&view.threading.cond);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
view.wpe.exportable = wpe_view_backend_exportable_fdo_egl_create(&s_exportableClient, if (initializeContext.eglDisplay) {
view.wpe.exportable = wpe_view_backend_exportable_fdo_egl_create(&s_exportableEGLClient,
&view, view.wpe.width, view.wpe.height); &view, view.wpe.width, view.wpe.height);
} else {
#if ENABLE_SHM_BUFFER_SUPPORT
view.wpe.exportable = wpe_view_backend_exportable_fdo_create(&s_exportableClient,
&view, view.wpe.width, view.wpe.height);
#endif
}
auto* wpeViewBackend = wpe_view_backend_exportable_fdo_get_view_backend(view.wpe.exportable); auto* wpeViewBackend = wpe_view_backend_exportable_fdo_get_view_backend(view.wpe.exportable);
auto* viewBackend = webkit_web_view_backend_new(wpeViewBackend, nullptr, nullptr); auto* viewBackend = webkit_web_view_backend_new(wpeViewBackend, nullptr, nullptr);
#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0) #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
@ -637,7 +649,7 @@ void WPEThreadedView::handleExportedBuffer(struct wpe_fdo_shm_exported_buffer* b
} }
#endif #endif
struct wpe_view_backend_exportable_fdo_egl_client WPEThreadedView::s_exportableClient = { struct wpe_view_backend_exportable_fdo_egl_client WPEThreadedView::s_exportableEGLClient = {
#if USE_DEPRECATED_FDO_EGL_IMAGE #if USE_DEPRECATED_FDO_EGL_IMAGE
// export_egl_image // export_egl_image
[](void* data, EGLImageKHR image) { [](void* data, EGLImageKHR image) {
@ -652,19 +664,25 @@ struct wpe_view_backend_exportable_fdo_egl_client WPEThreadedView::s_exportableC
auto& view = *static_cast<WPEThreadedView*>(data); auto& view = *static_cast<WPEThreadedView*>(data);
view.handleExportedImage(static_cast<gpointer>(image)); view.handleExportedImage(static_cast<gpointer>(image));
}, },
nullptr,
#endif // USE_DEPRECATED_FDO_EGL_IMAGE
// padding
nullptr, nullptr
};
#if ENABLE_SHM_BUFFER_SUPPORT #if ENABLE_SHM_BUFFER_SUPPORT
struct wpe_view_backend_exportable_fdo_client WPEThreadedView::s_exportableClient = {
nullptr,
nullptr,
// export_shm_buffer // export_shm_buffer
[](void* data, struct wpe_fdo_shm_exported_buffer* buffer) { [](void* data, struct wpe_fdo_shm_exported_buffer* buffer) {
auto& view = *static_cast<WPEThreadedView*>(data); auto& view = *static_cast<WPEThreadedView*>(data);
view.handleExportedBuffer(buffer); view.handleExportedBuffer(buffer);
}, },
#else
nullptr, nullptr,
#endif // ENABLE_SHM_BUFFER_SUPPORT nullptr,
#endif // USE_DEPRECATED_FDO_EGL_IMAGE
// padding
nullptr, nullptr
}; };
#endif
void WPEThreadedView::s_releaseImage(GstEGLImage* image, gpointer data) void WPEThreadedView::s_releaseImage(GstEGLImage* image, gpointer data)
{ {

8
ext/wpe/WPEThreadedView.h
View file

@ -31,7 +31,7 @@ typedef struct _GstGLContext GstGLContext;
typedef struct _GstGLDisplay GstGLDisplay; typedef struct _GstGLDisplay GstGLDisplay;
typedef struct _GstEGLImage GstEGLImage; typedef struct _GstEGLImage GstEGLImage;
#if defined(WPE_FDO_CHECK_VERSION) && WPE_FDO_CHECK_VERSION(1, 6, 0) #if defined(WPE_FDO_CHECK_VERSION) && WPE_FDO_CHECK_VERSION(1, 7, 0)
#define ENABLE_SHM_BUFFER_SUPPORT 1 #define ENABLE_SHM_BUFFER_SUPPORT 1
#else #else
#define ENABLE_SHM_BUFFER_SUPPORT 0 #define ENABLE_SHM_BUFFER_SUPPORT 0
@ -91,7 +91,11 @@ private:
GstGLDisplay* display; GstGLDisplay* display;
} gst { nullptr, nullptr }; } gst { nullptr, nullptr };
static struct wpe_view_backend_exportable_fdo_egl_client s_exportableClient; static struct wpe_view_backend_exportable_fdo_egl_client s_exportableEGLClient;
#if ENABLE_SHM_BUFFER_SUPPORT
static struct wpe_view_backend_exportable_fdo_client s_exportableClient;
#endif
static void s_releaseImage(GstEGLImage*, gpointer); static void s_releaseImage(GstEGLImage*, gpointer);
struct { struct {
struct wpe_view_backend_exportable_fdo* exportable; struct wpe_view_backend_exportable_fdo* exportable;