mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

waylandsink: prevent frame callback being released twice

Browse source 
For those using context from the application which
would be the embedded video case, if the frame callback
is entering at the same time as window is finalizing,
a wayland proxy object would be destroyed twice, leading
the refcout less than zero in the second time, it can
throw an abort() in wayland.

For those top window case, which as a directly connection
to the compositor, they can stop the message queue then
the frame callback won't happen at the same time as the
window is finalizing. It doesn't think it would bother
them about this.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1883>
This commit is contained in:
Randy Li (ayaka) 2020-12-15 18:11:08 +08:00 committed by Nicolas Dufresne
parent 4ac9f91921
commit 0d746d1022
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/wayland/gstwaylandsink.c
View file

@ -406,6 +406,14 @@ gst_wayland_sink_change_state (GstElement * element, GstStateChange transition)
gst_wl_window_render (sink->window, NULL, NULL);
}
}
g_mutex_lock (&sink->render_lock);
if (sink->callback) {
wl_callback_destroy (sink->callback);
sink->callback = NULL;
}
sink->redraw_pending = FALSE;
g_mutex_unlock (&sink->render_lock);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
g_mutex_lock (&sink->display_lock);
@ -419,12 +427,9 @@ gst_wayland_sink_change_state (GstElement * element, GstStateChange transition)
* to avoid requesting them again from the application if/when we are
* restarted (GstVideoOverlay behaves like that in other sinks)
*/
if (sink->display && !sink->window) { /* -> the window was toplevel */
if (sink->display && !sink->window) /* -> the window was toplevel */
g_clear_object (&sink->display);
g_mutex_lock (&sink->render_lock);
sink->redraw_pending = FALSE;
g_mutex_unlock (&sink->render_lock);
}
g_mutex_unlock (&sink->display_lock);
g_clear_object (&sink->pool);
break;
@ -639,10 +644,12 @@ frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
g_mutex_lock (&sink->render_lock);
sink->redraw_pending = FALSE;
sink->window->callback = NULL;
g_mutex_unlock (&sink->render_lock);
wl_callback_destroy (callback);
if (sink->callback) {
wl_callback_destroy (callback);
sink->callback = NULL;
}
g_mutex_unlock (&sink->render_lock);
}
static const struct wl_callback_listener frame_callback_listener = {
@ -663,7 +670,7 @@ render_last_buffer (GstWaylandSink * sink, gboolean redraw)
sink->redraw_pending = TRUE;
callback = wl_surface_frame (surface);
sink->window->callback = callback;
sink->callback = callback;
wl_callback_add_listener (callback, &frame_callback_listener, sink);
if (G_UNLIKELY (sink->video_info_changed && !redraw)) {

2
ext/wayland/gstwaylandsink.h
View file

@ -67,6 +67,8 @@ struct _GstWaylandSink
gboolean redraw_pending;
GMutex render_lock;
GstBuffer *last_buffer;
struct wl_callback *callback;
};
struct _GstWaylandSinkClass

4
ext/wayland/wlwindow.c
View file

@ -157,9 +157,6 @@ gst_wl_window_finalize (GObject * gobject)
{
GstWlWindow *self = GST_WL_WINDOW (gobject);
if (self->callback)
wl_callback_destroy (self->callback);
if (self->wl_shell_surface)
wl_shell_surface_destroy (self->wl_shell_surface);
@ -200,7 +197,6 @@ gst_wl_window_new_internal (GstWlDisplay * display, GMutex * render_lock)
window->render_lock = render_lock;
g_cond_init (&window->configure_cond);
window->callback = NULL;
window->area_surface = wl_compositor_create_surface (display->compositor);
window->video_surface = wl_compositor_create_surface (display->compositor);

1
ext/wayland/wlwindow.h
View file

@ -55,7 +55,6 @@ struct _GstWlWindow
struct wl_shell_surface *wl_shell_surface;
struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel;
struct wl_callback *callback;
gboolean configured;
GCond configure_cond;
GMutex configure_mutex;