mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-04 13:45:52 +00:00
concat: Add documentation and integrate into documentation build
This commit is contained in:
parent
c938561a2b
commit
9861003939
|
@ -125,6 +125,21 @@ GST_IS_CAPSFILTER_CLASS
|
||||||
gst_capsfilter_get_type
|
gst_capsfilter_get_type
|
||||||
</SECTION>
|
</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>
|
<SECTION>
|
||||||
<FILE>element-downloadbuffer</FILE>
|
<FILE>element-downloadbuffer</FILE>
|
||||||
<TITLE>downloadbuffer</TITLE>
|
<TITLE>downloadbuffer</TITLE>
|
||||||
|
|
|
@ -22,6 +22,7 @@ GObject
|
||||||
GstIdentity
|
GstIdentity
|
||||||
GstBin
|
GstBin
|
||||||
GstPipeline
|
GstPipeline
|
||||||
|
GstConcat
|
||||||
GstDownloadBuffer
|
GstDownloadBuffer
|
||||||
GstFunnel
|
GstFunnel
|
||||||
GstInputSelector
|
GstInputSelector
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
<description>GStreamer core elements</description>
|
<description>GStreamer core elements</description>
|
||||||
<filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
|
<filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
|
||||||
<basename>libgstcoreelements.so</basename>
|
<basename>libgstcoreelements.so</basename>
|
||||||
<version>1.4.0</version>
|
<version>1.5.0.1</version>
|
||||||
<license>LGPL</license>
|
<license>LGPL</license>
|
||||||
<source>gstreamer</source>
|
<source>gstreamer</source>
|
||||||
<package>GStreamer source release</package>
|
<package>GStreamer git</package>
|
||||||
<origin>Unknown package origin</origin>
|
<origin>Unknown package origin</origin>
|
||||||
<elements>
|
<elements>
|
||||||
<element>
|
<element>
|
||||||
|
@ -30,6 +30,27 @@
|
||||||
</caps>
|
</caps>
|
||||||
</pads>
|
</pads>
|
||||||
</element>
|
</element>
|
||||||
|
<element>
|
||||||
|
<name>concat</name>
|
||||||
|
<longname>Concat</longname>
|
||||||
|
<class>Generic</class>
|
||||||
|
<description>Concatenate multiple streams</description>
|
||||||
|
<author>Sebastian Dröge <sebastian@centricular.com></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>
|
<element>
|
||||||
<name>downloadbuffer</name>
|
<name>downloadbuffer</name>
|
||||||
<longname>DownloadBuffer</longname>
|
<longname>DownloadBuffer</longname>
|
||||||
|
|
|
@ -18,6 +18,26 @@
|
||||||
* Boston, MA 02110-1301, USA.
|
* 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
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
@ -449,7 +469,7 @@ gst_concat_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
||||||
/* We know no duration */
|
/* We know no duration */
|
||||||
segment.duration = -1;
|
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) {
|
if (self->format == GST_FORMAT_TIME) {
|
||||||
segment.base += self->current_start_offset;
|
segment.base += self->current_start_offset;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue