mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gldisplay: add a dedicated event thread

Browse source 
Will take the place of the navigation event thread for dealing with
winsys events.
This commit is contained in:
Matthew Waters 2016-06-30 23:04:16 +10:00
parent 92ba1d0df6
commit 1a6c4be242
2 changed files with 91 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
gst-libs/gst/gl/gstgldisplay.c
View file

@ -94,6 +94,8 @@ enum
static guint gst_gl_display_signals[LAST_SIGNAL] = { 0 };
static void gst_gl_display_dispose (GObject * object);
static void gst_gl_display_finalize (GObject * object);
static guintptr gst_gl_display_default_get_handle (GstGLDisplay * display);
@ -102,8 +104,49 @@ struct _GstGLDisplayPrivate
GstGLAPI gl_api;
GList *contexts;
GThread *event_thread;
GMutex thread_lock;
GCond thread_cond;
};
static gboolean
_unlock_main_thread (GstGLDisplay * display)
{
g_mutex_unlock (&display->priv->thread_lock);
return G_SOURCE_REMOVE;
}
static gpointer
_event_thread_main (GstGLDisplay * display)
{
g_mutex_lock (&display->priv->thread_lock);
display->main_context = g_main_context_new ();
display->main_loop = g_main_loop_new (display->main_context, FALSE);
g_main_context_invoke (display->main_context,
(GSourceFunc) _unlock_main_thread, display);
g_cond_broadcast (&display->priv->thread_cond);
g_main_loop_run (display->main_loop);
g_mutex_lock (&display->priv->thread_lock);
g_main_loop_unref (display->main_loop);
g_main_context_unref (display->main_context);
display->main_loop = NULL;
display->main_context = NULL;
g_cond_broadcast (&display->priv->thread_cond);
g_mutex_unlock (&display->priv->thread_lock);
return NULL;
}
static void
gst_gl_display_class_init (GstGLDisplayClass * klass)
{
@ -128,6 +171,7 @@ gst_gl_display_class_init (GstGLDisplayClass * klass)
klass->get_handle = gst_gl_display_default_get_handle;
G_OBJECT_CLASS (klass)->finalize = gst_gl_display_finalize;
G_OBJECT_CLASS (klass)->dispose = gst_gl_display_dispose;
}
static void
@ -138,6 +182,17 @@ gst_gl_display_init (GstGLDisplay * display)
display->type = GST_GL_DISPLAY_TYPE_ANY;
display->priv->gl_api = GST_GL_API_ANY;
g_mutex_init (&display->priv->thread_lock);
g_cond_init (&display->priv->thread_cond);
display->priv->event_thread = g_thread_new ("gldisplay-event",
(GThreadFunc) _event_thread_main, display);
g_mutex_lock (&display->priv->thread_lock);
while (!display->main_loop)
g_cond_wait (&display->priv->thread_cond, &display->priv->thread_lock);
g_mutex_unlock (&display->priv->thread_lock);
GST_TRACE ("init %p", display);
gst_gl_buffer_init_once ();
@ -149,6 +204,34 @@ gst_gl_display_init (GstGLDisplay * display)
#endif
}
static void
gst_gl_display_dispose (GObject * object)
{
GstGLDisplay *display = GST_GL_DISPLAY (object);
if (display->main_loop)
g_main_loop_quit (display->main_loop);
if (display->priv->event_thread) {
/* can't use g_thread_join() as we could lose the last ref from a user
* function */
g_mutex_lock (&display->priv->thread_lock);
while (display->main_loop)
g_cond_wait (&display->priv->thread_cond, &display->priv->thread_lock);
g_mutex_unlock (&display->priv->thread_lock);
g_thread_unref (display->priv->event_thread);
}
display->priv->event_thread = NULL;
if (display->event_source) {
g_source_destroy (display->event_source);
g_source_unref (display->event_source);
}
display->event_source = NULL;
G_OBJECT_CLASS (gst_gl_display_parent_class)->dispose (object);
}
static void
gst_gl_display_finalize (GObject * object)
{
@ -164,6 +247,9 @@ gst_gl_display_finalize (GObject * object)
g_list_free (display->priv->contexts);
g_cond_clear (&display->priv->thread_cond);
g_mutex_clear (&display->priv->thread_lock);
G_OBJECT_CLASS (gst_gl_display_parent_class)->finalize (object);
}

5
gst-libs/gst/gl/gstgldisplay.h
View file

@ -78,6 +78,11 @@ struct _GstGLDisplay
GstGLDisplayType type;
/* <protected> */
GMainContext *main_context;
GMainLoop *main_loop;
GSource *event_source;
GstGLDisplayPrivate *priv;
};