fix up ffmpegcolorspace docs; extract header

Original commit message from CVS:
fix up ffmpegcolorspace docs; extract header
This commit is contained in:
Thomas Vander Stichele 2005-09-15 15:43:28 +00:00
parent 70a7708a8b
commit 2c3ddfeac7
9 changed files with 93 additions and 52 deletions

View file

@ -1,3 +1,14 @@
2005-09-15 Thomas Vander Stichele <thomas at apestaart dot org>
* common/gtk-doc-plugins.mak:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-base-plugins-sections.txt:
* gst/ffmpegcolorspace/Makefile.am:
* gst/ffmpegcolorspace/avcodec.h:
* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
* gst/tcp/gstmultifdsink.c:
fix up ffmpegcolorspace docs; extract header
2005-09-15 Thomas Vander Stichele <thomas at apestaart dot org>
* common/gtk-doc-plugins.mak:

2
common

@ -1 +1 @@
Subproject commit c491c61170e77dcd4fb5ffc656ac2b721c5c2641
Subproject commit 019a3be6a5b7cde92c5daae35fe189c8aebeb5b6

View file

@ -77,12 +77,13 @@ IGNORE_CFILES = utils.c mem.c imgconvert.c
# $(top_srcdir)/ext/gnomevfs/gstgnomevfssink.c
EXTRA_HFILES = \
$(top_srcdir)/ext/theora/gsttheoraenc.h \
$(top_srcdir)/ext/vorbis/vorbisenc.h \
$(top_srcdir)/gst/ffmpegcolorspace/gstffmpegcolorspace.h \
$(top_srcdir)/gst/tcp/gstmultifdsink.h \
$(top_srcdir)/gst/tcp/gsttcpserversink.h \
$(top_srcdir)/gst/videotestsrc/gstvideotestsrc.h \
$(top_srcdir)/ext/theora/gsttheoraenc.h \
$(top_srcdir)/gst/volume/gstvolume.h \
$(top_srcdir)/ext/vorbis/vorbisenc.h
$(top_srcdir)/gst/volume/gstvolume.h
# Images to copy into HTML directory.
HTML_IMAGES =

View file

@ -1,45 +1,46 @@
<SECTION>
<FILE>element-ffmpegcolorspace</FILE>
GstFFMpegColorspace
<TITLE>ffmpegcolorspace</TITLE>
GstFFMpegCsp
<SUBSECTION Standard>
GstFFMpegColorspaceClass
GstFFMpegCspClass
</SECTION>
<FILE>element-multifdsink</FILE>
<TITLE>multifdsink</TITLE>
GstMultiFdSink
GstMultiFdSinkFlags
GstRecoverPolicy
GstSyncMethod
GstUnitType
GstClientStatus
<TITLE>multifdsink</TITLE>
<SUBSECTION Standard>
GstMultiFdSinkClass
</SECTION>
<SECTION>
<FILE>element-gnomevfssink</FILE>
GstGnomeVFSSink
<TITLE>gnomevfssink</TITLE>
GstGnomeVFSSink
<SUBSECTION Standard>
GstGnomeVFSSinkClass
</SECTION>
<SECTION>
<FILE>element-tcpserversink</FILE>
GstTCPServerSink
<TITLE>tcpserversink</TITLE>
GstTCPServerSink
<SUBSECTION Standard>
GstTCPServerSinkClass
</SECTION>
<SECTION>
<FILE>element-theoraenc</FILE>
GstTheoraEnc
GstTheoraEncClass
<TITLE>theoraenc</TITLE>
GstTheoraEnc
<SUBSECTION Standard>
GstTheoraEncClass
</SECTION>

View file

@ -14,6 +14,7 @@ libgstffmpegcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstffmpegcolorspace_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
noinst_HEADERS = \
gstffmpegcolorspace.h \
gstffmpegcodecmap.h \
imgconvert_template.h \
dsputil.h \

View file

@ -33,7 +33,7 @@ enum CodecType {
CODEC_TYPE_DATA,
};
/**
/*
* Pixel format. Notes:
*
* PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
@ -80,7 +80,7 @@ enum PixelFormat {
PIX_FMT_UYVY411, ///< Packed pixel, Cb Y0 Y1 Cr Y2 Y3
PIX_FMT_AYUV4444, ///< Packed pixel, A0 Y0 Cb Cr
PIX_FMT_NB,
PIX_FMT_NB
};
/* currently unused, may be used if 24/32 bits samples ever supported */

View file

@ -33,48 +33,15 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
# include "config.h"
#endif
#include <gst/gst.h>
#include <gst/base/gstbasetransform.h>
#include <avcodec.h>
#include "gstffmpegcolorspace.h"
#include "gstffmpegcodecmap.h"
GST_DEBUG_CATEGORY (ffmpegcolorspace_debug);
#define GST_CAT_DEFAULT ffmpegcolorspace_debug
#define GST_TYPE_FFMPEGCSP \
(gst_ffmpegcsp_get_type())
#define GST_FFMPEGCSP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
#define GST_FFMPEGCSP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
#define GST_IS_FFMPEGCSP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGCSP))
#define GST_IS_FFMPEGCSP_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGCSP))
typedef struct _GstFFMpegCsp GstFFMpegCsp;
typedef struct _GstFFMpegCspClass GstFFMpegCspClass;
struct _GstFFMpegCsp
{
GstBaseTransform element;
gint width, height;
gfloat fps;
enum PixelFormat from_pixfmt, to_pixfmt;
AVPicture from_frame, to_frame;
AVPaletteControl *palette;
};
struct _GstFFMpegCspClass
{
GstBaseTransformClass parent_class;
};
/* elementfactory information */
static GstElementDetails ffmpegcsp_details = {
"FFMPEG Colorspace converter",

View file

@ -0,0 +1,63 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* This file:
* Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
*
* 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_FFMPEGCOLORSPACE_H__
#define __GST_FFMPEGCOLORSPACE_H__
#include <gst/gst.h>
#include <gst/base/gstbasetransform.h>
#include "avcodec.h"
G_BEGIN_DECLS
#define GST_TYPE_FFMPEGCSP \
(gst_ffmpegcsp_get_type())
#define GST_FFMPEGCSP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
#define GST_FFMPEGCSP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGCSP,GstFFMpegCsp))
#define GST_IS_FFMPEGCSP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGCSP))
#define GST_IS_FFMPEGCSP_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGCSP))
typedef struct _GstFFMpegCsp GstFFMpegCsp;
typedef struct _GstFFMpegCspClass GstFFMpegCspClass;
struct _GstFFMpegCsp
{
GstBaseTransform element;
gint width, height;
gfloat fps;
enum PixelFormat from_pixfmt, to_pixfmt;
AVPicture from_frame, to_frame;
AVPaletteControl *palette;
};
struct _GstFFMpegCspClass
{
GstBaseTransformClass parent_class;
};
G_END_DECLS
#endif /* __GST_FFMPEGCOLORSPACE_H__ */

View file

@ -19,11 +19,8 @@
*/
/**
* SECTION:multifdsink
* @short_description: a sink that writes to multiple file descriptors
* SECTION:element-multifdsink
* @see_also: tcpserversink
*
* Incredibly, still a sink that writes to multiple file descriptors
*/
#ifdef HAVE_CONFIG_H