mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

waylandsink: Wait for the surface to be configured

Browse source 
With latest XDG shell, we need to fait for the surface to have been
configured before we can attach a buffer to it. This is being enforce by
Weston with an error.

Fixes #933
This commit is contained in:
Nicolas Dufresne 2019-03-25 22:21:09 -04:00 committed by Nicolas Dufresne
parent 0e89f2a6d9
commit 3fea1fa50b
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/wayland/wlwindow.c
View file

@ -87,7 +87,13 @@ static void
handle_xdg_surface_configure (void *data, struct xdg_surface *xdg_surface, handle_xdg_surface_configure (void *data, struct xdg_surface *xdg_surface,
uint32_t serial) uint32_t serial)
{ {
GstWlWindow *window = data;
xdg_surface_ack_configure (xdg_surface, serial); xdg_surface_ack_configure (xdg_surface, serial);
g_mutex_lock (&window->configure_mutex);
window->configured = TRUE;
g_cond_signal (&window->configure_cond);
g_mutex_unlock (&window->configure_mutex);
} }
static const struct xdg_surface_listener xdg_surface_listener = { static const struct xdg_surface_listener xdg_surface_listener = {
@ -141,6 +147,9 @@ gst_wl_window_class_init (GstWlWindowClass * klass)
static void static void
gst_wl_window_init (GstWlWindow * self) gst_wl_window_init (GstWlWindow * self)
{ {
self->configured = TRUE;
g_cond_init (&self->configure_cond);
g_mutex_init (&self->configure_mutex);
} }
static void static void
@ -185,6 +194,7 @@ gst_wl_window_new_internal (GstWlDisplay * display, GMutex * render_lock)
window = g_object_new (GST_TYPE_WL_WINDOW, NULL); window = g_object_new (GST_TYPE_WL_WINDOW, NULL);
window->display = g_object_ref (display); window->display = g_object_ref (display);
window->render_lock = render_lock; window->render_lock = render_lock;
g_cond_init (&window->configure_cond);
window->area_surface = wl_compositor_create_surface (display->compositor); window->area_surface = wl_compositor_create_surface (display->compositor);
window->video_surface = wl_compositor_create_surface (display->compositor); window->video_surface = wl_compositor_create_surface (display->compositor);
@ -268,10 +278,17 @@ gst_wl_window_new_toplevel (GstWlDisplay * display, const GstVideoInfo * info,
xdg_toplevel_add_listener (window->xdg_toplevel, xdg_toplevel_add_listener (window->xdg_toplevel,
&xdg_toplevel_listener, window); &xdg_toplevel_listener, window);
/* Finally, commit the xdg_surface state as toplevel */
wl_surface_commit (window->area_surface);
gst_wl_window_ensure_fullscreen (window, fullscreen); gst_wl_window_ensure_fullscreen (window, fullscreen);
/* Finally, commit the xdg_surface state as toplevel */
window->configured = FALSE;
wl_surface_commit (window->video_surface);
wl_display_flush (display->display);
g_mutex_lock (&window->configure_mutex);
while (!window->configured)
g_cond_wait (&window->configure_cond, &window->configure_mutex);
g_mutex_unlock (&window->configure_mutex);
} else if (display->wl_shell) { } else if (display->wl_shell) {
/* go toplevel */ /* go toplevel */
window->wl_shell_surface = wl_shell_get_shell_surface (display->wl_shell, window->wl_shell_surface = wl_shell_get_shell_surface (display->wl_shell,

3
ext/wayland/wlwindow.h
View file

@ -55,6 +55,9 @@ struct _GstWlWindow
struct wl_shell_surface *wl_shell_surface; struct wl_shell_surface *wl_shell_surface;
struct xdg_surface *xdg_surface; struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel; struct xdg_toplevel *xdg_toplevel;
gboolean configured;
GCond configure_cond;
GMutex configure_mutex;
/* the size and position of the area_(sub)surface */ /* the size and position of the area_(sub)surface */
GstVideoRectangle render_rectangle; GstVideoRectangle render_rectangle;