mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Moved rtpmux from gst-p-farsight to -bad

Browse source
This commit is contained in:
Olivier Crête 2009-02-10 17:02:24 +00:00 committed by Edward Hervey
parent ad4d98d70c
commit 00a155333c
9 changed files with 109 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -267,6 +267,7 @@ AG_GST_CHECK_PLUGIN(qtmux)
AG_GST_CHECK_PLUGIN(rawparse) AG_GST_CHECK_PLUGIN(rawparse)
AG_GST_CHECK_PLUGIN(real) AG_GST_CHECK_PLUGIN(real)
AG_GST_CHECK_PLUGIN(rtpmanager) AG_GST_CHECK_PLUGIN(rtpmanager)
AG_GST_CHECK_PLUGIN(rtpmux)
AG_GST_CHECK_PLUGIN(scaletempo) AG_GST_CHECK_PLUGIN(scaletempo)
AG_GST_CHECK_PLUGIN(sdp) AG_GST_CHECK_PLUGIN(sdp)
AG_GST_CHECK_PLUGIN(selector) AG_GST_CHECK_PLUGIN(selector)
@ -1443,6 +1444,7 @@ gst/pcapparse/Makefile
gst/qtmux/Makefile gst/qtmux/Makefile
gst/rawparse/Makefile gst/rawparse/Makefile
gst/rtpmanager/Makefile gst/rtpmanager/Makefile
gst/rtpmux/Makefile
gst/scaletempo/Makefile gst/scaletempo/Makefile
gst/sdp/Makefile gst/sdp/Makefile
gst/selector/Makefile gst/selector/Makefile

2
docs/plugins/Makefile.am
View file

@ -134,6 +134,8 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/rtpmanager/gstrtpptdemux.h \ $(top_srcdir)/gst/rtpmanager/gstrtpptdemux.h \
$(top_srcdir)/gst/rtpmanager/gstrtpsession.h \ $(top_srcdir)/gst/rtpmanager/gstrtpsession.h \
$(top_srcdir)/gst/rtpmanager/gstrtpssrcdemux.h \ $(top_srcdir)/gst/rtpmanager/gstrtpssrcdemux.h \
$(top_srcdir)/gst/rtpmux/gstrtpmux.h \
$(top_srcdir)/gst/rtpmux/gstrtpdtmfmux.h \
$(top_srcdir)/gst/scaletempo/gstscaletempo.h \ $(top_srcdir)/gst/scaletempo/gstscaletempo.h \
$(top_srcdir)/gst/sdp/gstsdpdemux.h \ $(top_srcdir)/gst/sdp/gstsdpdemux.h \
$(top_srcdir)/gst/selector/gstinputselector.h \ $(top_srcdir)/gst/selector/gstinputselector.h \

3
docs/plugins/gst-plugins-bad-plugins-docs.sgml
View file

@ -59,6 +59,8 @@
<xi:include href="xml/element-output-selector.xml" /> <xi:include href="xml/element-output-selector.xml" />
<xi:include href="xml/element-rtpdtmfdepay.xml" /> <xi:include href="xml/element-rtpdtmfdepay.xml" />
<xi:include href="xml/element-rtpdtmfsrc.xml" /> <xi:include href="xml/element-rtpdtmfsrc.xml" />
<xi:include href="xml/element-rtpdtmfmux.xml" />
<xi:include href="xml/element-rtpmux.xml" />
<xi:include href="xml/element-scaletempo.xml" /> <xi:include href="xml/element-scaletempo.xml" />
<xi:include href="xml/element-sdlaudiosink.xml" /> <xi:include href="xml/element-sdlaudiosink.xml" />
<xi:include href="xml/element-sdlvideosink.xml" /> <xi:include href="xml/element-sdlvideosink.xml" />
@ -131,6 +133,7 @@
<xi:include href="xml/plugin-rawparse.xml" /> <xi:include href="xml/plugin-rawparse.xml" />
<xi:include href="xml/plugin-real.xml" /> <xi:include href="xml/plugin-real.xml" />
<xi:include href="xml/plugin-rfbsrc.xml" /> <xi:include href="xml/plugin-rfbsrc.xml" />
<xi:include href="xml/plugin-rtpmux.xml" />
<xi:include href="xml/plugin-scaletempo.xml" /> <xi:include href="xml/plugin-scaletempo.xml" />
<xi:include href="xml/plugin-sdl.xml" /> <xi:include href="xml/plugin-sdl.xml" />
<xi:include href="xml/plugin-sdp.xml" /> <xi:include href="xml/plugin-sdp.xml" />

30
docs/plugins/gst-plugins-bad-plugins-sections.txt
View file

@ -946,3 +946,33 @@ GST_RTP_DTMF_DEPAY_CLASS
gst_rtp_dtmf_depay_plugin_init gst_rtp_dtmf_depay_plugin_init
</SECTION> </SECTION>
<SECTION>
<FILE>element-rtpmux</FILE>
<TITLE>rtpmux</TITLE>
GstRTPMux
<SUBSECTION Standard>
GST_IS_RTP_MUX
GST_IS_RTP_MUX_CLASS
GST_RTP_MUX
GST_RTP_MUX_CLASS
GST_RTP_MUX_GET_CLASS
GST_TYPE_RTP_MUX
GstRTPMuxClass
gst_rtp_mux_plugin_init
gst_rtp_session_set_ssrc
</SECTION>
<SECTION>
<FILE>element-rtpdtmfmux</FILE>
<TITLE>rtpdtmfmux</TITLE>
GstRTPDTMFMux
<SUBSECTION Standard>
GST_IS_RTP_DTMF_MUX
GST_IS_RTP_DTMF_MUX_CLASS
GST_TYPE_RTP_DTMF_MUX
GstRTPDTMFMuxClass
GST_RTP_DTMF_MUX
GST_RTP_DTMF_MUX_CLASS
gst_rtp_dtmf_mux_get_type
gst_rtp_dtmf_mux_plugin_init
</SECTION>

8
docs/plugins/inspect/plugin-dtmf.xml
View file

@ -3,11 +3,11 @@
<description>DTMF plugins</description> <description>DTMF plugins</description>
<filename>../../gst/dtmf/.libs/libgstdtmf.so</filename> <filename>../../gst/dtmf/.libs/libgstdtmf.so</filename>
<basename>libgstdtmf.so</basename> <basename>libgstdtmf.so</basename>
<version>0.1</version> <version>0.10.10.1</version>
<license>LGPL</license> <license>LGPL</license>
<source>gst-plugins-bad</source> <source>gst-plugins-bad</source>
<package>DTMF</package> <package>GStreamer Bad Plug-ins CVS/prerelease</package>
<origin></origin> <origin>Unknown package origin</origin>
<elements> <elements>
<element> <element>
<name>dtmfsrc</name> <name>dtmfsrc</name>
@ -61,4 +61,4 @@
</pads> </pads>
</element> </element>
</elements> </elements>
</plugin> </plugin>

55
docs/plugins/inspect/plugin-rtpmux.xml Normal file
View file

@ -0,0 +1,55 @@
<plugin>
<name>rtpmux</name>
<description>RTP Muxer plugins</description>
<filename>../../gst/rtpmux/.libs/libgstrtpmux.so</filename>
<basename>libgstrtpmux.so</basename>
<version>0.10.10.1</version>
<license>LGPL</license>
<source>gst-plugins-bad</source>
<package>GStreamer Bad Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>rtpdtmfmux</name>
<longname>RTP muxer</longname>
<class>Codec/Muxer</class>
<description>mixes RTP DTMF streams into other RTP streams</description>
<author>Zeeshan Ali &lt;first.last@nokia.com&gt;</author>
<pads>
<caps>
<name>sink_%d</name>
<direction>sink</direction>
<presence>request</presence>
<details>application/x-rtp</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>application/x-rtp</details>
</caps>
</pads>
</element>
<element>
<name>rtpmux</name>
<longname>RTP muxer</longname>
<class>Codec/Muxer</class>
<description>multiplex N rtp streams into one</description>
<author>Zeeshan Ali &lt;first.last@nokia.com&gt;</author>
<pads>
<caps>
<name>sink_%d</name>
<direction>sink</direction>
<presence>request</presence>
<details>application/x-rtp</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>application/x-rtp</details>
</caps>
</pads>
</element>
</elements>
</plugin>

10
gst/rtpmux/Makefile.am
View file

@ -1,10 +1,10 @@
plugin_LTLIBRARIES = libgstrtpmuxer.la plugin_LTLIBRARIES = libgstrtpmux.la
libgstrtpmuxer_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c libgstrtpmux_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c
libgstrtpmuxer_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT libgstrtpmux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT
libgstrtpmuxer_la_LIBADD = $(GST_LIBS_LIBS) libgstrtpmux_la_LIBADD = $(GST_LIBS_LIBS)
libgstrtpmuxer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@
noinst_HEADERS = gstrtpmux.h gstrtpdtmfmux.h noinst_HEADERS = gstrtpmux.h gstrtpdtmfmux.h

14
gst/rtpmux/gstrtpdtmfmux.c
View file

@ -26,8 +26,8 @@
/** /**
* SECTION:element-rtpdtmfmux * SECTION:element-rtpdtmfmux
* @short_description: mixes RTP DTMF streams into other RTP streams * @short_description: mixes RTP DTMF streams into other RTP streams
* <refsect2> * @see_also: rtpdtmfsrc, dtmfsrc
* <para> *
* The RTPDTMFMuxer mixes/muxes RTP DTMF stream(s) into other RTP * The RTPDTMFMuxer mixes/muxes RTP DTMF stream(s) into other RTP
* streams. It does exactly what it's parent (RTPMuxer) does, except * streams. It does exactly what it's parent (RTPMuxer) does, except
* that it allows upstream peer elements to request exclusive access * that it allows upstream peer elements to request exclusive access
@ -40,11 +40,10 @@
* structure of name "stream-lock" with only one boolean field: * structure of name "stream-lock" with only one boolean field:
* "lock". If this field is set to TRUE, the request is for the * "lock". If this field is set to TRUE, the request is for the
* acquisition of the lock, otherwise it is for release of the lock. * acquisition of the lock, otherwise it is for release of the lock.
* </para> *
* <para>For example, the following code in an upstream peer element * For example, the following code in an upstream peer element
* requests the acquisition of the stream lock: * requests the acquisition of the stream lock:
* </para> *
* <para>
* <programlisting> * <programlisting>
* GstEvent *event; * GstEvent *event;
* GstStructure *structure; * GstStructure *structure;
@ -58,8 +57,7 @@
* event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure); * event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure);
* gst_pad_push_event (dtmfsrc->srcpad, event); * gst_pad_push_event (dtmfsrc->srcpad, event);
* </programlisting> * </programlisting>
* </para> *
* </refsect2>
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H

4
gst/rtpmux/gstrtpmuxer.c
View file

@ -43,6 +43,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"rtpmuxer", "rtpmux",
"RTP Muxer plugins", "RTP Muxer plugins",
plugin_init, "0.1", "LGPL", "Farsight", "http://farsight.sf.net"); plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)