mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-22 02:08:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gldisplay-crash' into 'main'

Browse source 
gldisplay_egl: Fix crash by eglTerminate() for foreign display

See merge request gstreamer/gstreamer!3743
This commit is contained in:
Seungha Yang 2024-05-03 18:33:13 +00:00
parent 66c1383051 ca7de24bc3
commit 06e44879dd
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-base/gst-libs/gst/gl/egl/gstgldisplay_egl.c
View file

@ -41,6 +41,10 @@
#include "gsteglimage.h"
#include "gstglmemoryegl.h"
#if GST_GL_HAVE_WINDOW_WAYLAND
#include <gst/gl/wayland/gstgldisplay_wayland.h>
#endif
GST_DEBUG_CATEGORY_STATIC (gst_gl_display_egl_debug);
#define GST_CAT_DEFAULT gst_gl_display_egl_debug
@ -409,6 +413,16 @@ gst_gl_display_egl_from_gl_display (GstGLDisplay * display)
gst_object_unref (ret);
return NULL;
}
#if GST_GL_HAVE_WINDOW_WAYLAND
if (display_type == GST_GL_DISPLAY_TYPE_WAYLAND &&
GST_IS_GL_DISPLAY_WAYLAND (display)) {
/* Cannot call terminate if the external wayland display has egl connection
* and it's still active after the termination */
ret->foreign_display =
GST_GL_DISPLAY_WAYLAND_CAST (display)->foreign_display;
}
#endif
g_object_set_data_full (G_OBJECT (display), GST_GL_DISPLAY_EGL_NAME,
gst_object_ref (ret), (GDestroyNotify) gst_object_unref);