diff --git a/ChangeLog b/ChangeLog index 5b1357e218..3b371e6d08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-09-15 Thomas Vander Stichele + + * 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 * common/gtk-doc-plugins.mak: diff --git a/common b/common index c491c61170..019a3be6a5 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c491c61170e77dcd4fb5ffc656ac2b721c5c2641 +Subproject commit 019a3be6a5b7cde92c5daae35fe189c8aebeb5b6 diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 4b366e38ea..7bb6d588bc 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -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 = diff --git a/docs/plugins/gst-plugins-base-plugins-sections.txt b/docs/plugins/gst-plugins-base-plugins-sections.txt index 1bbf6dfb5e..841ca7a411 100644 --- a/docs/plugins/gst-plugins-base-plugins-sections.txt +++ b/docs/plugins/gst-plugins-base-plugins-sections.txt @@ -1,45 +1,46 @@
element-ffmpegcolorspace -GstFFMpegColorspace ffmpegcolorspace +GstFFMpegCsp -GstFFMpegColorspaceClass +GstFFMpegCspClass
element-multifdsink +multifdsink GstMultiFdSink + GstMultiFdSinkFlags GstRecoverPolicy GstSyncMethod GstUnitType GstClientStatus -multifdsink GstMultiFdSinkClass
element-gnomevfssink -GstGnomeVFSSink gnomevfssink +GstGnomeVFSSink GstGnomeVFSSinkClass
element-tcpserversink -GstTCPServerSink tcpserversink +GstTCPServerSink GstTCPServerSinkClass
element-theoraenc -GstTheoraEnc -GstTheoraEncClass theoraenc +GstTheoraEnc +GstTheoraEncClass
diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am index ec3681f6ab..bb4fcebbcb 100644 --- a/gst/ffmpegcolorspace/Makefile.am +++ b/gst/ffmpegcolorspace/Makefile.am @@ -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 \ diff --git a/gst/ffmpegcolorspace/avcodec.h b/gst/ffmpegcolorspace/avcodec.h index 6846e3efbd..3bf14c703e 100644 --- a/gst/ffmpegcolorspace/avcodec.h +++ b/gst/ffmpegcolorspace/avcodec.h @@ -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 */ diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index 76409f99c2..211f5dc4ff 100644 --- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c @@ -33,48 +33,15 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif -#include -#include -#include - +#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", diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.h b/gst/ffmpegcolorspace/gstffmpegcolorspace.h new file mode 100644 index 0000000000..021e2d9044 --- /dev/null +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.h @@ -0,0 +1,63 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen + * This file: + * Copyright (C) 2003 Ronald Bultje + * + * 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 +#include +#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__ */ diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 44d5877499..3b8e432315 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -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