summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--gst/udp/gstdynudpsink.c42
-rw-r--r--gst/udp/gstudpsrc.c60
4 files changed, 78 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index fe7f1739..cb05fc46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-07 Philippe Khalaf <philippe.kalaf@collabora.co.uk>
+
+ * gst-plugins-good/gst/udp/gstdynudpsink.c:
+ * gst-plugins-good/gst/udp/gstudpsrc.c:
+ Allow udpsrc and dynudpsink to take a sockfd as a parameter. For udpsrc,
+ overrides the port or multicast parameters. Fixes bugs #323021.
+
2006-01-06 Tim-Philipp Müller <tim at centricular dot net>
* ext/gconf/Makefile.am:
diff --git a/common b/common
-Subproject 5f10c872cafb3eb8058d63e438cae029ed9e8d7
+Subproject e0b121388ece524c0b7035a72bddd191d122d8b
diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
index 7e141515..e7be3b22 100644
--- a/gst/udp/gstdynudpsink.c
+++ b/gst/udp/gstdynudpsink.c
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) <2005> Philippe Khalaf <burger@speedy.org>
+ * Copyright (C) <2005> Nokia Corporation <kai.vehmanen@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -54,7 +55,8 @@ enum
enum
{
PROP_0,
- /* FILL ME */
+ PROP_SOCKFD
+ /* FILL ME */
};
static void gst_dynudpsink_base_init (gpointer g_class);
@@ -139,6 +141,11 @@ gst_dynudpsink_class_init (GstDynUDPSink * klass)
NULL, NULL, gst_udp_marshal_BOXED__STRING_INT, G_TYPE_VALUE_ARRAY, 2,
G_TYPE_STRING, G_TYPE_INT);
+ g_object_class_install_property (gobject_class, PROP_SOCKFD,
+ g_param_spec_int ("sockfd", "socket handle",
+ "Socket to use for UDP reception.",
+ 0, G_MAXINT16, 0, G_PARAM_READWRITE));
+
gstelement_class->change_state = gst_dynudpsink_change_state;
gstbasesink_class->get_times = gst_dynudpsink_get_times;
@@ -151,6 +158,11 @@ gst_dynudpsink_class_init (GstDynUDPSink * klass)
static void
gst_dynudpsink_init (GstDynUDPSink * sink)
{
+ GstDynUDPSink *udpsink;
+
+ udpsink = GST_DYNUDPSINK (sink);
+
+ sink->sock = -1;
}
static void
@@ -231,6 +243,11 @@ gst_dynudpsink_set_property (GObject * object, guint prop_id,
udpsink = GST_DYNUDPSINK (object);
switch (prop_id) {
+ case PROP_SOCKFD:
+ udpsink->sock = g_value_get_int (value);
+ GST_DEBUG ("setting SOCKFD to %d", udpsink->sock);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -246,6 +263,10 @@ gst_dynudpsink_get_property (GObject * object, guint prop_id, GValue * value,
udpsink = GST_DYNUDPSINK (object);
switch (prop_id) {
+ case PROP_SOCKFD:
+ g_value_set_int (value, udpsink->sock);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -260,15 +281,18 @@ gst_dynudpsink_init_send (GstDynUDPSink * sink)
guint bc_val;
gint ret;
- /* create sender socket */
- if ((sink->sock = socket (AF_INET, SOCK_DGRAM, 0)) == -1)
- goto no_socket;
+ if (sink->sock == -1) {
+ /* create sender socket if none available */
- bc_val = 1;
- if ((ret =
- setsockopt (sink->sock, SOL_SOCKET, SO_BROADCAST, &bc_val,
- sizeof (bc_val))) < 0)
- goto no_broadcast;
+ if ((sink->sock = socket (AF_INET, SOCK_DGRAM, 0)) == -1)
+ goto no_socket;
+
+ bc_val = 1;
+ if ((ret =
+ setsockopt (sink->sock, SOL_SOCKET, SO_BROADCAST, &bc_val,
+ sizeof (bc_val))) < 0)
+ goto no_broadcast;
+ }
return TRUE;
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 35e1a572..c9fbadb1 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
+ * Copyright (C) <2005> Nokia Corporation <kai.vehmanen@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -76,7 +77,8 @@ enum
PROP_MULTICAST_GROUP,
PROP_URI,
PROP_CAPS,
- /* FILL ME */
+ PROP_SOCKFD
+ /* FILL ME */
};
static void gst_udpsrc_uri_handler_init (gpointer g_iface, gpointer iface_data);
@@ -149,6 +151,10 @@ gst_udpsrc_class_init (GstUDPSrcClass * klass)
g_object_class_install_property (gobject_class, PROP_CAPS,
g_param_spec_boxed ("caps", "Caps",
"The caps of the source pad", GST_TYPE_CAPS, G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, PROP_SOCKFD,
+ g_param_spec_int ("sockfd", "socket handle",
+ "Socket to use for UDP reception.",
+ 0, G_MAXINT16, 0, G_PARAM_READWRITE));
gstbasesrc_class->start = gst_udpsrc_start;
gstbasesrc_class->stop = gst_udpsrc_stop;
@@ -403,6 +409,10 @@ gst_udpsrc_set_property (GObject * object, guint prop_id, const GValue * value,
gst_pad_set_caps (GST_BASE_SRC (udpsrc)->srcpad, new_caps);
break;
}
+ case PROP_SOCKFD:
+ udpsrc->sock = g_value_get_int (value);
+ GST_DEBUG ("setting SOCKFD to %d", udpsrc->sock);
+ break;
default:
break;
}
@@ -427,6 +437,9 @@ gst_udpsrc_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_CAPS:
gst_value_set_caps (value, udpsrc->caps);
break;
+ case PROP_SOCKFD:
+ g_value_set_int (value, udpsrc->sock);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -454,27 +467,30 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
fcntl (READ_SOCKET (src), F_SETFL, O_NONBLOCK);
fcntl (WRITE_SOCKET (src), F_SETFL, O_NONBLOCK);
- if ((ret = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
- goto no_socket;
-
- src->sock = ret;
-
- reuse = 1;
- if ((ret =
- setsockopt (src->sock, SOL_SOCKET, SO_REUSEADDR, &reuse,
- sizeof (reuse))) < 0)
- goto setsockopt_error;
-
- memset (&src->myaddr, 0, sizeof (src->myaddr));
- src->myaddr.sin_family = AF_INET; /* host byte order */
- src->myaddr.sin_port = htons (src->port); /* short, network byte order */
- src->myaddr.sin_addr.s_addr = INADDR_ANY;
-
- GST_DEBUG_OBJECT (src, "binding on port %d", src->port);
- if ((ret =
- bind (src->sock, (struct sockaddr *) &src->myaddr,
- sizeof (src->myaddr))) < 0)
- goto bind_error;
+ if (src->sock == -1) {
+ if ((ret = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
+ goto no_socket;
+
+ src->sock = ret;
+
+ reuse = 1;
+ if ((ret =
+ setsockopt (src->sock, SOL_SOCKET, SO_REUSEADDR, &reuse,
+ sizeof (reuse))) < 0)
+ goto setsockopt_error;
+
+ /* XXX-kvehmanen: add ability to select a random, free port */
+ memset (&src->myaddr, 0, sizeof (src->myaddr));
+ src->myaddr.sin_family = AF_INET; /* host byte order */
+ src->myaddr.sin_port = htons (src->port); /* short, network byte order */
+ src->myaddr.sin_addr.s_addr = INADDR_ANY;
+
+ GST_DEBUG_OBJECT (src, "binding on port %d", src->port);
+ if ((ret =
+ bind (src->sock, (struct sockaddr *) &src->myaddr,
+ sizeof (src->myaddr))) < 0)
+ goto bind_error;
+ }
if (inet_aton (src->multi_group, &(src->multi_addr.imr_multiaddr))) {
if (src->multi_addr.imr_multiaddr.s_addr) {
generated by cgit (git 2.34.1) at 2025-10-31 04:16:07 +0000