concat: Add documentation and integrate into documentation build

This commit is contained in:
Sebastian Dröge 2014-08-08 09:13:50 +02:00
parent c938561a2b
commit 9861003939
4 changed files with 60 additions and 3 deletions

View file

@ -125,6 +125,21 @@ GST_IS_CAPSFILTER_CLASS
gst_capsfilter_get_type
</SECTION>
<SECTION>
<FILE>element-concat</FILE>
<TITLE>concat</TITLE>
GstConcat
<SUBSECTION Standard>
GstConcatClass
GST_CONCAT
GST_IS_CONCAT
GST_TYPE_CONCAT
GST_CONCAT_CLASS
GST_IS_CONCAT_CLASS
<SUBSECTION Private>
gst_concat_get_type
</SECTION>
<SECTION>
<FILE>element-downloadbuffer</FILE>
<TITLE>downloadbuffer</TITLE>

View file

@ -22,6 +22,7 @@ GObject
GstIdentity
GstBin
GstPipeline
GstConcat
GstDownloadBuffer
GstFunnel
GstInputSelector

View file

@ -3,10 +3,10 @@
<description>GStreamer core elements</description>
<filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
<basename>libgstcoreelements.so</basename>
<version>1.4.0</version>
<version>1.5.0.1</version>
<license>LGPL</license>
<source>gstreamer</source>
<package>GStreamer source release</package>
<package>GStreamer git</package>
<origin>Unknown package origin</origin>
<elements>
<element>
@ -30,6 +30,27 @@
</caps>
</pads>
</element>
<element>
<name>concat</name>
<longname>Concat</longname>
<class>Generic</class>
<description>Concatenate multiple streams</description>
<author>Sebastian Dröge &lt;sebastian@centricular.com&gt;</author>
<pads>
<caps>
<name>sink_%u</name>
<direction>sink</direction>
<presence>request</presence>
<details>ANY</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>ANY</details>
</caps>
</pads>
</element>
<element>
<name>downloadbuffer</name>
<longname>DownloadBuffer</longname>

View file

@ -18,6 +18,26 @@
* Boston, MA 02110-1301, USA.
*
*/
/**
* SECTION:element-concat
* @see_also: #GstFunnel
*
* Concatenates streams together to one continous stream.
*
* All streams but the current one are blocked until the current one
* finished with %GST_EVENT_EOS. Then the next stream is enabled, while
* keeping the running time continous for %GST_FORMAT_TIME segments or
* keeping the segment continous for %GST_FORMAT_BYTES segments.
*
* Streams are switched in the order in which the sinkpads were requested.
*
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch-1.0 concat name=c ! xvimagesink videotestsrc num-buffers=100 ! c. videotestsrc num-buffers=100 pattern=ball ! c.
* ]| Plays two video streams one after another.
* </refsect2>
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@ -449,7 +469,7 @@ gst_concat_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* We know no duration */
segment.duration = -1;
/* Update segment values to be contiguous with last stream */
/* Update segment values to be continous with last stream */
if (self->format == GST_FORMAT_TIME) {
segment.base += self->current_start_offset;
} else {