From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 7 Jun 2011 15:54:33 +0000 (+0200)
Subject: memory: pass user_data to the alloc function
X-Git-Tag: RELEASE-0.11.0~141
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfd3faef5a2898e0537382b1953d731a7da05901;p=platform%2Fupstream%2Fgstreamer.git

memory: pass user_data to the alloc function

Pass the user data that was passed to _register to the alloc function of an
allocator.
---

diff --git a/gst/gstmemory.c b/gst/gstmemory.c
index f6e7c78..7446ec3 100644
--- a/gst/gstmemory.c
+++ b/gst/gstmemory.c
@@ -691,5 +691,6 @@ gst_memory_allocator_alloc (const GstMemoryAllocator * allocator,
   if (allocator == NULL)
     allocator = _default_allocator;
 
-  return allocator->info.alloc (allocator, maxsize, align);
+  return allocator->info.alloc (allocator, maxsize, align,
+      allocator->info.user_data);
 }
diff --git a/gst/gstmemory.h b/gst/gstmemory.h
index 3d9493c..307373d 100644
--- a/gst/gstmemory.h
+++ b/gst/gstmemory.h
@@ -106,15 +106,21 @@ typedef enum {
 
 /**
  * GstMemoryAllocFunction:
+ * @allocator: a #GstMemoryAllocator
  * @maxsize: the maxsize
  * @align: the alignment
+ * @user_data: user data
  *
- * Allocate a new #GstMemory that can hold at least @maxsize bytes and is aligned
- * to (@align + 1) bytes.
+ * Allocate a new #GstMemory from @allocator that can hold at least @maxsize bytes
+ * and is aligned to (@align + 1) bytes.
+ *
+ * @user_data is the data that was used when registering @allocator.
  *
  * Returns: a newly allocated #GstMemory. Free with gst_memory_unref()
  */
-typedef GstMemory *  (*GstMemoryAllocFunction)  (const GstMemoryAllocator *allocator, gsize maxsize, gsize align);
+typedef GstMemory *  (*GstMemoryAllocFunction)  (const GstMemoryAllocator *allocator,
+                                                 gsize maxsize, gsize align,
+                                                 gpointer user_data);
 
 /**
  * GstMemoryGetSizesFunction: