mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 05:45:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-stream: Set multicast TTL on the multicast sockets

Browse source 
And not if we do unicast UDP.

https://bugzilla.gnome.org/show_bug.cgi?id=791743
This commit is contained in:
Sebastian Dröge 2017-12-19 11:34:37 +02:00
parent 4d86f99449
commit 4ec17b1975
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst/rtsp-server/rtsp-stream.c
View file

@ -1119,14 +1119,20 @@ set_socket_for_udpsink (GstElement * udpsink, GSocket * socket,
static void static void
set_multicast_socket_for_udpsink (GstElement * udpsink, GSocket * socket, set_multicast_socket_for_udpsink (GstElement * udpsink, GSocket * socket,
GSocketFamily family, const gchar * multicast_iface, GSocketFamily family, const gchar * multicast_iface,
const gchar * addr_str, gint port) const gchar * addr_str, gint port, gint mcast_ttl)
{ {
set_socket_for_udpsink (udpsink, socket, family); set_socket_for_udpsink (udpsink, socket, family);
if (multicast_iface) { if (multicast_iface) {
GST_INFO ("setting multicast-iface %s", multicast_iface);
g_object_set (G_OBJECT (udpsink), "multicast-iface", multicast_iface, NULL); g_object_set (G_OBJECT (udpsink), "multicast-iface", multicast_iface, NULL);
} }
if (mcast_ttl > 0) {
GST_INFO ("setting ttl-mc %d", mcast_ttl);
g_object_set (G_OBJECT (udpsink), "ttl-mc", mcast_ttl, NULL);
}
g_signal_emit_by_name (udpsink, "add", addr_str, port, NULL); g_signal_emit_by_name (udpsink, "add", addr_str, port, NULL);
} }
@ -1165,7 +1171,7 @@ get_port_from_socket (GSocket * socket)
static gboolean static gboolean
create_and_configure_udpsink (GstRTSPStream * stream, GstElement ** udpsink, create_and_configure_udpsink (GstRTSPStream * stream, GstElement ** udpsink,
GSocket * socket_v4, GSocket * socket_v6, gboolean multicast, GSocket * socket_v4, GSocket * socket_v6, gboolean multicast,
gboolean is_rtp) gboolean is_rtp, gint mcast_ttl)
{ {
GstRTSPStreamPrivate *priv = stream->priv; GstRTSPStreamPrivate *priv = stream->priv;
@ -1222,7 +1228,7 @@ create_and_configure_udpsink (GstRTSPStream * stream, GstElement ** udpsink,
goto get_port_failed; goto get_port_failed;
set_multicast_socket_for_udpsink (*udpsink, socket_v4, set_multicast_socket_for_udpsink (*udpsink, socket_v4,
G_SOCKET_FAMILY_IPV4, priv->multicast_iface, G_SOCKET_FAMILY_IPV4, priv->multicast_iface,
priv->mcast_addr_v4->address, port); priv->mcast_addr_v4->address, port, mcast_ttl);
} }
if (priv->mcast_addr_v6) { if (priv->mcast_addr_v6) {
@ -1232,7 +1238,7 @@ create_and_configure_udpsink (GstRTSPStream * stream, GstElement ** udpsink,
goto get_port_failed; goto get_port_failed;
set_multicast_socket_for_udpsink (*udpsink, socket_v6, set_multicast_socket_for_udpsink (*udpsink, socket_v6,
G_SOCKET_FAMILY_IPV6, priv->multicast_iface, G_SOCKET_FAMILY_IPV6, priv->multicast_iface,
priv->mcast_addr_v6->address, port); priv->mcast_addr_v6->address, port, mcast_ttl);
} }
} }
@ -2762,6 +2768,7 @@ create_sender_part (GstRTSPStream * stream, const GstRTSPTransport * transport)
GstPad *pad; GstPad *pad;
GstBin *bin; GstBin *bin;
gboolean is_tcp, is_udp, is_mcast; gboolean is_tcp, is_udp, is_mcast;
gint mcast_ttl = 0;
gint i; gint i;
GST_DEBUG_OBJECT (stream, "create sender part"); GST_DEBUG_OBJECT (stream, "create sender part");
@ -2772,8 +2779,11 @@ create_sender_part (GstRTSPStream * stream, const GstRTSPTransport * transport)
is_udp = transport->lower_transport == GST_RTSP_LOWER_TRANS_UDP; is_udp = transport->lower_transport == GST_RTSP_LOWER_TRANS_UDP;
is_mcast = transport->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST; is_mcast = transport->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST;
GST_DEBUG_OBJECT (stream, "tcp: %d, udp: %d, mcast: %d", is_tcp, is_udp, if (is_mcast)
is_mcast); mcast_ttl = transport->ttl;
GST_DEBUG_OBJECT (stream, "tcp: %d, udp: %d, mcast: %d (ttl: %d)", is_tcp,
is_udp, is_mcast, mcast_ttl);
if (is_udp && !priv->server_addr_v4 && !priv->server_addr_v6) { if (is_udp && !priv->server_addr_v4 && !priv->server_addr_v6) {
GST_WARNING_OBJECT (stream, "no sockets assigned for UDP"); GST_WARNING_OBJECT (stream, "no sockets assigned for UDP");
@ -2829,12 +2839,13 @@ create_sender_part (GstRTSPStream * stream, const GstRTSPTransport * transport)
if (is_udp && !priv->udpsink[i]) { if (is_udp && !priv->udpsink[i]) {
/* we create only one pair of udpsinks for IPv4 and IPv6 */ /* we create only one pair of udpsinks for IPv4 and IPv6 */
create_and_configure_udpsink (stream, &priv->udpsink[i], create_and_configure_udpsink (stream, &priv->udpsink[i],
priv->socket_v4[i], priv->socket_v6[i], FALSE, (i == 0)); priv->socket_v4[i], priv->socket_v6[i], FALSE, (i == 0), mcast_ttl);
plug_sink (stream, transport, i); plug_sink (stream, transport, i);
} else if (is_mcast && !priv->mcast_udpsink[i]) { } else if (is_mcast && !priv->mcast_udpsink[i]) {
/* we create only one pair of mcast-udpsinks for IPv4 and IPv6 */ /* we create only one pair of mcast-udpsinks for IPv4 and IPv6 */
create_and_configure_udpsink (stream, &priv->mcast_udpsink[i], create_and_configure_udpsink (stream, &priv->mcast_udpsink[i],
priv->mcast_socket_v4[i], priv->mcast_socket_v6[i], TRUE, (i == 0)); priv->mcast_socket_v4[i], priv->mcast_socket_v6[i], TRUE, (i == 0),
mcast_ttl);
plug_sink (stream, transport, i); plug_sink (stream, transport, i);
} else if (is_tcp && !priv->appsink[i]) { } else if (is_tcp && !priv->appsink[i]) {
/* make appsink */ /* make appsink */
@ -3695,6 +3706,14 @@ update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
if (!check_mcast_part_for_transport (stream, tr)) if (!check_mcast_part_for_transport (stream, tr))
goto mcast_error; goto mcast_error;
priv->transports = g_list_prepend (priv->transports, trans); priv->transports = g_list_prepend (priv->transports, trans);
if (tr->ttl > 0) {
GST_INFO ("setting ttl-mc %d", tr->ttl);
if (priv->udpsink[0])
g_object_set (G_OBJECT (priv->udpsink[0]), "ttl-mc", tr->ttl, NULL);
if (priv->udpsink[1])
g_object_set (G_OBJECT (priv->udpsink[1]), "ttl-mc", tr->ttl, NULL);
}
} else { } else {
priv->transports = g_list_remove (priv->transports, trans); priv->transports = g_list_remove (priv->transports, trans);
} }
@ -3704,13 +3723,11 @@ update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
{ {
gchar *dest; gchar *dest;
gint min, max; gint min, max;
guint ttl = 0;
dest = tr->destination; dest = tr->destination;
if (tr->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) { if (tr->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
min = tr->port.min; min = tr->port.min;
max = tr->port.max; max = tr->port.max;
ttl = tr->ttl;
} else if (priv->client_side) { } else if (priv->client_side) {
/* In client side mode the 'destination' is the RTSP server, so send /* In client side mode the 'destination' is the RTSP server, so send
* to those ports */ * to those ports */
@ -3722,12 +3739,6 @@ update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
} }
if (add) { if (add) {
if (ttl > 0) {
GST_INFO ("setting ttl-mc %d", ttl);
if (priv->udpsink[0])
g_object_set (G_OBJECT (priv->udpsink[0]), "ttl-mc", ttl, NULL);
g_object_set (G_OBJECT (priv->udpsink[1]), "ttl-mc", ttl, NULL);
}
GST_INFO ("adding %s:%d-%d", dest, min, max); GST_INFO ("adding %s:%d-%d", dest, min, max);
if (priv->udpsink[0]) if (priv->udpsink[0])
g_signal_emit_by_name (priv->udpsink[0], "add", dest, min, NULL); g_signal_emit_by_name (priv->udpsink[0], "add", dest, min, NULL);