From 5b4cc95fea5b5fff8948fc5f8f18720e0a59d8d7 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 3 Mar 2007 10:10:30 +0000 Subject: 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. --- ChangeLog | 9 ++++ gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/app/gstappbuffer.c | 106 ++++++++++++++++++++++++++++++++++++++++ gst-libs/gst/app/gstappbuffer.h | 64 ++++++++++++++++++++++++ gst-libs/gst/app/gstappsrc.c | 2 + 5 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 gst-libs/gst/app/gstappbuffer.c create mode 100644 gst-libs/gst/app/gstappbuffer.h diff --git a/ChangeLog b/ChangeLog index 7442cf23..fc5fc0ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-03-03 David Schleef + + * 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 * gst-libs/gst/app/gstappsrc.c: 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 + * + * 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 +#include + +#include + +#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 + * + * 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 + +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 -- cgit v1.2.1