diff --git a/docs/plugins/gstreamer-plugins-sections.txt b/docs/plugins/gstreamer-plugins-sections.txt index ac4451ce17..7da2f224dd 100644 --- a/docs/plugins/gstreamer-plugins-sections.txt +++ b/docs/plugins/gstreamer-plugins-sections.txt @@ -125,6 +125,21 @@ GST_IS_CAPSFILTER_CLASS gst_capsfilter_get_type +
+element-concat +concat +GstConcat + +GstConcatClass +GST_CONCAT +GST_IS_CONCAT +GST_TYPE_CONCAT +GST_CONCAT_CLASS +GST_IS_CONCAT_CLASS + +gst_concat_get_type +
+
element-downloadbuffer downloadbuffer diff --git a/docs/plugins/gstreamer-plugins.hierarchy b/docs/plugins/gstreamer-plugins.hierarchy index c65606ea05..c26d9335fe 100644 --- a/docs/plugins/gstreamer-plugins.hierarchy +++ b/docs/plugins/gstreamer-plugins.hierarchy @@ -22,6 +22,7 @@ GObject GstIdentity GstBin GstPipeline + GstConcat GstDownloadBuffer GstFunnel GstInputSelector diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml index ff7a3be34c..c98c7f36f7 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -3,10 +3,10 @@ GStreamer core elements ../../plugins/elements/.libs/libgstcoreelements.so libgstcoreelements.so - 1.4.0 + 1.5.0.1 LGPL gstreamer - GStreamer source release + GStreamer git Unknown package origin @@ -30,6 +30,27 @@ + + concat + Concat + Generic + Concatenate multiple streams + Sebastian Dröge <sebastian@centricular.com> + + + sink_%u + sink + request +
ANY
+
+ + src + source + always +
ANY
+
+
+
downloadbuffer DownloadBuffer diff --git a/plugins/elements/gstconcat.c b/plugins/elements/gstconcat.c index 006b190d12..919163dd72 100644 --- a/plugins/elements/gstconcat.c +++ b/plugins/elements/gstconcat.c @@ -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. + * + * + * Example launch line + * |[ + * 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. + * + */ #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 {