summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2007-03-03 10:10:30 +0000
committerDavid Schleef <ds@schleef.org>2007-03-03 10:10:30 +0000
commit5b4cc95fea5b5fff8948fc5f8f18720e0a59d8d7 (patch)
tree3c3fb0d0c219969636a120fb73f923967b14d353
parent6b355aa720a00409a4b49c2307d841979cea2e5d (diff)
downloadgst-plugins-bad-5b4cc95fea5b5fff8948fc5f8f18720e0a59d8d7.tar.gz
gst-plugins-bad-5b4cc95fea5b5fff8948fc5f8f18720e0a59d8d7.tar.bz2
gst-plugins-bad-5b4cc95fea5b5fff8948fc5f8f18720e0a59d8d7.zip
gst-libs/gst/app/: Add GstAppBuffer that includes a callback and closure for proper handling of data chunks.
Original commit message from CVS: * gst-libs/gst/app/Makefile.am: * gst-libs/gst/app/gstappbuffer.c: * gst-libs/gst/app/gstappbuffer.h: * gst-libs/gst/app/gstappsrc.c: Add GstAppBuffer that includes a callback and closure for proper handling of data chunks.
-rw-r--r--ChangeLog9
-rw-r--r--gst-libs/gst/app/Makefile.am2
-rw-r--r--gst-libs/gst/app/gstappbuffer.c106
-rw-r--r--gst-libs/gst/app/gstappbuffer.h64
-rw-r--r--gst-libs/gst/app/gstappsrc.c2
5 files changed, 182 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7442cf23..fc5fc0ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2007-03-03 David Schleef <ds@schleef.org>
+ * gst-libs/gst/app/Makefile.am:
+ * gst-libs/gst/app/gstappbuffer.c:
+ * gst-libs/gst/app/gstappbuffer.h:
+ * gst-libs/gst/app/gstappsrc.c:
+ Add GstAppBuffer that includes a callback and closure for
+ proper handling of data chunks.
+
+2007-03-03 David Schleef <ds@schleef.org>
+
* gst-libs/gst/app/gstappsrc.c:
* gst-libs/gst/app/gstappsrc.h:
Hacking to address issues in 413418.
diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 50768a9d..7a99600c 100644
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la
-libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c
+libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c gstappbuffer.c
libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
libgstapp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS)
diff --git a/gst-libs/gst/app/gstappbuffer.c b/gst-libs/gst/app/gstappbuffer.c
new file mode 100644
index 00000000..06f354f8
--- /dev/null
+++ b/gst-libs/gst/app/gstappbuffer.c
@@ -0,0 +1,106 @@
+/* GStreamer
+ * Copyright (C) 2007 David Schleef <ds@schleef.org>
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstpushsrc.h>
+
+#include <string.h>
+
+#include "gstappbuffer.h"
+
+static void gst_app_buffer_init (GstAppBuffer * buffer, gpointer g_class);
+static void gst_app_buffer_class_init (gpointer g_class, gpointer class_data);
+static void gst_app_buffer_finalize (GstAppBuffer * buffer);
+
+static GstBufferClass *parent_class;
+
+GType
+gst_app_buffer_get_type (void)
+{
+ static GType _gst_app_buffer_type;
+
+ if (G_UNLIKELY (_gst_app_buffer_type == 0)) {
+ static const GTypeInfo app_buffer_info = {
+ sizeof (GstBufferClass),
+ NULL,
+ NULL,
+ gst_app_buffer_class_init,
+ NULL,
+ NULL,
+ sizeof (GstAppBuffer),
+ 0,
+ (GInstanceInitFunc) gst_app_buffer_init,
+ NULL
+ };
+ _gst_app_buffer_type = g_type_register_static (GST_TYPE_BUFFER,
+ "GstAppBuffer", &app_buffer_info, 0);
+ }
+ return _gst_app_buffer_type;
+}
+
+static void
+gst_app_buffer_init (GstAppBuffer * buffer, gpointer g_class)
+{
+
+}
+
+static void
+gst_app_buffer_class_init (gpointer g_class, gpointer class_data)
+{
+ GstMiniObjectClass *mini_object_class = GST_MINI_OBJECT_CLASS (g_class);
+
+ mini_object_class->finalize =
+ (GstMiniObjectFinalizeFunction) gst_app_buffer_finalize;
+
+ parent_class = g_type_class_peek_parent (g_class);
+}
+
+static void
+gst_app_buffer_finalize (GstAppBuffer * buffer)
+{
+ g_return_if_fail (buffer != NULL);
+ g_return_if_fail (GST_IS_APP_BUFFER (buffer));
+
+ if (buffer->finalize) {
+ buffer->finalize (buffer->priv);
+ }
+
+ GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (buffer));
+}
+
+GstBuffer *
+gst_app_buffer_new (void *data, int length,
+ GstAppBufferFinalizeFunc finalize, void *priv)
+{
+ GstAppBuffer *buffer;
+
+ buffer = (GstAppBuffer *) gst_mini_object_new (GST_TYPE_APP_BUFFER);
+
+ GST_BUFFER_DATA (buffer) = data;
+ GST_BUFFER_SIZE (buffer) = length;
+
+ buffer->finalize = finalize;
+ buffer->priv = priv;
+
+ return GST_BUFFER (buffer);
+}
diff --git a/gst-libs/gst/app/gstappbuffer.h b/gst-libs/gst/app/gstappbuffer.h
new file mode 100644
index 00000000..532f2ae2
--- /dev/null
+++ b/gst-libs/gst/app/gstappbuffer.h
@@ -0,0 +1,64 @@
+/* GStreamer
+ * Copyright (C) 2007 David Schleef <ds@schleef.org>
+ *
+ * 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_APP_BUFFER_H_
+#define _GST_APP_BUFFER_H_
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_APP_BUFFER \
+ (gst_app_buffer_get_type())
+#define GST_APP_BUFFER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_APP_BUFFER,GstAppBuffer))
+#define GST_APP_BUFFER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_APP_BUFFER,GstAppBufferClass))
+#define GST_IS_APP_BUFFER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_APP_BUFFER))
+#define GST_IS_APP_BUFFER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_APP_BUFFER))
+
+typedef struct _GstAppBuffer GstAppBuffer;
+typedef struct _GstAppBufferClass GstAppBufferClass;
+typedef void (*GstAppBufferFinalizeFunc) (void *priv);
+
+struct _GstAppBuffer
+{
+ GstBuffer buffer;
+
+ /*< private >*/
+ GstAppBufferFinalizeFunc finalize;
+ void *priv;
+};
+
+struct _GstAppBufferClass
+{
+ GstBufferClass buffer_class;
+};
+
+GType gst_app_buffer_get_type(void);
+
+GstBuffer *gst_app_buffer_new (void *data, int length,
+ GstAppBufferFinalizeFunc finalize, void *priv);
+
+G_END_DECLS
+
+#endif
+
diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index d786424f..65e4c8c8 100644
--- a/gst-libs/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
@@ -114,6 +114,8 @@ gst_app_src_dispose (GObject * obj)
g_queue_free (appsrc->queue);
appsrc->queue = NULL;
}
+
+ G_OBJECT_CLASS (parent_class)->dispose (obj);
}
static void