From 4f1f3da8960c34c7d5fd227e3bd5ba721a6cc1a3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 19 Oct 2001 19:49:40 +0000 Subject: [PATCH] Removed old, bad bytestream code. Original commit message from CVS: Removed old, bad bytestream code. --- gst/utils/gstbytestream.c | 113 -------------------------------------- gst/utils/gstbytestream.h | 56 ------------------- 2 files changed, 169 deletions(-) delete mode 100644 gst/utils/gstbytestream.c delete mode 100644 gst/utils/gstbytestream.h diff --git a/gst/utils/gstbytestream.c b/gst/utils/gstbytestream.c deleted file mode 100644 index 5cc36639ce..0000000000 --- a/gst/utils/gstbytestream.c +++ /dev/null @@ -1,113 +0,0 @@ -/* GStreamer - * Copyright (C) 1999,2000 Erik Walthinsen - * 2000 Wim Taymans - * - * gstbytestreams.c: Utility functions: gtk_get_property stuff, etc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include - -#include "gstbytestreams.h" - -/** - * gst_bytestream_new: - * @pad: the pad to attach the bytstream to - * - * creates a bytestream from the given pad - * - * Returns: a new #GstByteStream object - */ -GstByteStream * -gst_bytestream_new (GstPad * pad) -{ - GstByteStream *bs = g_new (GstByteStream, 1); - - bs->pad = pad; - bs->data = NULL; - bs->size = 0; - bs->index = 0; - - return bs; -} - -void -gst_bytestream_destroy (GstByteStream * bs) -{ - if (bs->data) { - g_free (bs->data); - } - g_free (bs); -} - -static void -gst_bytestream_bytes_fill (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:%d\n", bs->data, bs->size); - } - memcpy (bs->data + oldlen, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); - } - g_assert ((bs->index + len) <= bs->size); -} - -guint8 * -gst_bytestream_bytes_peek (GstByteStream * bs, guint64 len) -{ - g_return_val_if_fail (len > 0, NULL); - - gst_bytestream_bytes_fill (bs, len); - - return gst_bytestream_pos (bs); -} - -guint8 * -gst_bytestream_bytes_read (GstByteStream * bs, guint64 len) -{ - guint8 *ptr; - - g_return_val_if_fail (len > 0, NULL); - - gst_bytestream_bytes_fill (bs, len); - ptr = gst_bytestream_pos (bs); - bs->index += len; - - return ptr; -} - -gboolean -gst_bytestream_bytes_seek (GstByteStream * bs, guint64 offset) -{ - return FALSE; -} - -void -gst_bytestream_bytes_flush (GstByteStream * bs, guint64 len) -{ - gst_bytestream_bytes_read (bs, len); -} diff --git a/gst/utils/gstbytestream.h b/gst/utils/gstbytestream.h deleted file mode 100644 index f368bb31b4..0000000000 --- a/gst/utils/gstbytestream.h +++ /dev/null @@ -1,56 +0,0 @@ -/* GStreamer - * Copyright (C) 1999,2000 Erik Walthinsen - * 2000 Wim Taymans - * - * gstbytestream.h: Header for various utility functions - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#ifndef __GST_BYTESTREAM_H__ -#define __GST_BYTESTREAM_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef struct _GstByteStream GstByteStream; - -struct _GstByteStream -{ - GstPad *pad; - guint8 *data; - guint64 size; - guint64 index; -}; - -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); -gboolean gst_bytestream_bytes_seek (GstByteStream *bs, guint64 offset); -gint gst_bytestream_bytes_flush (GstByteStream *bs, guint64 len); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GST_BYTESTREAM_H__ */