mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiudpsink: don't error on send errors but only warn

Browse source 
Don't error on send errors but simply post a warning, it's possible
that the next packet will be fine.
This commit is contained in:
Wim Taymans 2012-10-10 11:32:17 +02:00
parent 6c169312d1
commit 54f049c355
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gst/udp/gstmultiudpsink.c
View file

@ -498,11 +498,6 @@ gst_multiudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
g_mutex_lock (&sink->client_lock); g_mutex_lock (&sink->client_lock);
GST_LOG_OBJECT (bsink, "about to send %" G_GSIZE_FORMAT " bytes", size); GST_LOG_OBJECT (bsink, "about to send %" G_GSIZE_FORMAT " bytes", size);
if (size > UDP_MAX_SIZE) {
GST_WARNING_OBJECT (bsink, "Attempting to send a UDP packet larger than "
"maximum size (%" G_GSIZE_FORMAT " > %d)", size, UDP_MAX_SIZE);
}
no_clients = 0; no_clients = 0;
num = 0; num = 0;
for (clients = sink->clients; clients; clients = g_list_next (clients)) { for (clients = sink->clients; clients; clients = g_list_next (clients)) {
@ -523,13 +518,29 @@ gst_multiudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
g_socket_send_message (sink->used_socket, client->addr, vec, n_mem, g_socket_send_message (sink->used_socket, client->addr, vec, n_mem,
NULL, 0, 0, sink->cancellable, &err); NULL, 0, 0, sink->cancellable, &err);
if (ret < 0) if (G_UNLIKELY (ret < 0)) {
goto send_error; if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
goto flushing;
num++; /* we continue after posting a warning, next packets might be ok
client->bytes_sent += ret; * again */
client->packets_sent++; if (size > UDP_MAX_SIZE) {
sink->bytes_served += ret; GST_ELEMENT_WARNING (sink, RESOURCE, WRITE,
("Attempting to send a UDP packet larger than maximum size "
"(%" G_GSIZE_FORMAT " > %d)", 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"));
}
g_clear_error (&err);
} else {
num++;
client->bytes_sent += ret;
client->packets_sent++;
sink->bytes_served += ret;
}
} }
} }
g_mutex_unlock (&sink->client_lock); g_mutex_unlock (&sink->client_lock);
@ -552,23 +563,13 @@ no_data:
{ {
return GST_FLOW_OK; return GST_FLOW_OK;
} }
send_error: flushing:
{ {
GstFlowReturn res; GST_DEBUG ("we are flushing");
g_mutex_unlock (&sink->client_lock); g_mutex_unlock (&sink->client_lock);
GST_DEBUG ("got send error %s", err->message);
if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
res = GST_FLOW_FLUSHING;
else {
res = GST_FLOW_ERROR;
GST_ELEMENT_ERROR (sink, RESOURCE, SETTINGS, (NULL),
("Error sending UDP packet: %s",
err ? err->message : "unknown reason"));
}
g_clear_error (&err); g_clear_error (&err);
return res;
return GST_FLOW_FLUSHING;
} }
} }