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

rtpmanager: move rtpmux and rtpdtmfmux elements from -bad

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=629117
This commit is contained in:
Tim-Philipp Müller 2012-12-16 15:13:38 +00:00
parent de204ba754
commit 3295b5d791
5 changed files with 17 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/rtpmanager/Makefile.am
View file

@ -16,7 +16,9 @@ BUILT_SOURCES = $(built_sources) $(built_headers)
libgstrtpmanager_la_SOURCES = gstrtpmanager.c \
gstrtpbin.c \
gstrtpdtmfmux.c \
gstrtpjitterbuffer.c \
gstrtpmux.c \
gstrtpptdemux.c \
gstrtpssrcdemux.c \
rtpjitterbuffer.c \
@ -29,7 +31,9 @@ nodist_libgstrtpmanager_la_SOURCES = \
$(built_sources)
noinst_HEADERS = gstrtpbin.h \
gstrtpdtmfmux.h \
gstrtpjitterbuffer.h \
gstrtpmux.h \
gstrtpptdemux.h \
gstrtpssrcdemux.h \
rtpjitterbuffer.h \

8
gst/rtpmanager/gstrtpmanager.c
View file

@ -26,6 +26,8 @@
#include "gstrtpptdemux.h"
#include "gstrtpsession.h"
#include "gstrtpssrcdemux.h"
#include "gstrtpdtmfmux.h"
#include "gstrtpmux.h"
static gboolean
plugin_init (GstPlugin * plugin)
@ -49,6 +51,12 @@ plugin_init (GstPlugin * plugin)
GST_TYPE_RTP_SSRC_DEMUX))
return FALSE;
if (!gst_rtp_mux_plugin_init (plugin))
return FALSE;
if (!gst_rtp_dtmf_mux_plugin_init (plugin))
return FALSE;
return TRUE;
}

48
gst/rtpmanager/gstrtpmuxer.c
View file

@ -1,48 +0,0 @@
/* GStreamer RTP Muxer Plugins
*
* gstrtpdtmf.c:
*
* Copyright (C) <2007> Nokia Corporation.
* Contact: Zeeshan Ali <zeeshan.ali@nokia.com>
* Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
* 2000,2005 Wim Taymans <wim@fluendo.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "gstrtpmux.h"
#include "gstrtpdtmfmux.h"
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_rtp_mux_plugin_init (plugin))
return FALSE;
if (!gst_rtp_dtmf_mux_plugin_init (plugin))
return FALSE;
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
rtpmux,
"RTP Muxer plugins",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

4
tests/check/Makefile.am
View file

@ -142,6 +142,7 @@ check_PROGRAMS = \
elements/rtpbin \
elements/rtpbin_buffer_list \
elements/rtpjitterbuffer \
elements/rtpmux \
elements/shapewipe \
elements/spectrum \
elements/udpsink \
@ -285,6 +286,9 @@ elements_rtpbin_buffer_list_LDADD = $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) $(GST_LIBS) $(GST_CHECK_LIBS)
elements_rtpbin_buffer_list_SOURCES = elements/rtpbin_buffer_list.c
elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
elements_souphttpsrc_CFLAGS = $(SOUP_CFLAGS) $(AM_CFLAGS)
elements_souphttpsrc_LDADD = $(SOUP_LIBS) $(LDADD)

1
tests/check/elements/.gitignore vendored
View file

@ -47,6 +47,7 @@ rtp-payloading
rtpbin
rtpbin_buffer_list
rtpjitterbuffer
rtpmux
shapewipe
souphttpsrc
spectrum