diff options
| -rw-r--r-- | tests/bufspeed/gstbuffer.c | 8 | ||||
| -rw-r--r-- | tests/bufspeed/gstbuffer.h | 6 | ||||
| -rw-r--r-- | tests/bufspeed/test2.c | 7 |
3 files changed, 8 insertions, 13 deletions
diff --git a/tests/bufspeed/gstbuffer.c b/tests/bufspeed/gstbuffer.c index 35a92ee90a..e087627f2d 100644 --- a/tests/bufspeed/gstbuffer.c +++ b/tests/bufspeed/gstbuffer.c @@ -118,17 +118,17 @@ gst_buffer_new (void) * Returns: new buffer */ GstBuffer* -gst_buffer_new_from_pool (GstBufferPool *pool, guint32 offset, guint32 size) +gst_buffer_new_from_pool (gpointer pool, guint32 offset, guint32 size) { - GstBuffer *buffer; + GstBuffer *buffer = NULL; - g_return_val_if_fail (pool != NULL, NULL); + /*g_return_val_if_fail (pool != NULL, NULL); g_return_val_if_fail (pool->buffer_new != NULL, NULL); buffer = pool->buffer_new (pool, offset, size, pool->user_data); buffer->pool = pool; buffer->free = pool->buffer_free; - buffer->copy = pool->buffer_copy; + buffer->copy = pool->buffer_copy;*/ GST_INFO (GST_CAT_BUFFER,"creating new buffer %p from pool %p (size %x, offset %x)", buffer, pool, size, offset); diff --git a/tests/bufspeed/gstbuffer.h b/tests/bufspeed/gstbuffer.h index 4c78d786aa..515c81319c 100644 --- a/tests/bufspeed/gstbuffer.h +++ b/tests/bufspeed/gstbuffer.h @@ -95,8 +95,6 @@ typedef void (*GstBufferFreeFunc) (GstBuffer *buf); typedef GstBuffer *(*GstBufferCopyFunc) (GstBuffer *srcbuf); -#include <gst/gstbufferpool.h> - struct _GstBuffer { GstData data_type; @@ -129,7 +127,7 @@ struct _GstBuffer { GstBuffer *parent; /* this is a pointer to the buffer pool (if any) */ - GstBufferPool *pool; + gpointer pool; gpointer pool_private; /* utility function pointers */ @@ -141,7 +139,7 @@ struct _GstBuffer { void _gst_buffer_initialize (void); /* creating a new buffer from scratch */ GstBuffer* gst_buffer_new (void); -GstBuffer* gst_buffer_new_from_pool (GstBufferPool *pool, guint32 offset, guint32 size); +GstBuffer* gst_buffer_new_from_pool (gpointer pool, guint32 offset, guint32 size); /* creating a subbuffer */ GstBuffer* gst_buffer_create_sub (GstBuffer *parent, guint32 offset, guint32 size); diff --git a/tests/bufspeed/test2.c b/tests/bufspeed/test2.c index 3fccf3470e..7e50f7a98b 100644 --- a/tests/bufspeed/test2.c +++ b/tests/bufspeed/test2.c @@ -9,11 +9,8 @@ main (int argc, char *argv[]) gst_init (&argc, &argv); for (i=0; i<5000000; i++) { - /* buffer API has changed, use default pool with 1024 size buffers */ - buf = gst_buffer_new (NULL, 1024); - /* - gst_buffer_unref (buf); - */ + /* buffer API has changed, use default pool with empty buffers */ + buf = gst_buffer_new (NULL, 0); gst_data_unref (GST_DATA (buf)); } |