mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 04:35:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

Make bytestream functions return a GstBuffer so that we can do proper refcounting.

Browse source 
Original commit message from CVS:
Make bytestream functions return a GstBuffer so that we can do proper
refcounting.
Added first optimisations.
This commit is contained in:
Wim Taymans 2001-09-16 18:22:42 +00:00
parent 3557396a0a
commit 55c2704ced
2 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
libs/bytestream/gstbytestream.c
View file

@ -24,6 +24,7 @@
#include <string.h>
#include <stdlib.h>
#include <gst/gstinfo.h>
#include "gstbytestream.h"
/**
@ -34,16 +35,16 @@
*
* Returns: a new #GstByteStream object
*/
GstByteStream *
gst_bytestream_new (GstPad * pad)
GstByteStream*
gst_bytestream_new (GstPad *pad)
{
GstByteStream *bs = g_new (GstByteStream, 1);
bs->pad = pad;
bs->data = NULL;
bs->size = 0;
bs->buffer = NULL;
bs->index = 0;
bs->pos = 0;
bs->size = 0;
return bs;
}
@ -51,55 +52,44 @@ gst_bytestream_new (GstPad * pad)
void
gst_bytestream_destroy (GstByteStream *bs)
{
if (bs->data) {
g_free (bs->data);
if (bs->buffer) {
gst_buffer_unref (bs->buffer);
}
g_free (bs);
}
static guint64
gst_bytestream_bytes_fill (GstByteStream *bs, guint64 len)
GstBuffer*
gst_bytestream_bytes_peek (GstByteStream *bs, guint64 len)
{
size_t oldlen;
GstBuffer *buf;
while ((bs->index + len) > bs->size) {
buf = gst_pad_pull (bs->pad);
oldlen = bs->size - bs->index;
memmove (bs->data, bs->data + bs->index, oldlen);
bs->size = oldlen + GST_BUFFER_SIZE (buf);
bs->index = 0;
bs->data = realloc (bs->data, bs->size);
if (!bs->data) {
fprintf (stderr, "realloc failed: d:%p s:%llu\n", bs->data, bs->size);
if (!bs->buffer) {
bs->buffer = buf;
}
memcpy (bs->data + oldlen, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
else {
bs->buffer = gst_buffer_merge (bs->buffer, buf);
}
bs->size = GST_BUFFER_SIZE (bs->buffer);
}
g_assert ((bs->index + len) <= bs->size);
return len;
buf = gst_buffer_create_sub (bs->buffer, bs->index, len);
return buf;
}
gint
gst_bytestream_bytes_peek (GstByteStream *bs, guint8 **buf, guint64 len)
GstBuffer*
gst_bytestream_bytes_read (GstByteStream *bs, guint64 len)
{
g_return_val_if_fail (len > 0, 0);
g_return_val_if_fail (buf, 0);
GstBuffer *buf;
gst_bytestream_bytes_fill (bs, len);
*buf = bs->data + bs->index;
return len;
}
gint
gst_bytestream_bytes_read (GstByteStream *bs, guint8 **buf, guint64 len)
{
len = gst_bytestream_bytes_peek (bs, buf, len);
buf = gst_bytestream_bytes_peek (bs, len);
bs->index += len;
bs->pos += len;
return len;
return buf;
}
gboolean
@ -111,12 +101,8 @@ gst_bytestream_bytes_seek (GstByteStream *bs, guint64 offset)
gint
gst_bytestream_bytes_flush (GstByteStream *bs, guint64 len)
{
guint8 *buf;
if (len == 0)
return len;
len = gst_bytestream_bytes_read (bs, &buf, len);
return len;
return GST_BUFFER_SIZE (gst_bytestream_bytes_read (bs, len));
}

8
libs/bytestream/gstbytestream.h
View file

@ -35,17 +35,17 @@ typedef struct _GstByteStream GstByteStream;
struct _GstByteStream
{
GstPad *pad;
guint8 *data;
guint64 size;
GstBuffer *buffer;
guint64 index;
guint64 pos;
guint64 size;
};
GstByteStream* gst_bytestream_new (GstPad *pad);
void gst_bytestream_destroy (GstByteStream *bs);
gint gst_bytestream_bytes_peek (GstByteStream *bs, guint8 **buf, guint64 len);
gint gst_bytestream_bytes_read (GstByteStream *bs, guint8 **buf, guint64 len);
GstBuffer* gst_bytestream_bytes_peek (GstByteStream *bs, guint64 len);
GstBuffer* gst_bytestream_bytes_read (GstByteStream *bs, guint64 len);
gboolean gst_bytestream_bytes_seek (GstByteStream *bs, guint64 offset);
gint gst_bytestream_bytes_flush (GstByteStream *bs, guint64 len);