projects / platform / upstream / gst-plugins-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ffaec4e)
docs: add audiomixer + audiointerleave to plugin docs
authorTim-Philipp Müller <tim@centricular.com>
Tue, 13 Feb 2018 16:43:44 +0000 (16:43 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Tue, 13 Feb 2018 16:43:44 +0000 (16:43 +0000)
docs/plugins/gst-plugins-base-plugins-docs.sgml patch | blob | history
docs/plugins/gst-plugins-base-plugins-sections.txt patch | blob | history
docs/plugins/gst-plugins-base-plugins.args patch | blob | history
docs/plugins/gst-plugins-base-plugins.hierarchy patch | blob | history
docs/plugins/gst-plugins-base-plugins.interfaces patch | blob | history
docs/plugins/gst-plugins-base-plugins.signals patch | blob | history
docs/plugins/inspect/plugin-audiomixer.xml [new file with mode: 0644] patch | blob

diff --git a/docs/plugins/gst-plugins-base-plugins-docs.sgml b/docs/plugins/gst-plugins-base-plugins-docs.sgml
index 4487afee252c0bd6aadc5170198e4a7b6c53a699..806f99bbb99d085ce2d509237eabcabcc652a072 100644 (file)
--- a/docs/plugins/gst-plugins-base-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-base-plugins-docs.sgml
@@ -24,6 +24,8 @@
     <xi:include href="xml/element-alsasrc.xml" />
     <xi:include href="xml/element-appsrc.xml" />
     <xi:include href="xml/element-audioconvert.xml" />
+    <xi:include href="xml/element-audiointerleave.xml" />
+    <xi:include href="xml/element-audiomixer.xml" />
     <xi:include href="xml/element-audiorate.xml" />
     <xi:include href="xml/element-audioresample.xml" />
     <xi:include href="xml/element-audiotestsrc.xml" />
@@ -132,6 +134,7 @@
     <xi:include href="xml/plugin-alsa.xml" />
     <xi:include href="xml/plugin-app.xml" />
     <xi:include href="xml/plugin-audioconvert.xml" />
+    <xi:include href="xml/plugin-audiomixer.xml" />
     <xi:include href="xml/plugin-audiorate.xml" />
     <xi:include href="xml/plugin-audioresample.xml" />
     <xi:include href="xml/plugin-audiotestsrc.xml" />
diff --git a/docs/plugins/gst-plugins-base-plugins-sections.txt b/docs/plugins/gst-plugins-base-plugins-sections.txt
index 885cfbac2d430682e1e3b7b65901aaa5241c17bf..e40895f50af6ed255ee5341e9f1b2588402e86c5 100644 (file)
--- 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
 </SECTION>
 
+<SECTION>
+<FILE>element-audiointerleave</FILE>
+<TITLE>audiointerleave</TITLE>
+GstAudioInterleave
+<SUBSECTION Standard>
+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
+<SUBSECTION Private>
+gst_audio_interleave_get_type
+</SECTION>
+
+<SECTION>
+<FILE>element-audiomixer</FILE>
+<TITLE>audiomixer</TITLE>
+GstAudioMixer
+<SUBSECTION Standard>
+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
+<SUBSECTION Private>
+gst_audio_mixer_get_type
+</SECTION>
+
 <SECTION>
 <FILE>element-audiorate</FILE>
 <TITLE>audiorate</TITLE>
diff --git a/docs/plugins/gst-plugins-base-plugins.args b/docs/plugins/gst-plugins-base-plugins.args
index 96826df8c8ee48549a59171665d2893f13bfdcfc..79e2b7540a26306b96b36e7456669fb79754f40d 100644 (file)
--- a/docs/plugins/gst-plugins-base-plugins.args
+++ b/docs/plugins/gst-plugins-base-plugins.args
@@ -4707,3 +4707,4 @@
 <BLURB>Perform buffering on demuxed/parsed media.</BLURB>
 <DEFAULT>FALSE</DEFAULT>
 </ARG>
+
diff --git a/docs/plugins/gst-plugins-base-plugins.hierarchy b/docs/plugins/gst-plugins-base-plugins.hierarchy
index 0cf03e50e684d8d107837b76291d4e2dd392eaa5..252b0bbac1e43a71ef904b1aa53f19dffcc726c7 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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
 </SIGNAL>
+
diff --git a/docs/plugins/inspect/plugin-audiomixer.xml b/docs/plugins/inspect/plugin-audiomixer.xml
new file mode 100644 (file)
index 0000000..9039fb7
--- /dev/null
+++ b/docs/plugins/inspect/plugin-audiomixer.xml
@@ -0,0 +1,76 @@
+<plugin>
+  <name>audiomixer</name>
+  <description>Mixes multiple audio streams</description>
+  <filename>../../gst/audiomixer/.libs/libgstaudiomixer.so</filename>
+  <basename>libgstaudiomixer.so</basename>
+  <version>1.13.0.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-base</source>
+  <package>GStreamer Base Plug-ins git</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>audiointerleave</name>
+      <longname>AudioInterleave</longname>
+      <class>Generic/Audio</class>
+      <description>Mixes multiple audio streams</description>
+      <author>Olivier Crete &lt;olivier.crete@collabora.com&gt;</author>
+      <pads>
+        <caps>
+          <name>sink_%u</name>
+          <direction>sink</direction>
+          <presence>request</presence>
+          <details>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 }</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>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</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>audiomixer</name>
+      <longname>AudioMixer</longname>
+      <class>Generic/Audio</class>
+      <description>Mixes multiple audio 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>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</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/x-raw, format=(string){ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], layout=(string)interleaved</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>liveadder</name>
+      <longname>AudioMixer</longname>
+      <class>Generic/Audio</class>
+      <description>Mixes multiple audio 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>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</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/x-raw, format=(string){ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ], layout=(string)interleaved</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file
Domain: Multimedia / Media Common;