summaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-01-09 09:25:32 +0100
committerAnton Khirnov <anton@khirnov.net>2016-02-14 21:24:39 +0100
commit721a4efc0545548a241080b53ab480e34f366240 (patch)
tree18a42b31590ac34907c2f76d77b92078c2f0f656 /libavutil
parentc084d6d2cfb570b10d8784eb20cc696dfb7c5605 (diff)
downloadffmpeg-streaming-721a4efc0545548a241080b53ab480e34f366240.zip
ffmpeg-streaming-721a4efc0545548a241080b53ab480e34f366240.tar.gz
buffer: add support for pools using caller data in allocation
This should allow using more complex allocators than simple malloc wrappers.
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/buffer.c27
-rw-r--r--libavutil/buffer.h17
-rw-r--r--libavutil/buffer_internal.h3
-rw-r--r--libavutil/version.h2
4 files changed, 47 insertions, 2 deletions
diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index 1bc4a93..6681002 100644
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -194,6 +194,26 @@ int av_buffer_realloc(AVBufferRef **pbuf, int size)
return 0;
}
+AVBufferPool *av_buffer_pool_init2(int size, void *opaque,
+ AVBufferRef* (*alloc)(void *opaque, int size),
+ void (*pool_free)(void *opaque))
+{
+ AVBufferPool *pool = av_mallocz(sizeof(*pool));
+ if (!pool)
+ return NULL;
+
+ ff_mutex_init(&pool->mutex, NULL);
+
+ pool->size = size;
+ pool->opaque = opaque;
+ pool->alloc2 = alloc;
+ pool->pool_free = pool_free;
+
+ avpriv_atomic_int_set(&pool->refcount, 1);
+
+ return pool;
+}
+
AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size))
{
AVBufferPool *pool = av_mallocz(sizeof(*pool));
@@ -224,6 +244,10 @@ static void buffer_pool_free(AVBufferPool *pool)
av_freep(&buf);
}
ff_mutex_destroy(&pool->mutex);
+
+ if (pool->pool_free)
+ pool->pool_free(pool->opaque);
+
av_freep(&pool);
}
@@ -261,7 +285,8 @@ static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool)
BufferPoolEntry *buf;
AVBufferRef *ret;
- ret = pool->alloc(pool->size);
+ ret = pool->alloc2 ? pool->alloc2(pool->opaque, pool->size) :
+ pool->alloc(pool->size);
if (!ret)
return NULL;
diff --git a/libavutil/buffer.h b/libavutil/buffer.h
index 56b4d02..7fc18e0 100644
--- a/libavutil/buffer.h
+++ b/libavutil/buffer.h
@@ -242,6 +242,23 @@ typedef struct AVBufferPool AVBufferPool;
AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
/**
+ * Allocate and initialize a buffer pool with a more complex allocator.
+ *
+ * @param size size of each buffer in this pool
+ * @param opaque arbitrary user data used by the allocator
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty.
+ * @param pool_free a function that will be called immediately before the pool
+ * is freed. I.e. after av_buffer_pool_can_uninit() is called
+ * by the pool and all the frames are returned to the pool and
+ * freed. It is intended to uninitialize the user opaque data.
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init2(int size, void *opaque,
+ AVBufferRef* (*alloc)(void *opaque, int size),
+ void (*pool_free)(void *opaque));
+
+/**
* Mark the pool as being available for freeing. It will actually be freed only
* once all the allocated buffers associated with the pool are released. Thus it
* is safe to call this function while some of the allocated buffers are still
diff --git a/libavutil/buffer_internal.h b/libavutil/buffer_internal.h
index 1032a54..64344d8 100644
--- a/libavutil/buffer_internal.h
+++ b/libavutil/buffer_internal.h
@@ -88,7 +88,10 @@ struct AVBufferPool {
volatile int refcount;
int size;
+ void *opaque;
AVBufferRef* (*alloc)(int size);
+ AVBufferRef* (*alloc2)(void *opaque, int size);
+ void (*pool_free)(void *opaque);
};
#endif /* AVUTIL_BUFFER_INTERNAL_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index 25457ac..ebd548f 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 5
+#define LIBAVUTIL_VERSION_MINOR 6
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
OpenPOWER on IntegriCloud