dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 07:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

sink: Use g_main_context_invoke_full for drawing

Browse Source 
Queue draws to application (and GTK) main context using g_main_context_invoke_full method
This commit is contained in:
Rafał Dzięgiel
2021-05-26 20:59:50 +02:00
parent c2de0b7b33
commit f8a7abe195
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/gst/clapper/gtk4/gtkclapperglwidget.c
View File

@@ -284,7 +284,6 @@ static gboolean
_queue_draw (GtkClapperGLWidget * clapper_widget) _queue_draw (GtkClapperGLWidget * clapper_widget)
{ {
GTK_CLAPPER_GL_WIDGET_LOCK (clapper_widget); GTK_CLAPPER_GL_WIDGET_LOCK (clapper_widget);
clapper_widget->draw_id = 0;
if (clapper_widget->pending_resize) { if (clapper_widget->pending_resize) {
clapper_widget->pending_resize = FALSE; clapper_widget->pending_resize = FALSE;
@@ -748,8 +747,8 @@ gtk_clapper_gl_widget_finalize (GObject * object)
if (priv->display) if (priv->display)
gst_object_unref (priv->display); gst_object_unref (priv->display);
if (clapper_widget->draw_id) if (clapper_widget->app_context)
g_source_remove (clapper_widget->draw_id); g_main_context_unref (clapper_widget->app_context);
gst_buffer_replace (&clapper_widget->pending_buffer, NULL); gst_buffer_replace (&clapper_widget->pending_buffer, NULL);
gst_buffer_replace (&clapper_widget->buffer, NULL); gst_buffer_replace (&clapper_widget->buffer, NULL);
@@ -800,10 +799,9 @@ gtk_clapper_gl_widget_set_buffer (GtkClapperGLWidget * clapper_widget,
gst_buffer_replace (&clapper_widget->pending_buffer, buffer); gst_buffer_replace (&clapper_widget->pending_buffer, buffer);
if (!clapper_widget->draw_id) { g_main_context_invoke_full (clapper_widget->app_context,
clapper_widget->draw_id = g_idle_add_full (G_PRIORITY_DEFAULT, G_PRIORITY_DEFAULT - 10, (GSourceFunc) _queue_draw,
(GSourceFunc) _queue_draw, clapper_widget, NULL); g_object_ref (clapper_widget), g_object_unref);
}
GTK_CLAPPER_GL_WIDGET_UNLOCK (clapper_widget); GTK_CLAPPER_GL_WIDGET_UNLOCK (clapper_widget);
} }
@@ -956,6 +954,7 @@ gtk_clapper_gl_widget_init (GtkClapperGLWidget * clapper_widget)
clapper_widget->par_n = DEFAULT_PAR_N; clapper_widget->par_n = DEFAULT_PAR_N;
clapper_widget->par_d = DEFAULT_PAR_D; clapper_widget->par_d = DEFAULT_PAR_D;
clapper_widget->ignore_textures = DEFAULT_IGNORE_TEXTURES; clapper_widget->ignore_textures = DEFAULT_IGNORE_TEXTURES;
clapper_widget->app_context = g_main_context_ref_thread_default ();
gst_video_info_init (&clapper_widget->v_info); gst_video_info_init (&clapper_widget->v_info);
gst_video_info_init (&clapper_widget->pending_v_info); gst_video_info_init (&clapper_widget->pending_v_info);

4
lib/gst/clapper/gtk4/gtkclapperglwidget.h
View File

@@ -65,6 +65,7 @@ struct _GtkClapperGLWidget
GstBuffer *pending_buffer; GstBuffer *pending_buffer;
GstBuffer *buffer; GstBuffer *buffer;
GstVideoInfo v_info; GstVideoInfo v_info;
GMainContext *app_context;
/* resize */ /* resize */
gboolean pending_resize; gboolean pending_resize;
@@ -80,9 +81,6 @@ struct _GtkClapperGLWidget
GtkEventController *key_controller; GtkEventController *key_controller;
GtkEventController *motion_controller; GtkEventController *motion_controller;
GtkGesture *click_gesture; GtkGesture *click_gesture;
/* Pending draw idles callback */
guint draw_id;
}; };
struct _GtkClapperGLWidgetClass struct _GtkClapperGLWidgetClass