memory: make GstAllocator a miniobject

diff --git a/gst/gstmemory.c b/gst/gstmemory.c
index 8eb112e722b33a3f1c983a39c86e491fd22f0668..5c6a0c86b0e3d2a922b6e893a3df20c843b0870a 100644 (file)
--- a/gst/gstmemory.c
+++ b/gst/gstmemory.c
@@ -80,8 +80,7 @@ static GstAllocTrace *_gst_allocator_trace;
 G_DEFINE_BOXED_TYPE (GstMemory, gst_memory, (GBoxedCopyFunc) gst_memory_ref,
     (GBoxedFreeFunc) gst_memory_unref);
 
-G_DEFINE_BOXED_TYPE (GstAllocator, gst_allocator,
-    (GBoxedCopyFunc) gst_allocator_ref, (GBoxedFreeFunc) gst_allocator_unref);
+GST_DEFINE_MINI_OBJECT_TYPE (GstAllocator, gst_allocator);
 
 G_DEFINE_BOXED_TYPE (GstAllocationParams, gst_allocation_params,
     (GBoxedCopyFunc) gst_allocation_params_copy,
@@ -101,7 +100,7 @@ size_t gst_memory_alignment = 0;
 
 struct _GstAllocator
 {
-  gint refcount;
+  GstMiniObject mini_object;
 
   GstMemoryInfo info;
 
@@ -812,6 +811,48 @@ gst_memory_is_span (GstMemory * mem1, GstMemory * mem2, gsize * offset)
   return TRUE;
 }
 
+static void
+_gst_allocator_free (GstAllocator * allocator)
+{
+  if (allocator->notify)
+    allocator->notify (allocator->user_data);
+
+  g_slice_free1 (GST_MINI_OBJECT_SIZE (allocator), allocator);
+}
+
+static void gst_allocator_init (GstAllocator * allocator,
+    const GstMemoryInfo * info, gsize size);
+
+static GstAllocator *
+_gst_allocator_copy (GstAllocator * allocator)
+{
+  GstAllocator *copy;
+
+  copy = g_slice_new (GstAllocator);
+
+  gst_allocator_init (copy, &allocator->info, sizeof (GstAllocator));
+
+  return copy;
+}
+
+static void
+gst_allocator_init (GstAllocator * allocator, const GstMemoryInfo * info,
+    gsize size)
+{
+  gst_mini_object_init (GST_MINI_OBJECT_CAST (allocator),
+      gst_allocator_get_type (), size);
+
+  allocator->mini_object.copy = (GstMiniObjectCopyFunction) _gst_allocator_copy;
+  allocator->mini_object.free = (GstMiniObjectFreeFunction) _gst_allocator_free;
+
+  allocator->info = *info;
+#define INSTALL_FALLBACK(_t) \
+  if (allocator->info._t == NULL) allocator->info._t = _fallback_ ##_t;
+  INSTALL_FALLBACK (mem_copy);
+  INSTALL_FALLBACK (mem_is_span);
+#undef INSTALL_FALLBACK
+}
+
 /**
  * gst_allocator_new:
  * @info: a #GstMemoryInfo
@@ -834,9 +875,6 @@ gst_allocator_new (const GstMemoryInfo * info, gpointer user_data,
 {
   GstAllocator *allocator;
 
-#define INSTALL_FALLBACK(_t) \
-  if (allocator->info._t == NULL) allocator->info._t = _fallback_ ##_t;
-
   g_return_val_if_fail (info != NULL, NULL);
   g_return_val_if_fail (info->alloc != NULL, NULL);
   g_return_val_if_fail (info->mem_map != NULL, NULL);
@@ -845,20 +883,14 @@ gst_allocator_new (const GstMemoryInfo * info, gpointer user_data,
   g_return_val_if_fail (info->mem_share != NULL, NULL);
 
   allocator = g_slice_new (GstAllocator);
-  allocator->refcount = 1;
-  allocator->info = *info;
+
+  gst_allocator_init (allocator, info, sizeof (GstAllocator));
+
   allocator->user_data = user_data;
   allocator->notify = notify;
-  INSTALL_FALLBACK (mem_copy);
-  INSTALL_FALLBACK (mem_is_span);
-#undef INSTALL_FALLBACK
 
   GST_CAT_DEBUG (GST_CAT_MEMORY, "new allocator %p", allocator);
 
-#ifndef GST_DISABLE_TRACE
-  _gst_alloc_trace_new (_gst_allocator_trace, allocator);
-#endif
-
   return allocator;
 }
 
@@ -878,52 +910,6 @@ gst_allocator_get_memory_type (GstAllocator * allocator)
   return allocator->info.mem_type;
 }
 
-/**
- * gst_allocator_ref:
- * @allocator: a #GstAllocator
- *
- * Increases the refcount of @allocator.
- *
- * Returns: @allocator with increased refcount
- */
-GstAllocator *
-gst_allocator_ref (GstAllocator * allocator)
-{
-  g_return_val_if_fail (allocator != NULL, NULL);
-
-  GST_CAT_TRACE (GST_CAT_MEMORY, "allocator %p, %d->%d", allocator,
-      allocator->refcount, allocator->refcount + 1);
-
-  g_atomic_int_inc (&allocator->refcount);
-
-  return allocator;
-}
-
-/**
- * gst_allocator_unref:
- * @allocator: a #GstAllocator
- *
- * Decreases the refcount of @allocator. When the refcount reaches 0, the notify
- * function of @allocator will be called and the allocator will be freed.
- */
-void
-gst_allocator_unref (GstAllocator * allocator)
-{
-  g_return_if_fail (allocator != NULL);
-
-  GST_CAT_TRACE (GST_CAT_MEMORY, "allocator %p, %d->%d", allocator,
-      allocator->refcount, allocator->refcount - 1);
-
-  if (g_atomic_int_dec_and_test (&allocator->refcount)) {
-    if (allocator->notify)
-      allocator->notify (allocator->user_data);
-#ifndef GST_DISABLE_TRACE
-    _gst_alloc_trace_free (_gst_allocator_trace, allocator);
-#endif
-    g_slice_free1 (sizeof (GstAllocator), allocator);
-  }
-}
-
 /**
  * gst_allocator_register:
  * @name: the name of the allocator

diff --git a/gst/gstmemory.h b/gst/gstmemory.h
index c69ee596d2b597ed704fa1f487595562c1176285..701249d1fd13a36d3dcb0fcd51092441a56f58d4 100644 (file)
--- a/gst/gstmemory.h
+++ b/gst/gstmemory.h
@@ -368,8 +368,39 @@ GstAllocator * gst_allocator_new             (const GstMemoryInfo * info,
                                               gpointer user_data, GDestroyNotify notify);
 const gchar *  gst_allocator_get_memory_type (GstAllocator * allocator);
 
-GstAllocator * gst_allocator_ref             (GstAllocator * allocator);
-void           gst_allocator_unref           (GstAllocator * allocator);
+/**
+ * gst_allocator_ref:
+ * @allocator: The allocator to refcount
+ *
+ * Increase the refcount of this allocator.
+ *
+ * Returns: (transfer full): @allocator (for convenience when doing assignments)
+ */
+#ifdef _FOOL_GTK_DOC_
+G_INLINE_FUNC GstAllocator * gst_allocator_ref (GstAllocator * allocator);
+#endif
+
+static inline GstAllocator *
+gst_allocator_ref (GstAllocator * allocator)
+{
+  return (GstAllocator *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (allocator));
+}
+
+/**
+ * gst_allocator_unref:
+ * @allocator: (transfer full): the allocator to refcount
+ *
+ * Decrease the refcount of an allocator, freeing it if the refcount reaches 0.
+ */
+#ifdef _FOOL_GTK_DOC_
+G_INLINE_FUNC void gst_allocator_unref (GstAllocator * allocator);
+#endif
+
+static inline void
+gst_allocator_unref (GstAllocator * allocator)
+{
+  gst_mini_object_unref (GST_MINI_OBJECT_CAST (allocator));
+}
 
 void           gst_allocator_register        (const gchar *name, GstAllocator *allocator);
 GstAllocator * gst_allocator_find            (const gchar *name);

diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index 17245d393004bac01b943717ca0de05f9582a88f..51d07b046c49bd60b6dcf864b487a6c3e911474c 100644 (file)
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -59,10 +59,8 @@ EXPORTS
        gst_allocator_get_memory_type
        gst_allocator_get_type
        gst_allocator_new
-       gst_allocator_ref
        gst_allocator_register
        gst_allocator_set_default
-       gst_allocator_unref
        gst_atomic_queue_length
        gst_atomic_queue_new
        gst_atomic_queue_peek