diff --git a/docs/plugins/gst-plugins-base-plugins-docs.sgml b/docs/plugins/gst-plugins-base-plugins-docs.sgml index 4487afee252c0bd6aadc5170198e4a7b6c53a699..806f99bbb99d085ce2d509237eabcabcc652a072 100644 --- a/docs/plugins/gst-plugins-base-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-base-plugins-docs.sgml @@ -24,6 +24,8 @@ + + @@ -132,6 +134,7 @@ + diff --git a/docs/plugins/gst-plugins-base-plugins-sections.txt b/docs/plugins/gst-plugins-base-plugins-sections.txt index 885cfbac2d430682e1e3b7b65901aaa5241c17bf..e40895f50af6ed255ee5341e9f1b2588402e86c5 100644 --- a/docs/plugins/gst-plugins-base-plugins-sections.txt +++ b/docs/plugins/gst-plugins-base-plugins-sections.txt @@ -110,6 +110,38 @@ GST_TYPE_AUDIO_CONVERT gst_audio_convert_get_type +
+element-audiointerleave +audiointerleave +GstAudioInterleave + +GstAudioInterleaveClass +GST_AUDIO_INTERLEAVE +GST_AUDIO_INTERLEAVE_CAST +GST_IS_AUDIO_INTERLEAVE +GST_AUDIO_INTERLEAVE_CLASS +GST_IS_AUDIO_INTERLEAVE_CLASS +GST_TYPE_AUDIO_INTERLEAVE + +gst_audio_interleave_get_type +
+ +
+element-audiomixer +audiomixer +GstAudioMixer + +GstAudioMixerClass +GST_AUDIO_MIXER +GST_AUDIO_MIXER_CAST +GST_IS_AUDIO_MIXER +GST_AUDIO_MIXER_CLASS +GST_IS_AUDIO_MIXER_CLASS +GST_TYPE_AUDIO_MIXER + +gst_audio_mixer_get_type +
+
element-audiorate audiorate diff --git a/docs/plugins/gst-plugins-base-plugins.args b/docs/plugins/gst-plugins-base-plugins.args index 96826df8c8ee48549a59171665d2893f13bfdcfc..79e2b7540a26306b96b36e7456669fb79754f40d 100644 --- a/docs/plugins/gst-plugins-base-plugins.args +++ b/docs/plugins/gst-plugins-base-plugins.args @@ -4707,3 +4707,4 @@ Perform buffering on demuxed/parsed media. FALSE + diff --git a/docs/plugins/gst-plugins-base-plugins.hierarchy b/docs/plugins/gst-plugins-base-plugins.hierarchy index 0cf03e50e684d8d107837b76291d4e2dd392eaa5..252b0bbac1e43a71ef904b1aa53f19dffcc726c7 100644 --- a/docs/plugins/gst-plugins-base-plugins.hierarchy +++ b/docs/plugins/gst-plugins-base-plugins.hierarchy @@ -168,8 +168,9 @@ GObject GstPad GstAggregatorPad GstAudioAggregatorPad + GstAudioAggregatorConvertPad + GstAudioMixerPad GstAudioInterleavePad - GstAudioMixerPad GstProxyPad GstGhostPad GstDecodePad diff --git a/docs/plugins/gst-plugins-base-plugins.interfaces b/docs/plugins/gst-plugins-base-plugins.interfaces index 9e4b9c07c3892083fdd6769830840a6fb47abb97..46b2a896b181d42b607a2825e73eee51fc07b7bf 100644 --- a/docs/plugins/gst-plugins-base-plugins.interfaces +++ b/docs/plugins/gst-plugins-base-plugins.interfaces @@ -7,6 +7,8 @@ GstAppSink GstURIHandler GstAppSrc GstURIHandler GstAudioCdSrc GstURIHandler GstAudioEncoder GstPreset +GstAudioInterleave GstChildProxy +GstAudioMixer GstChildProxy GstBin GstChildProxy GstCdParanoiaSrc GstURIHandler GstDecodeBin GstChildProxy @@ -20,6 +22,7 @@ GstGLSinkBin GstChildProxy GstVideoOverlay GstNavigation GstColorBalance GstGLSrcBin GstChildProxy GstGioSink GstURIHandler GstGioSrc GstURIHandler +GstLiveAdder GstChildProxy GstOggMux GstPreset GstOpusEnc GstPreset GstTagSetter GstParseBin GstChildProxy diff --git a/docs/plugins/gst-plugins-base-plugins.signals b/docs/plugins/gst-plugins-base-plugins.signals index 928f065d87577ab01e5ee1d5e775d2e4e7421780..d0a50cac0d3548092ef7ff43f1590970036eeef8 100644 --- a/docs/plugins/gst-plugins-base-plugins.signals +++ b/docs/plugins/gst-plugins-base-plugins.signals @@ -939,3 +939,4 @@ GstStream *arg2 GstURIDecodeBin3 *gsturidecodebin3 GstElement *arg1 + diff --git a/docs/plugins/inspect/plugin-audiomixer.xml b/docs/plugins/inspect/plugin-audiomixer.xml new file mode 100644 index 0000000000000000000000000000000000000000..9039fb70740acfab990dfc663c8beb0149e6008d --- /dev/null +++ b/docs/plugins/inspect/plugin-audiomixer.xml @@ -0,0 +1,76 @@ + + audiomixer + Mixes multiple audio streams + ../../gst/audiomixer/.libs/libgstaudiomixer.so + libgstaudiomixer.so + 1.13.0.1 + LGPL + gst-plugins-base + GStreamer Base Plug-ins git + Unknown package origin + + + audiointerleave + AudioInterleave + Generic/Audio + Mixes multiple audio streams + Olivier Crete <olivier.crete@collabora.com> + + + sink_%u + sink + request +
audio/x-raw, rate=(int)[ 1, 2147483647 ], channels=(int)1, format=(string){ S8, U8, S16LE, S16BE, U16LE, U16BE, S24_32LE, S24_32BE, U24_32LE, U24_32BE, S32LE, S32BE, U32LE, U32BE, S24LE, S24BE, U24LE, U24BE, S20LE, S20BE, U20LE, U20BE, S18LE, S18BE, U18LE, U18BE, F32LE, F32BE, F64LE, F64BE }, layout=(string){ non-interleaved, interleaved }
+
+ + src + source + always +
audio/x-raw, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], format=(string){ S8, U8, S16LE, S16BE, U16LE, U16BE, S24_32LE, S24_32BE, U24_32LE, U24_32BE, S32LE, S32BE, U32LE, U32BE, S24LE, S24BE, U24LE, U24BE, S20LE, S20BE, U20LE, U20BE, S18LE, S18BE, U18LE, U18BE, F32LE, F32BE, F64LE, F64BE }, layout=(string)interleaved
+
+
+
+ + audiomixer + AudioMixer + Generic/Audio + Mixes multiple audio streams + Sebastian Dröge <sebastian@centricular.com> + + + sink_%u + sink + request +
audio/x-raw, format=(string){ S8, U8, S16LE, S16BE, U16LE, U16BE, S24_32LE, S24_32BE, U24_32LE, U24_32BE, S32LE, S32BE, U32LE, U32BE, S24LE, S24BE, U24LE, U24BE, S20LE, S20BE, U20LE, U20BE, S18LE, S18BE, U18LE, U18BE, F32LE, F32BE, F64LE, F64BE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], layout=(string)interleaved
+
+ + src + source + always +
audio/x-raw, format=(string){ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], layout=(string)interleaved
+
+
+
+ + liveadder + AudioMixer + Generic/Audio + Mixes multiple audio streams + Sebastian Dröge <sebastian@centricular.com> + + + sink_%u + sink + request +
audio/x-raw, format=(string){ S8, U8, S16LE, S16BE, U16LE, U16BE, S24_32LE, S24_32BE, U24_32LE, U24_32BE, S32LE, S32BE, U32LE, U32BE, S24LE, S24BE, U24LE, U24BE, S20LE, S20BE, U20LE, U20BE, S18LE, S18BE, U18LE, U18BE, F32LE, F32BE, F64LE, F64BE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], layout=(string)interleaved
+
+ + src + source + always +
audio/x-raw, format=(string){ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], layout=(string)interleaved
+
+
+
+
+
\ No newline at end of file