meta info: threadsafe registration using g_once

diff --git a/gst/interleave/deinterleave.c b/gst/interleave/deinterleave.c
index f85dfca2e95ef034179fc10a24d41f347dee9148..9784cf1365391f9f5e0595f65f4b52486524f1a5 100644 (file)
--- a/gst/interleave/deinterleave.c
+++ b/gst/interleave/deinterleave.c
@@ -759,6 +759,8 @@ gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf)
   if (!pads_pushed)
     ret = GST_FLOW_NOT_LINKED;
 
+  GST_DEBUG_OBJECT (self, "Pushed on %d pads", pads_pushed);
+
 done:
   gst_buffer_unmap (buf, &read_info);
   gst_buffer_unref (buf);

diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index 897231dfd3cf4389ff79d8546b3751eb017a0d4b..f6fabbb13e1e0b3182d54dbc5d84808d06bc2bf3 100644 (file)
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -75,11 +75,12 @@ gst_v4l2_meta_get_info (void)
 {
   static const GstMetaInfo *meta_info = NULL;
 
-  if (meta_info == NULL) {
-    meta_info =
+  if (g_once_init_enter (&meta_info)) {
+    const GstMetaInfo *meta =
         gst_meta_register (gst_v4l2_meta_api_get_type (), "GstV4l2Meta",
         sizeof (GstV4l2Meta), (GstMetaInitFunction) NULL,
         (GstMetaFreeFunction) NULL, (GstMetaTransformFunction) NULL);
+    g_once_init_leave (&meta_info, meta);
   }
   return meta_info;
 }

diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c
index d81e9a4ad57970c8924971711fbc0b6ad87ae7ae..35069fcfc9eeefb18814ac2541a1b1faf0b7db79 100644 (file)
--- a/sys/ximage/ximageutil.c
+++ b/sys/ximage/ximageutil.c
@@ -41,11 +41,12 @@ gst_meta_ximage_get_info (void)
 {
   static const GstMetaInfo *meta_ximage_info = NULL;
 
-  if (meta_ximage_info == NULL) {
-    meta_ximage_info =
+  if (g_once_init_enter (&meta_ximage_info)) {
+    const GstMetaInfo *meta =
         gst_meta_register (gst_meta_ximage_api_get_type (), "GstMetaXImageSrc",
         sizeof (GstMetaXImage), (GstMetaInitFunction) NULL,
         (GstMetaFreeFunction) NULL, (GstMetaTransformFunction) NULL);
+    g_once_init_leave (&meta_ximage_info, meta);
   }
   return meta_ximage_info;
 }