* It can be combined with rtp payload encoders to implement RTP streaming.
*/
-/* FIXME 0.11: suppress warnings for deprecated API such as GValueArray
- * with newer GLib versions (>= 2.31.0) */
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define DEFAULT_QOS_DSCP -1
#define DEFAULT_SEND_DUPLICATES TRUE
#define DEFAULT_BUFFER_SIZE 0
+#define DEFAULT_BIND_ADDRESS NULL
+#define DEFAULT_BIND_PORT 0
enum
{
PROP_QOS_DSCP,
PROP_SEND_DUPLICATES,
PROP_BUFFER_SIZE,
- PROP_LAST
+ PROP_BIND_ADDRESS,
+ PROP_BIND_PORT
};
static void gst_multiudpsink_finalize (GObject * object);
static GstFlowReturn gst_multiudpsink_render (GstBaseSink * sink,
GstBuffer * buffer);
+static GstFlowReturn gst_multiudpsink_render_list (GstBaseSink * bsink,
+ GstBufferList * buffer_list);
static gboolean gst_multiudpsink_start (GstBaseSink * bsink);
static gboolean gst_multiudpsink_stop (GstBaseSink * bsink);
" FALSE = disable", DEFAULT_LOOP,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * GstMultiUDPSink::force-ipv4
+ * GstMultiUDPSink::force-ipv4:
*
* Force the use of an IPv4 socket.
*
* Since: 1.0.2
*/
+#ifndef GST_REMOVE_DEPRECATED
g_object_class_install_property (gobject_class, PROP_FORCE_IPV4,
g_param_spec_boolean ("force-ipv4", "Force IPv4",
"Forcing the use of an IPv4 socket (DEPRECATED, has no effect anymore)",
- DEFAULT_FORCE_IPV4, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
+ DEFAULT_FORCE_IPV4,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED));
+#endif
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_QOS_DSCP,
g_param_spec_int ("qos-dscp", "QoS diff srv code point",
"Quality of Service, differentiated services code point (-1 default)",
-1, 63, DEFAULT_QOS_DSCP,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * GstMultiUDPSink::send-duplicates
+ * GstMultiUDPSink::send-duplicates:
*
* When a host/port pair is added mutliple times, send the packet to the host
* multiple times as well.
- *
- * Since: 0.10.26
*/
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SEND_DUPLICATES,
g_param_spec_boolean ("send-duplicates", "Send Duplicates",
"Size of the kernel send buffer in bytes, 0=default", 0, G_MAXINT,
DEFAULT_BUFFER_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (gobject_class, PROP_BIND_ADDRESS,
+ g_param_spec_string ("bind-address", "Bind Address",
+ "Address to bind the socket to", DEFAULT_BIND_ADDRESS,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (gobject_class, PROP_BIND_PORT,
+ g_param_spec_int ("bind-port", "Bind Port",
+ "Port to bind the socket to", 0, G_MAXUINT16,
+ DEFAULT_BIND_PORT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&sink_template));
gst_element_class_set_static_metadata (gstelement_class, "UDP packet sender",
"Sink/Network",
- "Send data over the network via UDP",
+ "Send data over the network via UDP to one or multiple recipients "
+ "which can be added or removed at runtime using action signals",
"Wim Taymans <wim.taymans@gmail.com>");
gstbasesink_class->render = gst_multiudpsink_render;
+ gstbasesink_class->render_list = gst_multiudpsink_render_list;
gstbasesink_class->start = gst_multiudpsink_start;
gstbasesink_class->stop = gst_multiudpsink_stop;
gstbasesink_class->unlock = gst_multiudpsink_unlock;
GST_DEBUG_CATEGORY_INIT (multiudpsink_debug, "multiudpsink", 0, "UDP sink");
}
+static void
+gst_multiudpsink_create_cancellable (GstMultiUDPSink * sink)
+{
+ GPollFD pollfd;
+
+ sink->cancellable = g_cancellable_new ();
+ sink->made_cancel_fd = g_cancellable_make_pollfd (sink->cancellable, &pollfd);
+}
+
+static void
+gst_multiudpsink_free_cancellable (GstMultiUDPSink * sink)
+{
+ if (sink->made_cancel_fd) {
+ g_cancellable_release_fd (sink->cancellable);
+ sink->made_cancel_fd = FALSE;
+ }
+ g_object_unref (sink->cancellable);
+ sink->cancellable = NULL;
+}
static void
gst_multiudpsink_init (GstMultiUDPSink * sink)
guint max_mem;
g_mutex_init (&sink->client_lock);
+ sink->clients = NULL;
+ sink->num_v4_unique = 0;
+ sink->num_v4_all = 0;
+ sink->num_v6_unique = 0;
+ sink->num_v6_all = 0;
+
sink->socket = DEFAULT_SOCKET;
sink->socket_v6 = DEFAULT_SOCKET;
sink->used_socket = DEFAULT_USED_SOCKET;
sink->send_duplicates = DEFAULT_SEND_DUPLICATES;
sink->multi_iface = g_strdup (DEFAULT_MULTICAST_IFACE);
- sink->cancellable = g_cancellable_new ();
+ gst_multiudpsink_create_cancellable (sink);
- /* allocate OutputVector and MapInfo for use in the render function, buffers can
- * hold up to a maximum amount of memory so we can create a maximally sized
- * array for them. */
+ /* pre-allocate OutputVector, MapInfo and OutputMessage arrays
+ * for use in the render and render_list functions */
max_mem = gst_buffer_get_max_memory ();
- sink->vec = g_new (GOutputVector, max_mem);
- sink->map = g_new (GstMapInfo, max_mem);
+ sink->n_vecs = max_mem;
+ sink->vecs = g_new (GOutputVector, sink->n_vecs);
+
+ sink->n_maps = max_mem;
+ sink->maps = g_new (GstMapInfo, sink->n_maps);
+
+ sink->n_messages = 1;
+ sink->messages = g_new (GstOutputMessage, sink->n_messages);
+
+ /* we assume that the number of memories per buffer can fit into a guint8 */
+ g_warn_if_fail (max_mem <= G_MAXUINT8);
}
static GstUDPClient *
-create_client (GstMultiUDPSink * sink, const gchar * host, gint port)
+gst_udp_client_new (GstMultiUDPSink * sink, const gchar * host, gint port)
{
GstUDPClient *client;
GInetAddress *addr;
#endif
client = g_slice_new0 (GstUDPClient);
- client->refcount = 1;
+ client->ref_count = 1;
+ client->add_count = 0;
client->host = g_strdup (host);
client->port = port;
client->addr = g_inet_socket_address_new (addr, port);
name_resolve:
{
+ g_clear_error (&err);
g_object_unref (resolver);
return NULL;
}
}
+/* call with client lock held */
static void
-free_client (GstUDPClient * client)
+gst_udp_client_unref (GstUDPClient * client)
{
- g_object_unref (client->addr);
- g_free (client->host);
- g_slice_free (GstUDPClient, client);
+ if (--client->ref_count == 0) {
+ g_object_unref (client->addr);
+ g_free (client->host);
+ g_slice_free (GstUDPClient, client);
+ }
+}
+
+/* call with client lock held */
+static inline GstUDPClient *
+gst_udp_client_ref (GstUDPClient * client)
+{
+ ++client->ref_count;
+ return client;
}
static gint
sink = GST_MULTIUDPSINK (object);
- g_list_foreach (sink->clients, (GFunc) free_client, NULL);
+ g_list_foreach (sink->clients, (GFunc) gst_udp_client_unref, NULL);
g_list_free (sink->clients);
if (sink->socket)
g_object_unref (sink->used_socket_v6);
sink->used_socket_v6 = NULL;
- if (sink->cancellable)
- g_object_unref (sink->cancellable);
- sink->cancellable = NULL;
+ gst_multiudpsink_free_cancellable (sink);
g_free (sink->multi_iface);
sink->multi_iface = NULL;
- g_free (sink->vec);
- g_free (sink->map);
+ g_free (sink->vecs);
+ sink->vecs = NULL;
+ g_free (sink->maps);
+ sink->maps = NULL;
+ g_free (sink->messages);
+ sink->messages = NULL;
+
+ g_free (sink->bind_address);
+ sink->bind_address = NULL;
g_mutex_clear (&sink->client_lock);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static GstFlowReturn
-gst_multiudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
+/* replacement until we can depend unconditionally on the real one in GLib */
+#ifndef HAVE_G_SOCKET_SEND_MESSAGES
+#define g_socket_send_messages gst_socket_send_messages
+
+static gint
+gst_socket_send_messages (GSocket * socket, GstOutputMessage * messages,
+ guint num_messages, gint flags, GCancellable * cancellable, GError ** error)
+{
+ gssize result;
+ gint i;
+
+ for (i = 0; i < num_messages; ++i) {
+ GstOutputMessage *msg = &messages[i];
+ GError *msg_error = NULL;
+
+ result = g_socket_send_message (socket, msg->address,
+ msg->vectors, msg->num_vectors,
+ msg->control_messages, msg->num_control_messages,
+ flags, cancellable, &msg_error);
+
+ if (result < 0) {
+ /* if we couldn't send all messages, just return how many we did
+ * manage to send, provided we managed to send at least one */
+ if (msg_error->code == G_IO_ERROR_WOULD_BLOCK && i > 0) {
+ g_error_free (msg_error);
+ return i;
+ } else {
+ g_propagate_error (error, msg_error);
+ return -1;
+ }
+ }
+
+ msg->bytes_sent = result;
+ }
+
+ return i;
+}
+#endif /* HAVE_G_SOCKET_SEND_MESSAGES */
+
+static gsize
+fill_vectors (GOutputVector * vecs, GstMapInfo * maps, guint n, GstBuffer * buf)
{
- GstMultiUDPSink *sink;
- GList *clients;
- GOutputVector *vec;
- GstMapInfo *map;
- guint n_mem, i;
- gsize size;
GstMemory *mem;
- gint num, no_clients;
- GError *err = NULL;
+ gsize size = 0;
+ guint i;
- sink = GST_MULTIUDPSINK (bsink);
+ g_assert (gst_buffer_n_memory (buf) == n);
- n_mem = gst_buffer_n_memory (buffer);
- if (n_mem == 0)
- goto no_data;
+ for (i = 0; i < n; ++i) {
+ mem = gst_buffer_peek_memory (buf, i);
+ if (gst_memory_map (mem, &maps[i], GST_MAP_READ)) {
+ vecs[i].buffer = maps[i].data;
+ vecs[i].size = maps[i].size;
+ } else {
+ GST_WARNING ("Failed to map memory %p for reading", mem);
+ vecs[i].buffer = "";
+ vecs[i].size = 0;
+ }
+ size += vecs[i].size;
+ }
- /* allocated on the stack, the max number of memory blocks is limited so this
- * should not cause stack overflows */
- vec = sink->vec;
- map = sink->map;
+ return size;
+}
+
+static gsize
+gst_udp_calc_message_size (GstOutputMessage * msg)
+{
+ gsize size = 0;
+ guint i;
- size = 0;
- for (i = 0; i < n_mem; i++) {
- mem = gst_buffer_get_memory (buffer, i);
- gst_memory_map (mem, &map[i], GST_MAP_READ);
+ for (i = 0; i < msg->num_vectors; ++i)
+ size += msg->vectors[i].size;
- vec[i].buffer = map[i].data;
- vec[i].size = map[i].size;
+ return size;
+}
+
+static gint
+gst_udp_messsages_find_first_not_sent (GstOutputMessage * messages,
+ guint num_messages)
+{
+ guint i;
- size += map[i].size;
+ for (i = 0; i < num_messages; ++i) {
+ GstOutputMessage *msg = &messages[i];
+
+ if (msg->bytes_sent == 0 && gst_udp_calc_message_size (msg) > 0)
+ return i;
}
- sink->bytes_to_serve += size;
+ return -1;
+}
- /* grab lock while iterating and sending to clients, this should be
- * fast as UDP never blocks */
- g_mutex_lock (&sink->client_lock);
- GST_LOG_OBJECT (bsink, "about to send %" G_GSIZE_FORMAT " bytes in %u blocks",
- size, n_mem);
+static inline gchar *
+gst_udp_address_get_string (GSocketAddress * addr, gchar * s, gsize size)
+{
+ GInetSocketAddress *isa = G_INET_SOCKET_ADDRESS (addr);
+ GInetAddress *ia;
+ gchar *addr_str;
- no_clients = 0;
- num = 0;
- for (clients = sink->clients; clients; clients = g_list_next (clients)) {
- GstUDPClient *client;
- GSocket *socket;
- GSocketFamily family;
- gint count;
+ ia = g_inet_socket_address_get_address (isa);
+ addr_str = g_inet_address_to_string (ia);
+ g_snprintf (s, size, "%s:%u", addr_str, g_inet_socket_address_get_port (isa));
+ g_free (addr_str);
- client = (GstUDPClient *) clients->data;
- no_clients++;
- GST_LOG_OBJECT (sink, "sending %" G_GSIZE_FORMAT " bytes to client %p",
- size, client);
+ return s;
+}
- family = g_socket_address_get_family (G_SOCKET_ADDRESS (client->addr));
- /* Select socket to send from for this address */
- if (family == G_SOCKET_FAMILY_IPV6 || !sink->used_socket)
- socket = sink->used_socket_v6;
- else
- socket = sink->used_socket;
+/* Wrapper around g_socket_send_messages() plus error handling (ignoring).
+ * Returns FALSE if we got cancelled, otherwise TRUE. */
+static gboolean
+gst_multiudpsink_send_messages (GstMultiUDPSink * sink, GSocket * socket,
+ GstOutputMessage * messages, guint num_messages)
+{
+ gboolean sent_max_size_warning = FALSE;
- count = sink->send_duplicates ? client->refcount : 1;
+ while (num_messages > 0) {
+ gchar astr[64] G_GNUC_UNUSED;
+ GError *err = NULL;
+ guint msg_size, skip, i;
+ gint ret, err_idx;
- while (count--) {
- gssize ret;
+ ret = g_socket_send_messages (socket, messages, num_messages, 0,
+ sink->cancellable, &err);
- ret =
- g_socket_send_message (socket, client->addr, vec, n_mem,
- NULL, 0, 0, sink->cancellable, &err);
+ if (G_UNLIKELY (ret < 0)) {
+ GstOutputMessage *msg;
+
+ if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_clear_error (&err);
+ return FALSE;
+ }
+
+ err_idx = gst_udp_messsages_find_first_not_sent (messages, num_messages);
+ if (err_idx < 0)
+ break;
- if (G_UNLIKELY (ret < 0)) {
- if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- goto flushing;
+ msg = &messages[err_idx];
+ msg_size = gst_udp_calc_message_size (msg);
- /* we continue after posting a warning, next packets might be ok
- * again */
- if (size > UDP_MAX_SIZE) {
+ GST_LOG_OBJECT (sink, "error sending %u bytes to client %s: %s", msg_size,
+ gst_udp_address_get_string (msg->address, astr, sizeof (astr)),
+ err->message);
+
+ skip = 1;
+ if (msg_size > UDP_MAX_SIZE) {
+ if (!sent_max_size_warning) {
GST_ELEMENT_WARNING (sink, RESOURCE, WRITE,
- ("Attempting to send a UDP packet larger than maximum size "
- "(%" G_GSIZE_FORMAT " > %d)", size, UDP_MAX_SIZE),
+ ("Attempting to send a UDP packets larger than maximum size "
+ "(%u > %d)", msg_size, UDP_MAX_SIZE),
("Reason: %s", err ? err->message : "unknown reason"));
- } else {
- GST_ELEMENT_WARNING (sink, RESOURCE, WRITE,
- ("Error sending UDP packet"), ("Reason: %s",
- err ? err->message : "unknown reason"));
+ sent_max_size_warning = FALSE;
}
- g_clear_error (&err);
} else {
- num++;
- client->bytes_sent += ret;
- client->packets_sent++;
- sink->bytes_served += ret;
+ GST_ELEMENT_WARNING (sink, RESOURCE, WRITE,
+ ("Error sending UDP packets"), ("client %s, reason: %s",
+ gst_udp_address_get_string (msg->address, astr, sizeof (astr)),
+ (err != NULL) ? err->message : "unknown reason"));
+
+ for (i = err_idx + 1; i < num_messages; ++i, ++skip) {
+ if (messages[i].address != msg->address)
+ break;
+ }
+ GST_DEBUG_OBJECT (sink, "skipping %d message(s) to same client", skip);
}
+
+ /* ignore any errors and try sending the rest */
+ g_clear_error (&err);
+ ret = skip;
}
+
+ g_assert (ret <= num_messages);
+
+ messages += ret;
+ num_messages -= ret;
+ }
+
+ return TRUE;
+}
+
+static GstFlowReturn
+gst_multiudpsink_render_buffers (GstMultiUDPSink * sink, GstBuffer ** buffers,
+ guint num_buffers, guint8 * mem_nums, guint total_mem_num)
+{
+ GstOutputMessage *msgs;
+ gboolean send_duplicates;
+ GstUDPClient **clients;
+ GOutputVector *vecs;
+ GstMapInfo *map_infos;
+ GstFlowReturn flow_ret;
+ guint num_addr_v4, num_addr_v6;
+ guint num_addr, num_msgs;
+ GError *err = NULL;
+ guint i, j, mem;
+ gsize size = 0;
+ GList *l;
+
+ send_duplicates = sink->send_duplicates;
+
+ g_mutex_lock (&sink->client_lock);
+
+ if (send_duplicates) {
+ num_addr_v4 = sink->num_v4_all;
+ num_addr_v6 = sink->num_v6_all;
+ } else {
+ num_addr_v4 = sink->num_v4_unique;
+ num_addr_v6 = sink->num_v6_unique;
+ }
+ num_addr = num_addr_v4 + num_addr_v6;
+
+ if (num_addr == 0)
+ goto no_clients;
+
+ clients = g_newa (GstUDPClient *, num_addr);
+ for (l = sink->clients, i = 0; l != NULL; l = l->next) {
+ GstUDPClient *client = l->data;
+
+ clients[i++] = gst_udp_client_ref (client);
+ for (j = 1; send_duplicates && j < client->add_count; ++j)
+ clients[i++] = gst_udp_client_ref (client);
}
+ g_assert_cmpuint (i, ==, num_addr);
+
g_mutex_unlock (&sink->client_lock);
- /* unmap all memory again */
- for (i = 0; i < n_mem; i++) {
- gst_memory_unmap (map[i].memory, &map[i]);
- gst_memory_unref (map[i].memory);
+ GST_LOG_OBJECT (sink, "%u buffers, %u memories -> to be sent to %u clients",
+ num_buffers, total_mem_num, num_addr);
+
+ /* ensure our pre-allocated scratch space arrays are large enough */
+ if (sink->n_vecs < total_mem_num) {
+ sink->n_vecs = GST_ROUND_UP_16 (total_mem_num);
+ g_free (sink->vecs);
+ sink->vecs = g_new (GOutputVector, sink->n_vecs);
}
+ vecs = sink->vecs;
- GST_LOG_OBJECT (sink, "sent %" G_GSIZE_FORMAT " bytes to %d (of %d) clients",
- size, num, no_clients);
+ if (sink->n_maps < total_mem_num) {
+ sink->n_maps = GST_ROUND_UP_16 (total_mem_num);
+ g_free (sink->maps);
+ sink->maps = g_new (GstMapInfo, sink->n_maps);
+ }
+ map_infos = sink->maps;
- return GST_FLOW_OK;
+ num_msgs = num_addr * num_buffers;
+ if (sink->n_messages < num_msgs) {
+ sink->n_messages = GST_ROUND_UP_16 (num_msgs);
+ g_free (sink->messages);
+ sink->messages = g_new (GstOutputMessage, sink->n_messages);
+ }
+ msgs = sink->messages;
+
+ /* populate first num_buffers messages with output vectors for the buffers */
+ for (i = 0, mem = 0; i < num_buffers; ++i) {
+ size += fill_vectors (&vecs[mem], &map_infos[mem], mem_nums[i], buffers[i]);
+ msgs[i].vectors = &vecs[mem];
+ msgs[i].num_vectors = mem_nums[i];
+ msgs[i].num_control_messages = 0;
+ msgs[i].control_messages = NULL;
+ msgs[i].address = clients[0]->addr;
+ mem += mem_nums[i];
+ }
-no_data:
+ /* FIXME: how about some locking? (there wasn't any before either, but..) */
+ sink->bytes_to_serve += size;
+
+ /* now copy the pre-filled num_buffer messages over to the next num_buffer
+ * messages for the next client, where we also change the target adddress */
+ for (i = 1; i < num_addr; ++i) {
+ for (j = 0; j < num_buffers; ++j) {
+ msgs[i * num_buffers + j] = msgs[j];
+ msgs[i * num_buffers + j].address = clients[i]->addr;
+ }
+ }
+
+ /* now send it! */
{
- return GST_FLOW_OK;
+ gboolean ret;
+
+ /* no IPv4 socket? Send it all from the IPv6 socket then.. */
+ if (sink->used_socket == NULL) {
+ ret = gst_multiudpsink_send_messages (sink, sink->used_socket_v6,
+ msgs, num_msgs);
+ } else {
+ guint num_msgs_v4 = num_buffers * num_addr_v4;
+ guint num_msgs_v6 = num_buffers * num_addr_v6;
+
+ /* our client list is sorted with IPv4 clients first and IPv6 ones last */
+ ret = gst_multiudpsink_send_messages (sink, sink->used_socket,
+ msgs, num_msgs_v4);
+
+ if (!ret)
+ goto cancelled;
+
+ ret = gst_multiudpsink_send_messages (sink, sink->used_socket_v6,
+ msgs + num_msgs_v4, num_msgs_v6);
+ }
+
+ if (!ret)
+ goto cancelled;
+ }
+
+ flow_ret = GST_FLOW_OK;
+
+ /* now update stats */
+ g_mutex_lock (&sink->client_lock);
+
+ for (i = 0; i < num_addr; ++i) {
+ GstUDPClient *client = clients[i];
+
+ for (j = 0; j < num_buffers; ++j) {
+ gsize bytes_sent;
+
+ bytes_sent = msgs[i * num_buffers + j].bytes_sent;
+
+ client->bytes_sent += bytes_sent;
+ client->packets_sent++;
+ sink->bytes_served += bytes_sent;
+ }
+ gst_udp_client_unref (client);
}
-flushing:
+
+ g_mutex_unlock (&sink->client_lock);
+
+out:
+
+ for (i = 0; i < mem; ++i)
+ gst_memory_unmap (map_infos[i].memory, &map_infos[i]);
+
+ return flow_ret;
+
+no_clients:
{
- GST_DEBUG ("we are flushing");
g_mutex_unlock (&sink->client_lock);
+ GST_LOG_OBJECT (sink, "no clients");
+ return GST_FLOW_OK;
+ }
+cancelled:
+ {
+ GST_INFO_OBJECT (sink, "cancelled");
g_clear_error (&err);
+ flow_ret = GST_FLOW_FLUSHING;
+
+ g_mutex_lock (&sink->client_lock);
+ for (i = 0; i < num_addr; ++i)
+ gst_udp_client_unref (clients[i]);
+ g_mutex_unlock (&sink->client_lock);
+ goto out;
+ }
+}
+
+static GstFlowReturn
+gst_multiudpsink_render_list (GstBaseSink * bsink, GstBufferList * buffer_list)
+{
+ GstMultiUDPSink *sink;
+ GstBuffer **buffers;
+ GstFlowReturn flow;
+ guint8 *mem_nums;
+ guint total_mems;
+ guint i, num_buffers;
+
+ sink = GST_MULTIUDPSINK_CAST (bsink);
+
+ num_buffers = gst_buffer_list_length (buffer_list);
+ if (num_buffers == 0)
+ goto no_data;
+
+ buffers = g_newa (GstBuffer *, num_buffers);
+ mem_nums = g_newa (guint8, num_buffers);
+ for (i = 0, total_mems = 0; i < num_buffers; ++i) {
+ buffers[i] = gst_buffer_list_get (buffer_list, i);
+ mem_nums[i] = gst_buffer_n_memory (buffers[i]);
+ total_mems += mem_nums[i];
+ }
- return GST_FLOW_FLUSHING;
+ flow = gst_multiudpsink_render_buffers (sink, buffers, num_buffers,
+ mem_nums, total_mems);
+
+ return flow;
+
+no_data:
+ {
+ GST_LOG_OBJECT (sink, "empty buffer");
+ return GST_FLOW_OK;
}
}
+static GstFlowReturn
+gst_multiudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
+{
+ GstMultiUDPSink *sink;
+ GstFlowReturn flow;
+ guint8 n_mem;
+
+ sink = GST_MULTIUDPSINK_CAST (bsink);
+
+ n_mem = gst_buffer_n_memory (buffer);
+
+ if (n_mem > 0)
+ flow = gst_multiudpsink_render_buffers (sink, &buffer, 1, &n_mem, n_mem);
+ else
+ flow = GST_FLOW_OK;
+
+ return flow;
+}
+
static void
gst_multiudpsink_set_clients_string (GstMultiUDPSink * sink,
const gchar * string)
clients = g_list_next (clients);
- count = client->refcount;
+ count = client->add_count;
while (count--) {
g_string_append_printf (str, "%s:%d%s", client->host, client->port,
(clients || count > 1 ? "," : ""));
case PROP_BUFFER_SIZE:
udpsink->buffer_size = g_value_get_int (value);
break;
+ case PROP_BIND_ADDRESS:
+ g_free (udpsink->bind_address);
+ udpsink->bind_address = g_value_dup_string (value);
+ break;
+ case PROP_BIND_PORT:
+ udpsink->bind_port = g_value_get_int (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case PROP_SOCKET:
g_value_set_object (value, udpsink->socket);
break;
+ case PROP_SOCKET_V6:
+ g_value_set_object (value, udpsink->socket_v6);
+ break;
case PROP_CLOSE_SOCKET:
g_value_set_boolean (value, udpsink->close_socket);
break;
case PROP_USED_SOCKET:
g_value_set_object (value, udpsink->used_socket);
break;
+ case PROP_USED_SOCKET_V6:
+ g_value_set_object (value, udpsink->used_socket_v6);
+ break;
case PROP_CLIENTS:
g_value_take_string (value,
gst_multiudpsink_get_clients_string (udpsink));
case PROP_BUFFER_SIZE:
g_value_set_int (value, udpsink->buffer_size);
break;
+ case PROP_BIND_ADDRESS:
+ g_value_set_string (value, udpsink->bind_address);
+ break;
+ case PROP_BIND_PORT:
+ g_value_set_int (value, udpsink->bind_port);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
if (!sink->used_socket && !sink->used_socket_v6) {
- /* create sender sockets if none available */
+ GSocketAddress *bind_addr;
+ GInetAddress *bind_iaddr;
+
+ if (sink->bind_address) {
+ GSocketFamily family;
+
+ bind_iaddr = g_inet_address_new_from_string (sink->bind_address);
+ if (!bind_iaddr) {
+ GList *results;
+ GResolver *resolver;
+
+ resolver = g_resolver_get_default ();
+ results =
+ g_resolver_lookup_by_name (resolver, sink->bind_address,
+ sink->cancellable, &err);
+ if (!results) {
+ g_object_unref (resolver);
+ goto name_resolve;
+ }
+ bind_iaddr = G_INET_ADDRESS (g_object_ref (results->data));
+ g_resolver_free_addresses (results);
+ g_object_unref (resolver);
+ }
- if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
- G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
- goto no_socket;
+ bind_addr = g_inet_socket_address_new (bind_iaddr, sink->bind_port);
+ g_object_unref (bind_iaddr);
+ family = g_socket_address_get_family (G_SOCKET_ADDRESS (bind_addr));
- if ((sink->used_socket_v6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
- G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
- GST_INFO_OBJECT (sink, "Failed to create IPv6 socket: %s", err->message);
- g_clear_error (&err);
+ if ((sink->used_socket =
+ g_socket_new (family, G_SOCKET_TYPE_DATAGRAM,
+ G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
+ g_object_unref (bind_addr);
+ goto no_socket;
+ }
+
+ g_socket_bind (sink->used_socket, bind_addr, TRUE, &err);
+ if (err != NULL)
+ goto bind_error;
+ } else {
+ /* create sender sockets if none available */
+ if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
+ G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
+ goto no_socket;
+
+ bind_iaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV4);
+ bind_addr = g_inet_socket_address_new (bind_iaddr, sink->bind_port);
+ g_socket_bind (sink->used_socket, bind_addr, TRUE, &err);
+ g_object_unref (bind_addr);
+ g_object_unref (bind_iaddr);
+ if (err != NULL)
+ goto bind_error;
+
+ if ((sink->used_socket_v6 = g_socket_new (G_SOCKET_FAMILY_IPV6,
+ G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP,
+ &err)) == NULL) {
+ GST_INFO_OBJECT (sink, "Failed to create IPv6 socket: %s",
+ err->message);
+ g_clear_error (&err);
+ } else {
+ bind_iaddr = g_inet_address_new_any (G_SOCKET_FAMILY_IPV6);
+ bind_addr = g_inet_socket_address_new (bind_iaddr, sink->bind_port);
+ g_socket_bind (sink->used_socket_v6, bind_addr, TRUE, &err);
+ g_object_unref (bind_addr);
+ g_object_unref (bind_iaddr);
+ if (err != NULL)
+ goto bind_error;
+ }
}
}
#ifdef SO_SNDBUF
}
#endif
+#ifdef SO_BINDTODEVICE
+ if (sink->multi_iface) {
+ if (sink->used_socket) {
+ if (setsockopt (g_socket_get_fd (sink->used_socket), SOL_SOCKET,
+ SO_BINDTODEVICE, sink->multi_iface,
+ strlen (sink->multi_iface)) < 0)
+ GST_WARNING_OBJECT (sink, "setsockopt SO_BINDTODEVICE failed: %s",
+ strerror (errno));
+ }
+ if (sink->used_socket_v6) {
+ if (setsockopt (g_socket_get_fd (sink->used_socket_v6), SOL_SOCKET,
+ SO_BINDTODEVICE, sink->multi_iface,
+ strlen (sink->multi_iface)) < 0)
+ GST_WARNING_OBJECT (sink, "setsockopt SO_BINDTODEVICE failed (v6): %s",
+ strerror (errno));
+ }
+ }
+#endif
+
if (sink->used_socket)
g_socket_set_broadcast (sink->used_socket, TRUE);
if (sink->used_socket_v6)
g_clear_error (&err);
return FALSE;
}
+bind_error:
+ {
+ GST_ELEMENT_ERROR (sink, RESOURCE, FAILED, (NULL),
+ ("Failed to bind socket: %s", err->message));
+ g_clear_error (&err);
+ return FALSE;
+ }
+name_resolve:
+ {
+ GST_ELEMENT_ERROR (sink, RESOURCE, FAILED, (NULL),
+ ("Failed to resolve bind address %s: %s", sink->bind_address,
+ err->message));
+ g_clear_error (&err);
+ return FALSE;
+ }
}
static gboolean
return TRUE;
}
+static gint
+gst_udp_client_compare_socket_family (GstUDPClient * a, GstUDPClient * b)
+{
+ GSocketFamily fa = g_socket_address_get_family (a->addr);
+ GSocketFamily fb = g_socket_address_get_family (b->addr);
+
+ if (fa == fb)
+ return 0;
+
+ /* a should go before b */
+ if (fa == G_SOCKET_FAMILY_IPV4 && fb == G_SOCKET_FAMILY_IPV6)
+ return -1;
+
+ /* b should go before a */
+ return 1;
+}
+
static void
gst_multiudpsink_add_internal (GstMultiUDPSink * sink, const gchar * host,
gint port, gboolean lock)
{
+ GSocketFamily family;
GstUDPClient *client;
GstUDPClient udpclient;
GTimeVal now;
find = g_list_find_custom (sink->clients, &udpclient,
(GCompareFunc) client_compare);
+
+ if (!find) {
+ find = g_list_find_custom (sink->clients_to_be_removed, &udpclient,
+ (GCompareFunc) client_compare);
+ if (find)
+ gst_udp_client_ref (find->data);
+ }
+
if (find) {
client = (GstUDPClient *) find->data;
+ family = g_socket_address_get_family (client->addr);
+
GST_DEBUG_OBJECT (sink, "found %d existing clients with host %s, port %d",
- client->refcount, host, port);
- client->refcount++;
+ client->add_count, host, port);
} else {
- client = create_client (sink, host, port);
+ client = gst_udp_client_new (sink, host, port);
if (!client)
goto error;
+ family = g_socket_address_get_family (client->addr);
+
g_get_current_time (&now);
client->connect_time = GST_TIMEVAL_TO_TIME (now);
gst_multiudpsink_configure_client (sink, client);
GST_DEBUG_OBJECT (sink, "add client with host %s, port %d", host, port);
- sink->clients = g_list_prepend (sink->clients, client);
+
+ /* keep IPv4 clients at the beginning, and IPv6 at the end, we can make
+ * use of this in gst_multiudpsink_render_buffers() */
+ sink->clients = g_list_insert_sorted (sink->clients, client,
+ (GCompareFunc) gst_udp_client_compare_socket_family);
+
+ if (family == G_SOCKET_FAMILY_IPV4)
+ ++sink->num_v4_unique;
+ else
+ ++sink->num_v6_unique;
}
+ ++client->add_count;
+
+ if (family == G_SOCKET_FAMILY_IPV4)
+ ++sink->num_v4_all;
+ else
+ ++sink->num_v6_all;
+
if (lock)
g_mutex_unlock (&sink->client_lock);
void
gst_multiudpsink_remove (GstMultiUDPSink * sink, const gchar * host, gint port)
{
+ GSocketFamily family;
GList *find;
GstUDPClient udpclient;
GstUDPClient *client;
client = (GstUDPClient *) find->data;
GST_DEBUG_OBJECT (sink, "found %d clients with host %s, port %d",
- client->refcount, host, port);
+ client->add_count, host, port);
+
+ --client->add_count;
- client->refcount--;
- if (client->refcount == 0) {
+ family = g_socket_address_get_family (client->addr);
+ if (family == G_SOCKET_FAMILY_IPV4)
+ --sink->num_v4_all;
+ else
+ --sink->num_v6_all;
+
+ if (client->add_count == 0) {
GInetSocketAddress *saddr = G_INET_SOCKET_ADDRESS (client->addr);
GInetAddress *addr = g_inet_socket_address_get_address (saddr);
- GSocketFamily family =
- g_socket_address_get_family (G_SOCKET_ADDRESS (saddr));
GSocket *socket;
/* Select socket to send from for this address */
}
}
+ if (family == G_SOCKET_FAMILY_IPV4)
+ --sink->num_v4_unique;
+ else
+ --sink->num_v6_unique;
+
+ /* Keep state consistent for streaming thread, so remove from client list,
+ * but keep it around until after the signal has been emitted, in case a
+ * callback wants to get stats for that client or so */
+ sink->clients = g_list_delete_link (sink->clients, find);
+
+ sink->clients_to_be_removed =
+ g_list_prepend (sink->clients_to_be_removed, client);
+
/* Unlock to emit signal before we delete the actual client */
g_mutex_unlock (&sink->client_lock);
g_signal_emit (G_OBJECT (sink),
gst_multiudpsink_signals[SIGNAL_CLIENT_REMOVED], 0, host, port);
g_mutex_lock (&sink->client_lock);
- sink->clients = g_list_delete_link (sink->clients, find);
+ sink->clients_to_be_removed =
+ g_list_remove (sink->clients_to_be_removed, client);
- free_client (client);
+ gst_udp_client_unref (client);
}
g_mutex_unlock (&sink->client_lock);
* socket or anything to free for UDP */
if (lock)
g_mutex_lock (&sink->client_lock);
- g_list_foreach (sink->clients, (GFunc) free_client, sink);
+ g_list_foreach (sink->clients, (GFunc) gst_udp_client_unref, sink);
g_list_free (sink->clients);
sink->clients = NULL;
+ sink->num_v4_unique = 0;
+ sink->num_v4_all = 0;
+ sink->num_v6_unique = 0;
+ sink->num_v6_all = 0;
if (lock)
g_mutex_unlock (&sink->client_lock);
}
find = g_list_find_custom (sink->clients, &udpclient,
(GCompareFunc) client_compare);
+
+ if (!find)
+ find = g_list_find_custom (sink->clients_to_be_removed, &udpclient,
+ (GCompareFunc) client_compare);
+
if (!find)
goto not_found;
sink = GST_MULTIUDPSINK (bsink);
- g_cancellable_reset (sink->cancellable);
+ gst_multiudpsink_free_cancellable (sink);
+ gst_multiudpsink_create_cancellable (sink);
return TRUE;
}