diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2006-08-23 08:52:50 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2006-08-23 08:52:50 +0000 |
commit | 7381b4940caefc0335f14478a34f2faf979131df (patch) | |
tree | 17b286ef713b6a3507129f5d193c34ff967a00ab | |
parent | d3c716b694b065ca6884499cb75f808f21a07f26 (diff) | |
download | gst-plugins-bad-7381b4940caefc0335f14478a34f2faf979131df.tar.gz gst-plugins-bad-7381b4940caefc0335f14478a34f2faf979131df.tar.bz2 gst-plugins-bad-7381b4940caefc0335f14478a34f2faf979131df.zip |
Add docs for wavpack elements (#352476).
Original commit message from CVS:
Patch by: Sebastian Dröge <slomo at circular-chaos.org>
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
* docs/plugins/gst-plugins-bad-plugins-sections.txt:
* docs/plugins/gst-plugins-bad-plugins.hierarchy:
* docs/plugins/inspect/plugin-wavpack.xml:
* ext/wavpack/gstwavpackdec.c:
* ext/wavpack/gstwavpackdec.h:
* ext/wavpack/gstwavpackenc.c:
* ext/wavpack/gstwavpackenc.h:
* ext/wavpack/gstwavpackparse.c:
* ext/wavpack/gstwavpackparse.h:
Add docs for wavpack elements (#352476).
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | docs/plugins/Makefile.am | 5 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-docs.sgml | 4 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-sections.txt | 26 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins.hierarchy | 3 | ||||
-rw-r--r-- | docs/plugins/inspect/plugin-wavpack.xml | 4 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackdec.c | 19 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackdec.h | 3 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackenc.c | 31 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackenc.h | 2 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackparse.c | 17 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackparse.h | 2 |
12 files changed, 127 insertions, 6 deletions
@@ -1,3 +1,20 @@ +2006-08-23 Tim-Philipp Müller <tim at centricular dot net> + + Patch by: Sebastian Dröge <slomo at circular-chaos.org> + + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-bad-plugins-docs.sgml: + * docs/plugins/gst-plugins-bad-plugins-sections.txt: + * docs/plugins/gst-plugins-bad-plugins.hierarchy: + * docs/plugins/inspect/plugin-wavpack.xml: + * ext/wavpack/gstwavpackdec.c: + * ext/wavpack/gstwavpackdec.h: + * ext/wavpack/gstwavpackenc.c: + * ext/wavpack/gstwavpackenc.h: + * ext/wavpack/gstwavpackparse.c: + * ext/wavpack/gstwavpackparse.h: + Add docs for wavpack elements (#352476). + 2006-08-22 Edgard Lima <edgard.lima@indt.org.br> * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_size_limits) diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 28ce1435..ec51befa 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -87,7 +87,10 @@ EXAMPLE_CFILES = \ EXTRA_HFILES = \ $(top_srcdir)/ext/directfb/dfbvideosink.h \ - $(top_srcdir)/ext/musicbrainz/gsttrm.h + $(top_srcdir)/ext/musicbrainz/gsttrm.h \ + $(top_srcdir)/ext/wavpack/gstwavpackdec.h \ + $(top_srcdir)/ext/wavpack/gstwavpackenc.h \ + $(top_srcdir)/ext/wavpack/gstwavpackparse.h # Images to copy into HTML directory. HTML_IMAGES = diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index d4ae3d01..d16b1964 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -15,6 +15,9 @@ <xi:include href="xml/element-dfbvideosink.xml" /> <xi:include href="xml/element-trm.xml" /> + <xi:include href="xml/element-wavpackdec.xml" /> + <xi:include href="xml/element-wavpackenc.xml" /> + <xi:include href="xml/element-wavpackparse.xml" /> </chapter> <chapter> @@ -39,6 +42,7 @@ <xi:include href="xml/plugin-speed.xml" /> <xi:include href="xml/plugin-tta.xml" /> <xi:include href="xml/plugin-video4linux2.xml" /> + <xi:include href="xml/plugin-wavpack.xml" /> <xi:include href="xml/plugin-xingheader.xml" /> </chapter> diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index ed069cab..1f7f8578 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -13,3 +13,29 @@ GstTRM <SUBSECTION Standard> GstTRMClass </SECTION> + +<SECTION> +<FILE>element-wavpackdec</FILE> +GstWavpackDec +<TITLE>wavpackdec</TITLE> +<SUBSECTION Standard> +GstWavpackDecClass + +</SECTION> + +<SECTION> +<FILE>element-wavpackenc</FILE> +GstWavpackEnc +<TITLE>wavpackenc</TITLE> +<SUBSECTION Standard> +GstWavpackEncClass +</SECTION> + +<SECTION> +<FILE>element-wavpackparse</FILE> +GstWavpackParse +<TITLE>wavpackparse</TITLE> +<SUBSECTION Standard> +GstWavpackParseClass +</SECTION> + diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index bf1d5f68..b0812729 100644 --- a/docs/plugins/gst-plugins-bad-plugins.hierarchy +++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy @@ -13,6 +13,9 @@ GObject GstVideoSink GstDfbVideoSink GstTRM + GstWavpackDec + GstWavpackEnc + GstWavpackParse GstPlugin GstRegistry GstPadTemplate diff --git a/docs/plugins/inspect/plugin-wavpack.xml b/docs/plugins/inspect/plugin-wavpack.xml index 60c1d4b9..645d02f3 100644 --- a/docs/plugins/inspect/plugin-wavpack.xml +++ b/docs/plugins/inspect/plugin-wavpack.xml @@ -14,7 +14,7 @@ <longname>WavePack audio decoder</longname> <class>Codec/Decoder/Audio</class> <description>Decode Wavpack audio data</description> - <author>Arwed v. Merkatz <v.merkatz@gmx.net></author> + <author>Arwed v. Merkatz <v.merkatz@gmx.net>, Sebastian Dröge <slomo@circular-chaos.org></author> </element> <element> <name>wavpackenc</name> @@ -28,7 +28,7 @@ <longname>WavePack parser</longname> <class>Codec/Demuxer/Audio</class> <description>Parses Wavpack files</description> - <author>Arwed v. Merkatz <v.merkatz@gmx.net></author> + <author>Sebastian Dröge <slomo@circular-chaos.org></author> </element> </elements> </plugin>
\ No newline at end of file diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index 3e61c9a1..1962c9b9 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -21,6 +21,25 @@ * Boston, MA 02111-1307, USA. */ +/** + * SECTION:element-wavpackdec + * + * <refsect2> + * wavpackdec decodes framed (for example by the wavpackparse element) + * Wavpack streams and decodes them to raw audio. + * <ulink url="http://www.wavpack.com/">Wavpack</ulink> is an open-source + * audio codec that features both lossless and lossy encoding. + * <title>Example launch line</title> + * <para> + * <programlisting> + * gst-launch filesrc location=test.wv ! wavpackparse ! wavpackdec ! audioconvert ! audioresample ! autoaudiosink + * </programlisting> + * This pipeline decodes the Wavpack file test.wv into raw audio buffers and + * tries to play it back using an automatically found audio sink. + * </para> + * </refsect2> + */ + #include <gst/gst.h> #include <gst/audio/audio.h> diff --git a/ext/wavpack/gstwavpackdec.h b/ext/wavpack/gstwavpackdec.h index d2e66d95..dcae0a87 100644 --- a/ext/wavpack/gstwavpackdec.h +++ b/ext/wavpack/gstwavpackdec.h @@ -30,7 +30,7 @@ #include "gstwavpackstreamreader.h" G_BEGIN_DECLS -/* #define's don't like whitespacey bits */ + #define GST_TYPE_WAVPACK_DEC \ (gst_wavpack_dec_get_type()) #define GST_WAVPACK_DEC(obj) \ @@ -48,6 +48,7 @@ struct _GstWavpackDec { GstElement element; + /*< private >*/ GstPad *sinkpad; GstPad *srcpad; diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index 9eaf45c6..19ad0923 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -19,6 +19,37 @@ * Boston, MA 02111-1307, USA. */ +/** + * SECTION:element-wavpackenc + * + * <refsect2> + * Wavpackenc encodes raw audio into a framed Wavpack stream. + * <ulink url="http://www.wavpack.com/">Wavpack</ulink> is an open-source + * audio codec that features both lossless and lossy encoding. + * <title>Example launch line</title> + * <para> + * <programlisting> + * gst-launch audiotestsrc num-buffers=500 ! wavpackenc ! filesink location=sinewave.wv + * </programlisting> + * This pipeline encodes audio from audiotestsrc into a Wavpack file. + * </para> + * <para> + * <programlisting> + * gst-launch cdda://1 ! wavpackenc ! filesink location=track1.wv + * </programlisting> + * This pipeline encodes audio from an audio CD into a Wavpack file using + * lossless encoding (the file output will be fairly large). + * </para> + * <para> + * <programlisting> + * gst-launch cdda://1 ! wavpackenc bitrate=128000 ! filesink location=track1.wv + * </programlisting> + * This pipeline encodes audio from an audio CD into a Wavpack file using + * lossy encoding at a certain bitrate (the file will be fairly small). + * </para> + * </refsect2> + */ + /* * TODO: - add multichannel handling. channel_mask is: * front left diff --git a/ext/wavpack/gstwavpackenc.h b/ext/wavpack/gstwavpackenc.h index 2777007a..0925b08a 100644 --- a/ext/wavpack/gstwavpackenc.h +++ b/ext/wavpack/gstwavpackenc.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS -/* defines don't like whitespacey bits */ #define GST_TYPE_WAVPACK_ENC \ (gst_wavpack_enc_get_type()) #define GST_WAVPACK_ENC(obj) \ @@ -55,6 +54,7 @@ struct _GstWavpackEnc { GstElement element; + /*< private >*/ GstPad *sinkpad, *srcpad; GstPad *wvcsrcpad; diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c index af46f7a7..ca894ec9 100644 --- a/ext/wavpack/gstwavpackparse.c +++ b/ext/wavpack/gstwavpackparse.c @@ -21,6 +21,23 @@ * Boston, MA 02111-1307, USA. */ +/** + * SECTION:element-wavpackparse + * + * <refsect2> + * Wavpackparse takes raw, unframed Wavpack streams and splits them into + * single Wavpack chunks with information like bit depth and the position + * in the stream. + * <title>Example launch line</title> + * <para> + * <programlisting> + * gst-launch filesrc location=test.wv ! wavpackparse ! wavpackdec ! fakesink + * </programlisting> + * This pipeline decodes the Wavpack file test.wv into raw audio buffers. + * </para> + * </refsect2> + */ + #include <gst/gst.h> #include <math.h> diff --git a/ext/wavpack/gstwavpackparse.h b/ext/wavpack/gstwavpackparse.h index d849da74..ed7db73a 100644 --- a/ext/wavpack/gstwavpackparse.h +++ b/ext/wavpack/gstwavpackparse.h @@ -27,7 +27,6 @@ G_BEGIN_DECLS -/* #define's don't like whitespacey bits */ #define GST_TYPE_WAVPACK_PARSE \ (gst_wavpack_parse_get_type()) #define GST_WAVPACK_PARSE(obj) \ @@ -53,6 +52,7 @@ struct _GstWavpackParse { GstElement element; + /*< private >*/ GstPad *sinkpad; GstPad *srcpad; |