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

net: remove net library, it's now in core

Browse source
This commit is contained in:
Wim Taymans 2011-11-03 16:48:51 +01:00
parent 90bbac6b2e
commit f4bee46072
8 changed files with 1 additions and 605 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -902,7 +902,6 @@ gst-libs/gst/app/Makefile
gst-libs/gst/cdda/Makefile gst-libs/gst/cdda/Makefile
gst-libs/gst/fft/Makefile gst-libs/gst/fft/Makefile
gst-libs/gst/interfaces/Makefile gst-libs/gst/interfaces/Makefile
gst-libs/gst/netbuffer/Makefile
gst-libs/gst/riff/Makefile gst-libs/gst/riff/Makefile
gst-libs/gst/rtp/Makefile gst-libs/gst/rtp/Makefile
gst-libs/gst/rtsp/Makefile gst-libs/gst/rtsp/Makefile
@ -923,8 +922,6 @@ pkgconfig/gstreamer-fft.pc
pkgconfig/gstreamer-fft-uninstalled.pc pkgconfig/gstreamer-fft-uninstalled.pc
pkgconfig/gstreamer-interfaces.pc pkgconfig/gstreamer-interfaces.pc
pkgconfig/gstreamer-interfaces-uninstalled.pc pkgconfig/gstreamer-interfaces-uninstalled.pc
pkgconfig/gstreamer-netbuffer.pc
pkgconfig/gstreamer-netbuffer-uninstalled.pc
pkgconfig/gstreamer-pbutils.pc pkgconfig/gstreamer-pbutils.pc
pkgconfig/gstreamer-pbutils-uninstalled.pc pkgconfig/gstreamer-pbutils-uninstalled.pc
pkgconfig/gstreamer-riff.pc pkgconfig/gstreamer-riff.pc

3
gst-libs/gst/Makefile.am
View file

@ -7,7 +7,6 @@ SUBDIRS = \
tag \ tag \
cdda \ cdda \
fft \ fft \
netbuffer \
rtp \ rtp \
sdp \ sdp \
rtsp \ rtsp \
@ -31,7 +30,7 @@ rtsp: sdp
pbutils: video audio pbutils: video audio
INDEPENDENT_SUBDIRS = \ INDEPENDENT_SUBDIRS = \
interfaces tag audio fft netbuffer rtp sdp video app interfaces tag audio fft rtp sdp video app
.PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS) .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)

70
gst-libs/gst/netbuffer/Makefile.am
View file

@ -1,70 +0,0 @@
libgstnetbufferincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/netbuffer
libgstnetbufferinclude_HEADERS = gstnetbuffer.h
lib_LTLIBRARIES = libgstnetbuffer-@GST_MAJORMINOR@.la
libgstnetbuffer_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c
libgstnetbuffer_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstnetbuffer_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
libgstnetbuffer_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstNetbuffer-@GST_MAJORMINOR@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnetbufferinclude_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnetbuffer_@GST_MAJORMINOR@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/netbuffer/%',$(libgstnetbufferinclude_HEADERS))
GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer \
--nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \
$(gir_cincludes) \
-DGST_USE_UNSTABLE_API \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
--library=libgstnetbuffer-@GST_MAJORMINOR@.la \
--include=Gst-@GST_MAJORMINOR@ \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-netbuffer-@GST_MAJORMINOR@ \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \
$(gir_headers) \
$(gir_sources)
# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
# install anything - we need to install inside our prefix.
girdir = $(datadir)/gir-1.0
gir_DATA = $(BUILT_GIRSOURCES)
typelibsdir = $(libdir)/girepository-1.0/
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
%.typelib: %.gir $(INTROSPECTION_COMPILER)
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
$(INTROSPECTION_COMPILER) \
--includedir=$(srcdir) \
--includedir=$(builddir) \
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
endif
Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer -:PROJECT libgstnetbuffer -:SHARED libgstnetbuffer-@GST_MAJORMINOR@ \
-:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstnetbuffer_@GST_MAJORMINOR@_la_SOURCES) \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstnetbuffer_@GST_MAJORMINOR@_la_CFLAGS) \
-:LDFLAGS $(libgstnetbuffer_@GST_MAJORMINOR@_la_LDFLAGS) \
$(libgstnetbuffer_@GST_MAJORMINOR@_la_LIBADD) \
-ldl \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/netbuffer \
-:HEADERS $(libgstnetbuffer_include_HEADERS) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@

9
gst-libs/gst/netbuffer/README
View file

@ -1,9 +0,0 @@
The network libraries
---------------------
GstNetBuffer:
A GstBuffer subclass that can be used by network sources or sinks to
store additional to and from addresses. This is required for plugins
that operate on this data like RTP.

379
gst-libs/gst/netbuffer/gstnetbuffer.c
View file

@ -1,379 +0,0 @@
/* GStreamer
* Copyright (C) <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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/**
* SECTION:gstnetbuffer
* @short_description: Buffer for use in network sources and sinks
*
* #GstNetBuffer is a subclass of a normal #GstBuffer that contains two
* additional metadata fields of type #GstNetAddress named 'to' and 'from'. The
* buffer can be used to store additional information about the origin of the
* buffer data and is used in various network elements to track the to and from
* addresses.
*
* Last reviewed on 2006-08-21 (0.10.10)
*/
#include <string.h>
#include "gstnetbuffer.h"
static void
net_address_meta_copy (GstBuffer * copybuf, GstNetAddressMeta * meta,
GstBuffer * buffer, gsize offset, gsize size)
{
GstNetAddressMeta *naddr;
naddr = gst_buffer_add_net_address_meta (copybuf);
memcpy (&naddr->naddr, &meta->naddr, sizeof (meta->naddr));
}
const GstMetaInfo *
gst_net_address_meta_get_info (void)
{
static const GstMetaInfo *meta_info = NULL;
if (meta_info == NULL) {
meta_info = gst_meta_register ("GstNetAddressMeta", "GstNetAddressMeta",
sizeof (GstNetAddressMeta),
(GstMetaInitFunction) NULL,
(GstMetaFreeFunction) NULL,
(GstMetaCopyFunction) net_address_meta_copy,
(GstMetaTransformFunction) NULL);
}
return meta_info;
}
/**
* gst_net_address_set_ip4_address:
* @naddr: a network address
* @address: an IPv4 network address.
* @port: a port number to set.
*
* Set @naddr with the IPv4 @address and @port pair.
*
* Note that @port and @address must be expressed in network byte order,
* use g_htons() and g_htonl() to convert them to network byte order.
*/
void
gst_net_address_set_ip4_address (GstNetAddress * naddr, guint32 address,
guint16 port)
{
g_return_if_fail (naddr != NULL);
naddr->type = GST_NET_TYPE_IP4;
naddr->address.ip4 = address;
naddr->port = port;
}
/**
* gst_net_address_set_ip6_address:
* @naddr: a network address
* @address: an IPv6 network address.
* @port: a port number to set.
*
* Set @naddr with the IPv6 @address and @port pair.
*
* Note that @port must be expressed in network byte order, use g_htons() to convert
* it to network byte order.
*/
void
gst_net_address_set_ip6_address (GstNetAddress * naddr, guint8 address[16],
guint16 port)
{
g_return_if_fail (naddr != NULL);
naddr->type = GST_NET_TYPE_IP6;
memcpy (&naddr->address.ip6, address, 16);
naddr->port = port;
}
/**
* gst_net_address_get_net_type:
* @naddr: a network address
*
* Get the type of address stored in @naddr.
*
* Returns: the network type stored in @naddr.
*/
GstNetType
gst_net_address_get_net_type (const GstNetAddress * naddr)
{
g_return_val_if_fail (naddr != NULL, GST_NET_TYPE_UNKNOWN);
return naddr->type;
}
/**
* gst_net_address_get_ip4_address:
* @naddr: a network address
* @address: a location to store the address.
* @port: a location to store the port.
*
* Get the IPv4 address stored in @naddr into @address. This function requires
* that the address type of @naddr is of type #GST_NET_TYPE_IP4.
*
* Note that @port and @address are expressed in network byte order, use
* g_ntohs() and g_ntohl() to convert them to host order.
*
* Returns: TRUE if the address could be retrieved.
*/
gboolean
gst_net_address_get_ip4_address (const GstNetAddress * naddr, guint32 * address,
guint16 * port)
{
g_return_val_if_fail (naddr != NULL, FALSE);
if (naddr->type == GST_NET_TYPE_UNKNOWN || naddr->type == GST_NET_TYPE_IP6)
return FALSE;
if (address)
*address = naddr->address.ip4;
if (port)
*port = naddr->port;
return TRUE;
}
/**
* gst_net_address_get_ip6_address:
* @naddr: a network address
* @address: a location to store the result.
* @port: a location to store the port.
*
* Get the IPv6 address stored in @naddr into @address.
*
* If @naddr is of type GST_NET_TYPE_IP4, the transitional IP6 address is
* returned.
*
* Note that @port is expressed in network byte order, use g_ntohs() to convert
* it to host order.
*
* Returns: TRUE if the address could be retrieved.
*/
gboolean
gst_net_address_get_ip6_address (const GstNetAddress * naddr,
guint8 address[16], guint16 * port)
{
static guint8 ip4_transition[16] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF };
g_return_val_if_fail (naddr != NULL, FALSE);
if (naddr->type == GST_NET_TYPE_UNKNOWN)
return FALSE;
if (address) {
if (naddr->type == GST_NET_TYPE_IP6) {
memcpy (address, naddr->address.ip6, 16);
} else { /* naddr->type == GST_NET_TYPE_IP4 */
memcpy (address, ip4_transition, 12);
memcpy (address + 12, (guint8 *) & (naddr->address.ip4), 4);
}
}
if (port)
*port = naddr->port;
return TRUE;
}
/**
* gst_net_address_get_address_bytes:
* @naddr: a network address
* @address: a location to store the result.
* @port: a location to store the port.
*
* Get just the address bytes stored in @naddr into @address.
*
* Note that @port is expressed in network byte order, use g_ntohs() to convert
* it to host order. IP4 addresses are also stored in network byte order.
*
* Returns: number of bytes actually copied
*
* Since: 0.10.22
*/
gint
gst_net_address_get_address_bytes (const GstNetAddress * naddr,
guint8 address[16], guint16 * port)
{
gint ret = 0;
g_return_val_if_fail (naddr != NULL, FALSE);
if (naddr->type == GST_NET_TYPE_UNKNOWN)
return 0;
if (address) {
if (naddr->type == GST_NET_TYPE_IP6) {
memcpy (address, naddr->address.ip6, 16);
ret = 16;
} else { /* naddr->type == GST_NET_TYPE_IP4 */
memcpy (address, (guint8 *) & (naddr->address.ip4), 4);
ret = 4;
}
}
if (port)
*port = naddr->port;
return ret;
}
/**
* gst_net_address_set_address_bytes:
* @naddr: a network address
* @type: the address type (IPv4 or IPV6)
* @address: a location to store the result.
* @port: a location to store the port.
*
* Set just the address bytes stored in @naddr into @address.
*
* Note that @port must be expressed in network byte order, use g_htons() to
* convert it to network byte order order. IP4 address bytes must also be
* stored in network byte order.
*
* Returns: number of bytes actually copied
*
* Since: 0.10.22
*/
gint
gst_net_address_set_address_bytes (GstNetAddress * naddr, GstNetType type,
guint8 address[16], guint16 port)
{
gint len = 0;
g_return_val_if_fail (naddr != NULL, 0);
naddr->type = type;
switch (naddr->type) {
case GST_NET_TYPE_UNKNOWN:
case GST_NET_TYPE_IP6:
len = 16;
memcpy (naddr->address.ip6, address, 16);
break;
case GST_NET_TYPE_IP4:
len = 4;
memcpy ((guint8 *) & (naddr->address.ip4), address, 4);
break;
}
if (port)
naddr->port = port;
return len;
}
/**
* gst_net_address_equal:
* @naddr1: The first #GstNetAddress
* @naddr2: The second #GstNetAddress
*
* Compare two #GstNetAddress structures
*
* Returns: TRUE if they are identical, FALSE otherwise
*
* Since: 0.10.18
*/
gboolean
gst_net_address_equal (const GstNetAddress * naddr1,
const GstNetAddress * naddr2)
{
g_return_val_if_fail (naddr1 != NULL, FALSE);
g_return_val_if_fail (naddr2 != NULL, FALSE);
if (naddr1->type != naddr2->type)
return FALSE;
if (naddr1->port != naddr2->port)
return FALSE;
switch (naddr1->type) {
case GST_NET_TYPE_IP4:
if (naddr1->address.ip4 != naddr2->address.ip4)
return FALSE;
break;
case GST_NET_TYPE_IP6:
if (memcmp (naddr1->address.ip6, naddr2->address.ip6,
sizeof (naddr1->address.ip6)))
return FALSE;
break;
default:
break;
}
return TRUE;
}
/**
* gst_net_address_to_string:
* @naddr: a #GstNetAddress
* @dest: destination
* @len: len of @dest
*
* Copies a string representation of @naddr into @dest. Up to @len bytes are
* copied.
*
* Returns: the number of bytes which would be produced if the buffer was large
* enough
*
* Since: 0.10.24
*/
gint
gst_net_address_to_string (const GstNetAddress * naddr, gchar * dest,
gulong len)
{
gint result;
g_return_val_if_fail (naddr != NULL, FALSE);
g_return_val_if_fail (dest != NULL, FALSE);
switch (naddr->type) {
case GST_NET_TYPE_IP4:
{
guint32 address;
guint16 port;
gst_net_address_get_ip4_address (naddr, &address, &port);
address = g_ntohl (address);
result = g_snprintf (dest, len, "%d.%d.%d.%d:%d", (address >> 24) & 0xff,
(address >> 16) & 0xff, (address >> 8) & 0xff, address & 0xff,
g_ntohs (port));
break;
}
case GST_NET_TYPE_IP6:
{
guint8 address[16];
guint16 port;
gst_net_address_get_ip6_address (naddr, address, &port);
result =
g_snprintf (dest, len, "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]:%d",
(address[0] << 8) | address[1], (address[2] << 8) | address[3],
(address[4] << 8) | address[5], (address[6] << 8) | address[7],
(address[8] << 8) | address[9], (address[10] << 8) | address[11],
(address[12] << 8) | address[13], (address[14] << 8) | address[15],
g_ntohs (port));
break;
}
default:
dest[0] = 0;
result = 0;
break;
}
return result;
}

110
gst-libs/gst/netbuffer/gstnetbuffer.h
View file

@ -1,110 +0,0 @@
/* GStreamer
* Copyright (C) <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., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_NETBUFFER_H__
#define __GST_NETBUFFER_H__
#include <gst/gst.h>
G_BEGIN_DECLS
typedef struct _GstNetAddress GstNetAddress;
/**
* GstNetType:
* @GST_NET_TYPE_UNKNOWN: unknown address type
* @GST_NET_TYPE_IP4: an IPv4 address type
* @GST_NET_TYPE_IP6: and IPv6 address type
*
* The Address type used in #GstNetAddress.
*/
typedef enum {
GST_NET_TYPE_UNKNOWN,
GST_NET_TYPE_IP4,
GST_NET_TYPE_IP6,
} GstNetType;
/**
* GST_NETADDRESS_MAX_LEN:
*
* The maximum length of a string representation of a GstNetAddress as produced
* by gst_net_address_to_string().
*
* Since: 0.10.24
*/
#define GST_NETADDRESS_MAX_LEN 64
/**
* GstNetAddress:
*
* An opaque network address as used in #GstNetAddressMeta.
*/
struct _GstNetAddress {
/*< private >*/
GstNetType type;
union {
guint8 ip6[16];
guint32 ip4;
} address;
guint16 port;
/*< private >*/
gpointer _gst_reserved[GST_PADDING];
};
typedef struct _GstNetAddressMeta GstNetAddressMeta;
/**
* GstNetAddressMeta:
*
* Buffer metadata for network addresses.
*/
struct _GstNetAddressMeta {
GstMeta meta;
GstNetAddress naddr;
};
const GstMetaInfo *gst_net_address_meta_get_info (void);
#define GST_NET_ADDRESS_META_INFO (gst_net_address_meta_get_info())
#define gst_buffer_get_net_address_meta(b) \
((GstNetAddressMeta*)gst_buffer_get_meta((b),GST_NET_ADDRESS_META_INFO))
#define gst_buffer_add_net_address_meta(b) \
((GstNetAddressMeta*)gst_buffer_add_meta((b),GST_NET_ADDRESS_META_INFO,NULL))
/* address operations */
void gst_net_address_set_ip4_address (GstNetAddress *naddr, guint32 address, guint16 port);
void gst_net_address_set_ip6_address (GstNetAddress *naddr, guint8 address[16], guint16 port);
gint gst_net_address_set_address_bytes (GstNetAddress *naddr, GstNetType type,
guint8 address[16], guint16 port);
GstNetType gst_net_address_get_net_type (const GstNetAddress *naddr);
gboolean gst_net_address_get_ip4_address (const GstNetAddress *naddr, guint32 *address, guint16 *port);
gboolean gst_net_address_get_ip6_address (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
gint gst_net_address_get_address_bytes (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
gboolean gst_net_address_equal (const GstNetAddress *naddr1,
const GstNetAddress *naddr2);
gint gst_net_address_to_string (const GstNetAddress *naddr, gchar *dest, gulong len);
G_END_DECLS
#endif /* __GST_NETBUFFER_H__ */

16
pkgconfig/gstreamer-netbuffer-uninstalled.pc.in
View file

@ -1,16 +0,0 @@
# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
libdir=
# includedir is builddir because it is used to find gstconfig.h in places
includedir=@abs_top_builddir@/gst-libs
girdir=@abs_top_builddir@/gst-libs/gst/netbuffer
typelibdir=@abs_top_builddir@/gst-libs/gst/netbuffer
Name: GStreamer Network Buffer Library, Uninstalled
Description: Network buffer for use in network sources/sinks, uninstalled
Version: @VERSION@
Requires: gstreamer-@GST_MAJORMINOR@
Libs: @abs_top_builddir@/gst-libs/gst/netbuffer/libgstnetbuffer-@GST_MAJORMINOR@.la
Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs

16
pkgconfig/gstreamer-netbuffer.pc.in
View file

@ -1,16 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
datarootdir=${prefix}/share
datadir=${datarootdir}
girdir=${datadir}/gir-1.0
typelibdir=${libdir}/girepository-1.0
Name: GStreamer Network Buffer Library
Description: Network buffer for use in network sources/sinks
Requires: gstreamer-@GST_MAJORMINOR@
Version: @VERSION@
Libs: -L${libdir} -lgstnetbuffer-@GST_MAJORMINOR@
Cflags: -I${includedir}