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

Merge branch 'fix-wldisplay' into 'main'

Browse source 
wayland: Fix wayland display handle request message

See merge request gstreamer/gstreamer!4707
This commit is contained in:
Pavel Shramov 2024-05-03 20:26:02 +00:00
parent 73c64e8182 173de8cdd3
commit 3a7d6c22c7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglutils.c
View file

@ -203,7 +203,7 @@ gst_gl_display_context_query (GstElement * element, GstGLDisplay ** display_ptr)
#endif
#if GST_GL_HAVE_WINDOW_WAYLAND
_gst_context_query (element, "GstWaylandDisplayHandleContextType");
_gst_context_query (element, "GstWlDisplayHandleContextType");
if (*display_ptr)
return;
#endif
@ -259,7 +259,7 @@ gst_gl_element_propagate_display_context (GstElement * element,
*
* This performs #GstContext queries (if necessary) for a winsys display
* connection with %GST_GL_DISPLAY_CONTEXT_TYPE, "gst.x11.display.handle", and
* "GstWaylandDisplayHandleContextType" stopping after the first successful
* "GstWlDisplayHandleContextType" stopping after the first successful
* retrieval.
*
* This also performs a #GstContext query (if necessary) for an optional
@ -357,7 +357,7 @@ gst_gl_handle_set_context (GstElement * element, GstContext * context,
}
#endif
#if GST_GL_HAVE_WINDOW_WAYLAND
else if (g_strcmp0 (context_type, "GstWaylandDisplayHandleContextType") == 0) {
else if (g_strcmp0 (context_type, "GstWlDisplayHandleContextType") == 0) {
const GstStructure *s;
struct wl_display *display;
@ -486,7 +486,7 @@ gst_gl_handle_context_query (GstElement * element, GstQuery * query,
#endif
#if GST_GL_HAVE_WINDOW_WAYLAND
else if (display
&& g_strcmp0 (context_type, "GstWaylandDisplayHandleContextType") == 0) {
&& g_strcmp0 (context_type, "GstWlDisplayHandleContextType") == 0) {
GstStructure *s;
gst_query_parse_context (query, &old_context);
@ -494,7 +494,7 @@ gst_gl_handle_context_query (GstElement * element, GstQuery * query,
if (old_context)
context = gst_context_copy (old_context);
else
context = gst_context_new ("GstWaylandDisplayHandleContextType", TRUE);
context = gst_context_new ("GstWlDisplayHandleContextType", TRUE);
if (gst_gl_display_get_handle_type (display) & GST_GL_DISPLAY_TYPE_WAYLAND) {
struct wl_display *wayland_display =

4
subprojects/gst-plugins-base/tests/examples/gl/gtk/gstgtk.c
View file

@ -54,7 +54,7 @@ gst_gtk_handle_need_context (GstBus * bus, GstMessage * msg, gpointer data)
gst_message_parse_context_type (msg, &context_type);
g_print ("got need context %s\n", context_type);
if (g_strcmp0 (context_type, "GstWaylandDisplayHandleContextType") == 0) {
if (g_strcmp0 (context_type, "GstWlDisplayHandleContextType") == 0) {
#if GST_GL_HAVE_WINDOW_WAYLAND && defined(GDK_WINDOWING_WAYLAND)
GstContext *context = NULL;
GdkDisplay *gdk_display = gdk_display_get_default ();
@ -65,7 +65,7 @@ gst_gtk_handle_need_context (GstBus * bus, GstMessage * msg, gpointer data)
GstStructure *s;
context =
gst_context_new ("GstWaylandDisplayHandleContextType", TRUE);
gst_context_new ("GstWlDisplayHandleContextType", TRUE);
s = gst_context_writable_structure (context);
gst_structure_set (s, "display", G_TYPE_POINTER, wayland_display,