From: Olivier Crête Date: Tue, 10 Feb 2009 17:02:24 +0000 (+0000) Subject: Moved rtpmux from gst-p-farsight to -bad X-Git-Tag: 1.19.3~507^2~19257 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00a155333c5e3b9832b82b47f11ce7574580537b;p=platform%2Fupstream%2Fgstreamer.git Moved rtpmux from gst-p-farsight to -bad --- diff --git a/configure.ac b/configure.ac index 03c76e0..34db342 100644 --- a/configure.ac +++ b/configure.ac @@ -267,6 +267,7 @@ AG_GST_CHECK_PLUGIN(qtmux) AG_GST_CHECK_PLUGIN(rawparse) AG_GST_CHECK_PLUGIN(real) AG_GST_CHECK_PLUGIN(rtpmanager) +AG_GST_CHECK_PLUGIN(rtpmux) AG_GST_CHECK_PLUGIN(scaletempo) AG_GST_CHECK_PLUGIN(sdp) AG_GST_CHECK_PLUGIN(selector) @@ -1443,6 +1444,7 @@ gst/pcapparse/Makefile gst/qtmux/Makefile gst/rawparse/Makefile gst/rtpmanager/Makefile +gst/rtpmux/Makefile gst/scaletempo/Makefile gst/sdp/Makefile gst/selector/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index e29416a..da2d04a 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -134,6 +134,8 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/rtpmanager/gstrtpptdemux.h \ $(top_srcdir)/gst/rtpmanager/gstrtpsession.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/sdp/gstsdpdemux.h \ $(top_srcdir)/gst/selector/gstinputselector.h \ diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index 1aba2c7..8033290 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -59,6 +59,8 @@ + + @@ -131,6 +133,7 @@ + diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 2bd8941..84b5cab 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -946,3 +946,33 @@ GST_RTP_DTMF_DEPAY_CLASS gst_rtp_dtmf_depay_plugin_init +
+element-rtpmux +rtpmux +GstRTPMux + +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 +
+ +
+element-rtpdtmfmux +rtpdtmfmux +GstRTPDTMFMux + +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 +
diff --git a/docs/plugins/inspect/plugin-dtmf.xml b/docs/plugins/inspect/plugin-dtmf.xml index 2c132c5..0e9b72c 100644 --- a/docs/plugins/inspect/plugin-dtmf.xml +++ b/docs/plugins/inspect/plugin-dtmf.xml @@ -3,11 +3,11 @@ DTMF plugins ../../gst/dtmf/.libs/libgstdtmf.so libgstdtmf.so - 0.1 + 0.10.10.1 LGPL gst-plugins-bad - DTMF - + GStreamer Bad Plug-ins CVS/prerelease + Unknown package origin dtmfsrc @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/docs/plugins/inspect/plugin-rtpmux.xml b/docs/plugins/inspect/plugin-rtpmux.xml new file mode 100644 index 0000000..20847ec --- /dev/null +++ b/docs/plugins/inspect/plugin-rtpmux.xml @@ -0,0 +1,55 @@ + + rtpmux + RTP Muxer plugins + ../../gst/rtpmux/.libs/libgstrtpmux.so + libgstrtpmux.so + 0.10.10.1 + LGPL + gst-plugins-bad + GStreamer Bad Plug-ins CVS/prerelease + Unknown package origin + + + rtpdtmfmux + RTP muxer + Codec/Muxer + mixes RTP DTMF streams into other RTP streams + Zeeshan Ali <first.last@nokia.com> + + + sink_%d + sink + request +
application/x-rtp
+ + + src + source + always +
application/x-rtp
+ + + + + rtpmux + RTP muxer + Codec/Muxer + multiplex N rtp streams into one + Zeeshan Ali <first.last@nokia.com> + + + sink_%d + sink + request +
application/x-rtp
+ + + src + source + always +
application/x-rtp
+ + + + + \ No newline at end of file diff --git a/gst/rtpmux/Makefile.am b/gst/rtpmux/Makefile.am index 908181b..be9bc08 100644 --- a/gst/rtpmux/Makefile.am +++ b/gst/rtpmux/Makefile.am @@ -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 -libgstrtpmuxer_la_LIBADD = $(GST_LIBS_LIBS) -libgstrtpmuxer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ +libgstrtpmux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT +libgstrtpmux_la_LIBADD = $(GST_LIBS_LIBS) +libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ noinst_HEADERS = gstrtpmux.h gstrtpdtmfmux.h diff --git a/gst/rtpmux/gstrtpdtmfmux.c b/gst/rtpmux/gstrtpdtmfmux.c index 8b4c449..9928cc6 100644 --- a/gst/rtpmux/gstrtpdtmfmux.c +++ b/gst/rtpmux/gstrtpdtmfmux.c @@ -26,8 +26,8 @@ /** * SECTION:element-rtpdtmfmux * @short_description: mixes RTP DTMF streams into other RTP streams - * - * + * @see_also: rtpdtmfsrc, dtmfsrc + * * The RTPDTMFMuxer mixes/muxes RTP DTMF stream(s) into other RTP * streams. It does exactly what it's parent (RTPMuxer) does, except * that it allows upstream peer elements to request exclusive access @@ -40,11 +40,10 @@ * structure of name "stream-lock" with only one boolean field: * "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. - * - * 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: - * - * + * * * GstEvent *event; * GstStructure *structure; @@ -58,8 +57,7 @@ * event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure); * gst_pad_push_event (dtmfsrc->srcpad, event); * - * - * + * */ #ifdef HAVE_CONFIG_H diff --git a/gst/rtpmux/gstrtpmuxer.c b/gst/rtpmux/gstrtpmuxer.c index a4837d7..619418b 100644 --- a/gst/rtpmux/gstrtpmuxer.c +++ b/gst/rtpmux/gstrtpmuxer.c @@ -43,6 +43,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rtpmuxer", + "rtpmux", "RTP Muxer plugins", - plugin_init, "0.1", "LGPL", "Farsight", "http://farsight.sf.net"); + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)