Commit 5b8e97b8 authored by Stefan Kost's avatar Stefan Kost

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.
parent 04c899f7
2008-01-15 Stefan Kost <ensonic@users.sf.net>
* 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.
2008-01-15 Stefan Kost <ensonic@users.sf.net>
* docs/plugins/Makefile.am:
......
......@@ -450,8 +450,6 @@ gst_id3v2_mux_plugin_init
<FILE>element-jpegdec</FILE>
<TITLE>jpegdec</TITLE>
GstJpegDec
GstJpegDecErrorMgr
GstJpegDecSourceMgr
<SUBSECTION Standard>
GstJpegDecClass
GST_JPEG_DEC
......@@ -502,8 +500,7 @@ GST_MULTIPART_MUX
GST_MULTIPART_MUX_CLASS
GST_IS_MULTIPART_MUX
GST_IS_MULTIPART_MUX_CLASS
gst_multipart_mux_get_type
gst_multipart_mux_plugin_init
GST_MULTIPART_MUX_GET_CLASS
</SECTION>
<SECTION>
......@@ -517,8 +514,9 @@ GST_MULTIPART_DEMUX
GST_MULTIPART_DEMUX_CLASS
GST_IS_MULTIPART_DEMUX
GST_IS_MULTIPART_DEMUX_CLASS
gst_multipart_demux_get_type
gst_multipart_demux_plugin_init
MULTIPART_DATA_EOS
MULTIPART_DATA_ERROR
MULTIPART_NEED_MORE_DATA
</SECTION>
<SECTION>
......@@ -627,8 +625,6 @@ gst_osxvideosink_get_type
<FILE>element-pngdec</FILE>
<TITLE>pngdec</TITLE>
GstPngDec
GstPngDecErrorMgr
GstPngDecSourceMgr
<SUBSECTION Standard>
GstPngDecClass
GST_PNGDEC
......@@ -664,7 +660,6 @@ GST_PROGRESS_REPORT
GST_PROGRESS_REPORT_CLASS
GST_IS_PROGRESS_REPORT
GST_IS_PROGRESS_REPORT_CLASS
gst_progress_report_get_type
</SECTION>
<SECTION>
......
......@@ -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
......@@ -57,68 +57,7 @@
#include "config.h"
#endif
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
#include <string.h>
#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
......
/* GStreamer
* Copyright (C) 2006 Sjoerd Simons <sjoerd@luon.net>
* Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
*
* 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 <gst/gst.h>
#include <gst/base/gstadapter.h>
#include <string.h>
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__ */
......@@ -43,69 +43,11 @@
#include "config.h"
#endif
#include <gst/gst.h>
#include <gst/base/gstcollectpads.h>
#include <string.h>
#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",
......
/* GStreamer
* Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
*
* 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 <gst/gst.h>
#include <gst/base/gstcollectpads.h>
#include <string.h>
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__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment