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

plugin: Do not use weak ref on importer

Browse Source 
There is no good reason to keep using weak ref on importer within paintable object. Change that to a gst_object_ref which is faster.
This commit is contained in:
Rafał Dzięgiel
2022-05-18 18:28:20 +02:00
parent bb56efa705
commit 2b85afc03e
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/gst/plugin/gstclapperpaintable.c vendored
View File

@@ -64,7 +64,6 @@ gst_clapper_paintable_init (GstClapperPaintable *self)
g_mutex_init (&self->lock); g_mutex_init (&self->lock);
gst_video_info_init (&self->v_info); gst_video_info_init (&self->v_info);
g_weak_ref_init (&self->widget, NULL); g_weak_ref_init (&self->widget, NULL);
g_weak_ref_init (&self->importer, NULL);
gdk_rgba_parse (&self->bg, "black"); gdk_rgba_parse (&self->bg, "black");
} }
@@ -94,7 +93,7 @@ gst_clapper_paintable_finalize (GObject *object)
GST_TRACE ("Finalize"); GST_TRACE ("Finalize");
g_weak_ref_clear (&self->widget); g_weak_ref_clear (&self->widget);
g_weak_ref_clear (&self->importer); gst_clear_object (&self->importer);
g_mutex_clear (&self->lock); g_mutex_clear (&self->lock);
GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
@@ -236,7 +235,9 @@ gst_clapper_paintable_set_widget (GstClapperPaintable *self, GtkWidget *widget)
void void
gst_clapper_paintable_set_importer (GstClapperPaintable *self, GstClapperImporter *importer) gst_clapper_paintable_set_importer (GstClapperPaintable *self, GstClapperImporter *importer)
{ {
g_weak_ref_set (&self->importer, importer); GST_CLAPPER_PAINTABLE_LOCK (self);
gst_object_replace ((GstObject **) &self->importer, GST_OBJECT_CAST (importer));
GST_CLAPPER_PAINTABLE_UNLOCK (self);
} }
void void
@@ -325,7 +326,7 @@ gst_clapper_paintable_snapshot_internal (GstClapperPaintable *self,
GdkSnapshot *snapshot, gdouble width, gdouble height, GdkSnapshot *snapshot, gdouble width, gdouble height,
gint widget_width, gint widget_height) gint widget_width, gint widget_height)
{ {
GstClapperImporter *importer; GstClapperImporter *importer = NULL;
gfloat scale_x, scale_y; gfloat scale_x, scale_y;
GST_LOG_OBJECT (self, "Snapshot"); GST_LOG_OBJECT (self, "Snapshot");
@@ -351,10 +352,15 @@ gst_clapper_paintable_snapshot_internal (GstClapperPaintable *self,
} }
} }
if ((importer = g_weak_ref_get (&self->importer))) { GST_CLAPPER_PAINTABLE_LOCK (self);
if (self->importer)
importer = gst_object_ref (self->importer);
GST_CLAPPER_PAINTABLE_UNLOCK (self);
if (importer) {
gst_clapper_importer_snapshot (importer, snapshot, width, height, gst_clapper_importer_snapshot (importer, snapshot, width, height,
scale_x * self->pixel_aspect, scale_y); scale_x * self->pixel_aspect, scale_y);
g_object_unref (importer); gst_object_unref (importer);
} else { } else {
GST_LOG_OBJECT (self, "No texture importer, drawing black"); GST_LOG_OBJECT (self, "No texture importer, drawing black");
gtk_snapshot_append_color (snapshot, &self->bg, &GRAPHENE_RECT_INIT (0, 0, width, height)); gtk_snapshot_append_color (snapshot, &self->bg, &GRAPHENE_RECT_INIT (0, 0, width, height));

3
lib/gst/plugin/gstclapperpaintable.h vendored
View File

@@ -46,7 +46,8 @@ struct _GstClapperPaintable
GdkRGBA bg; GdkRGBA bg;
GWeakRef widget, importer; GWeakRef widget;
GstClapperImporter *importer;
/* Sink properties */ /* Sink properties */
gint par_n, par_d; gint par_n, par_d;