From 5b8e97b8ce9c7eecc148331bab300b1889d753ca Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 15 Jan 2008 15:40:58 +0000 Subject: Re-add multipartdemux to the docs. Last round of section cleanup. Original commit message from CVS: * docs/plugins/gst-plugins-good-plugins-sections.txt: * gst/multipart/Makefile.am: * gst/multipart/multipartdemux.c: * gst/multipart/multipartdemux.h: * gst/multipart/multipartmux.c: * gst/multipart/multipartmux.h: Re-add multipartdemux to the docs. Last round of section cleanup. --- gst/multipart/Makefile.am | 3 ++ gst/multipart/multipartdemux.c | 63 +--------------------------- gst/multipart/multipartdemux.h | 94 ++++++++++++++++++++++++++++++++++++++++++ gst/multipart/multipartmux.c | 60 +-------------------------- gst/multipart/multipartmux.h | 90 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 189 insertions(+), 121 deletions(-) create mode 100644 gst/multipart/multipartdemux.h create mode 100644 gst/multipart/multipartmux.h (limited to 'gst/multipart') diff --git a/gst/multipart/Makefile.am b/gst/multipart/Makefile.am index a142f461..e69709df 100644 --- a/gst/multipart/Makefile.am +++ b/gst/multipart/Makefile.am @@ -4,3 +4,6 @@ libgstmultipart_la_SOURCES = multipart.c multipartdemux.c multipartmux.c libgstmultipart_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstmultipart_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstmultipart_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +noinst_HEADERS = multipartdemux.h multipartmux.h + diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c index 67cb7372..b4cbbd75 100644 --- a/gst/multipart/multipartdemux.c +++ b/gst/multipart/multipartdemux.c @@ -57,68 +57,7 @@ #include "config.h" #endif -#include -#include - -#include - -#define GST_TYPE_MULTIPART_DEMUX (gst_multipart_demux_get_type()) -#define GST_MULTIPART_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTIPART_DEMUX, GstMultipartDemux)) -#define GST_MULTIPART_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIPART_DEMUX, GstMultipartDemux)) -#define GST_IS_MULTIPART_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIPART_DEMUX)) -#define GST_IS_MULTIPART_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_DEMUX)) - -typedef struct _GstMultipartDemux GstMultipartDemux; -typedef struct _GstMultipartDemuxClass GstMultipartDemuxClass; - -#define MULTIPART_NEED_MORE_DATA -1 -#define MULTIPART_DATA_ERROR -2 -#define MULTIPART_DATA_EOS -3 - -/* all information needed for one multipart stream */ -typedef struct -{ - GstPad *pad; /* reference for this pad is held by element we belong to */ - - gchar *mime; -} -GstMultipartPad; - -/** - * GstMultipartDemux: - * - * The opaque #GstMultipartDemux structure. - */ -struct _GstMultipartDemux -{ - GstElement element; - - /* pad */ - GstPad *sinkpad; - - GSList *srcpads; - gint numpads; - - GstAdapter *adapter; - - /* Header information of the current frame */ - gboolean header_completed; - gchar *boundary; - guint boundary_len; - gchar *mime_type; - gint content_length; - - /* deprecated, unused */ - gboolean autoscan; - - /* Index inside the current data when manually looking for the boundary */ - gint scanpos; -}; - -struct _GstMultipartDemuxClass -{ - GstElementClass parent_class; -}; +#include "multipartdemux.h" GST_DEBUG_CATEGORY_STATIC (gst_multipart_demux_debug); #define GST_CAT_DEFAULT gst_multipart_demux_debug diff --git a/gst/multipart/multipartdemux.h b/gst/multipart/multipartdemux.h new file mode 100644 index 00000000..b481b6a7 --- /dev/null +++ b/gst/multipart/multipartdemux.h @@ -0,0 +1,94 @@ +/* GStreamer + * Copyright (C) 2006 Sjoerd Simons + * Copyright (C) 2004 Wim Taymans + * + * gstmultipartdemux.h: multipart stream demuxer + * + * 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_MULTIPART_DEMUX__ +#define __GST_MULTIPART_DEMUX__ + +#include +#include + +#include + +G_BEGIN_DECLS + +#define GST_TYPE_MULTIPART_DEMUX (gst_multipart_demux_get_type()) +#define GST_MULTIPART_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTIPART_DEMUX, GstMultipartDemux)) +#define GST_MULTIPART_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIPART_DEMUX, GstMultipartDemux)) +#define GST_IS_MULTIPART_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIPART_DEMUX)) +#define GST_IS_MULTIPART_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_DEMUX)) + +typedef struct _GstMultipartDemux GstMultipartDemux; +typedef struct _GstMultipartDemuxClass GstMultipartDemuxClass; + +#define MULTIPART_NEED_MORE_DATA -1 +#define MULTIPART_DATA_ERROR -2 +#define MULTIPART_DATA_EOS -3 + +/* all information needed for one multipart stream */ +typedef struct +{ + GstPad *pad; /* reference for this pad is held by element we belong to */ + + gchar *mime; +} +GstMultipartPad; + +/** + * GstMultipartDemux: + * + * The opaque #GstMultipartDemux structure. + */ +struct _GstMultipartDemux +{ + GstElement element; + + /* pad */ + GstPad *sinkpad; + + GSList *srcpads; + gint numpads; + + GstAdapter *adapter; + + /* Header information of the current frame */ + gboolean header_completed; + gchar *boundary; + guint boundary_len; + gchar *mime_type; + gint content_length; + + /* deprecated, unused */ + gboolean autoscan; + + /* Index inside the current data when manually looking for the boundary */ + gint scanpos; +}; + +struct _GstMultipartDemuxClass +{ + GstElementClass parent_class; +}; + +G_END_DECLS + +#endif /* __GST_MULTIPART_DEMUX__ */ + diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c index 44ad445a..562e5cce 100644 --- a/gst/multipart/multipartmux.c +++ b/gst/multipart/multipartmux.c @@ -43,69 +43,11 @@ #include "config.h" #endif -#include -#include - -#include +#include "multipartmux.h" GST_DEBUG_CATEGORY_STATIC (gst_multipart_mux_debug); #define GST_CAT_DEFAULT gst_multipart_mux_debug -#define GST_TYPE_MULTIPART_MUX (gst_multipart_mux_get_type()) -#define GST_MULTIPART_MUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTIPART_MUX, GstMultipartMux)) -#define GST_MULTIPART_MUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIPART_MUX, GstMultipartMux)) -#define GST_MULTIPART_MUX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_MULTIPART_MUX, GstMultipartMuxClass)) -#define GST_IS_MULTIPART_MUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIPART_MUX)) -#define GST_IS_MULTIPART_MUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_MUX)) - -typedef struct _GstMultipartMux GstMultipartMux; -typedef struct _GstMultipartMuxClass GstMultipartMuxClass; - -/* all information needed for one multipart stream */ -typedef struct -{ - GstCollectData collect; /* we extend the CollectData */ - - GstBuffer *buffer; /* the queued buffer for this pad */ - GstClockTime timestamp; /* its timestamp, converted to running_time so that we can - correctly sort over multiple segments. */ -} -GstMultipartPad; - -/** - * GstMultipartMux: - * - * The opaque #GstMultipartMux structure. - */ -struct _GstMultipartMux -{ - GstElement element; - - /* pad */ - GstPad *srcpad; - - /* sinkpads */ - GstCollectPads *collect; - - gint numpads; - - /* offset in stream */ - guint64 offset; - - /* boundary string */ - gchar *boundary; - - gboolean negotiated; - gboolean need_segment; -}; - -struct _GstMultipartMuxClass -{ - GstElementClass parent_class; - - GHashTable *mimetypes; -}; - /* elementfactory information */ static const GstElementDetails gst_multipart_mux_details = GST_ELEMENT_DETAILS ("Multipart muxer", diff --git a/gst/multipart/multipartmux.h b/gst/multipart/multipartmux.h new file mode 100644 index 00000000..2e52a2fc --- /dev/null +++ b/gst/multipart/multipartmux.h @@ -0,0 +1,90 @@ +/* GStreamer + * Copyright (C) 2004 Wim Taymans + * + * gstmultipartmux.h: multipart stream muxer + * + * 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_MULTIPART_MUX__ +#define __GST_MULTIPART_MUX__ + +#include +#include + +#include + +G_BEGIN_DECLS + +#define GST_TYPE_MULTIPART_MUX (gst_multipart_mux_get_type()) +#define GST_MULTIPART_MUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTIPART_MUX, GstMultipartMux)) +#define GST_MULTIPART_MUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIPART_MUX, GstMultipartMux)) +#define GST_MULTIPART_MUX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_MULTIPART_MUX, GstMultipartMuxClass)) +#define GST_IS_MULTIPART_MUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIPART_MUX)) +#define GST_IS_MULTIPART_MUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_MUX)) + +typedef struct _GstMultipartMux GstMultipartMux; +typedef struct _GstMultipartMuxClass GstMultipartMuxClass; + +/* all information needed for one multipart stream */ +typedef struct +{ + GstCollectData collect; /* we extend the CollectData */ + + GstBuffer *buffer; /* the queued buffer for this pad */ + GstClockTime timestamp; /* its timestamp, converted to running_time so that we can + correctly sort over multiple segments. */ +} +GstMultipartPad; + +/** + * GstMultipartMux: + * + * The opaque #GstMultipartMux structure. + */ +struct _GstMultipartMux +{ + GstElement element; + + /* pad */ + GstPad *srcpad; + + /* sinkpads */ + GstCollectPads *collect; + + gint numpads; + + /* offset in stream */ + guint64 offset; + + /* boundary string */ + gchar *boundary; + + gboolean negotiated; + gboolean need_segment; +}; + +struct _GstMultipartMuxClass +{ + GstElementClass parent_class; + + GHashTable *mimetypes; +}; + +G_END_DECLS + +#endif /* __GST_MULTIPART_MUX__ */ + -- cgit