mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 15:18:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-stream: Update transport for multicast clients as well

Browse source 
If a multicast client requests different transport settings
than the existing one make sure that this new transport
configuruation is propagated to the multicast udp sink.

https://bugzilla.gnome.org/show_bug.cgi?id=793441
This commit is contained in:
Patricia Muscalu 2018-02-14 10:41:02 +01:00 committed by Sebastian Dröge
parent 1a38de2b17
commit dcb4533fed
1 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3800,6 +3800,28 @@ gst_rtsp_stream_recv_rtcp (GstRTSPStream * stream, GstBuffer * buffer)
return ret; return ret;
} }
/* must be called with lock */
static inline void
add_client (GstElement * rtp_sink, GstElement * rtcp_sink, const gchar * host,
gint rtp_port, gint rtcp_port)
{
if (rtp_sink != NULL)
g_signal_emit_by_name (rtp_sink, "add", host, rtp_port, NULL);
if (rtcp_sink != NULL)
g_signal_emit_by_name (rtcp_sink, "add", host, rtcp_port, NULL);
}
/* must be called with lock */
static void
remove_client (GstElement * rtp_sink, GstElement * rtcp_sink,
const gchar * host, gint rtp_port, gint rtcp_port)
{
if (rtp_sink != NULL)
g_signal_emit_by_name (rtp_sink, "remove", host, rtp_port, NULL);
if (rtcp_sink != NULL)
g_signal_emit_by_name (rtcp_sink, "remove", host, rtcp_port, NULL);
}
/* must be called with lock */ /* must be called with lock */
static gboolean static gboolean
update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans, update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
@ -3807,17 +3829,24 @@ update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
{ {
GstRTSPStreamPrivate *priv = stream->priv; GstRTSPStreamPrivate *priv = stream->priv;
const GstRTSPTransport *tr; const GstRTSPTransport *tr;
gchar *dest;
gint min, max;
tr = gst_rtsp_stream_transport_get_transport (trans); tr = gst_rtsp_stream_transport_get_transport (trans);
dest = tr->destination;
switch (tr->lower_transport) { switch (tr->lower_transport) {
case GST_RTSP_LOWER_TRANS_UDP_MCAST: case GST_RTSP_LOWER_TRANS_UDP_MCAST:
{ {
min = tr->port.min;
max = tr->port.max;
if (add) { if (add) {
GST_INFO ("adding %s:%d-%d", dest, min, max);
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);
/* FIXME: Is it ok to set ttl-mc if media is shared? */
if (tr->ttl > 0) { if (tr->ttl > 0) {
GST_INFO ("setting ttl-mc %d", tr->ttl); GST_INFO ("setting ttl-mc %d", tr->ttl);
if (priv->mcast_udpsink[0]) if (priv->mcast_udpsink[0])
@ -3827,21 +3856,20 @@ update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
g_object_set (G_OBJECT (priv->mcast_udpsink[1]), "ttl-mc", tr->ttl, g_object_set (G_OBJECT (priv->mcast_udpsink[1]), "ttl-mc", tr->ttl,
NULL); NULL);
} }
add_client (priv->mcast_udpsink[0], priv->mcast_udpsink[1], dest, min,
max);
priv->transports = g_list_prepend (priv->transports, trans);
} else { } else {
GST_INFO ("removing %s:%d-%d", dest, min, max);
remove_client (priv->mcast_udpsink[0], priv->mcast_udpsink[1], dest,
min, max);
priv->transports = g_list_remove (priv->transports, trans); priv->transports = g_list_remove (priv->transports, trans);
} }
break; break;
} }
case GST_RTSP_LOWER_TRANS_UDP: case GST_RTSP_LOWER_TRANS_UDP:
{ {
gchar *dest; if (priv->client_side) {
gint min, max;
dest = tr->destination;
if (tr->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
min = tr->port.min;
max = tr->port.max;
} 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 */
min = tr->server_port.min; min = tr->server_port.min;
@ -3853,15 +3881,11 @@ update_transport (GstRTSPStream * stream, GstRTSPStreamTransport * trans,
if (add) { if (add) {
GST_INFO ("adding %s:%d-%d", dest, min, max); GST_INFO ("adding %s:%d-%d", dest, min, max);
if (priv->udpsink[0]) add_client (priv->udpsink[0], priv->udpsink[1], dest, min, max);
g_signal_emit_by_name (priv->udpsink[0], "add", dest, min, NULL);
g_signal_emit_by_name (priv->udpsink[1], "add", dest, max, NULL);
priv->transports = g_list_prepend (priv->transports, trans); priv->transports = g_list_prepend (priv->transports, trans);
} else { } else {
GST_INFO ("removing %s:%d-%d", dest, min, max); GST_INFO ("removing %s:%d-%d", dest, min, max);
if (priv->udpsink[0]) remove_client (priv->udpsink[0], priv->udpsink[1], dest, min, max);
g_signal_emit_by_name (priv->udpsink[0], "remove", dest, min, NULL);
g_signal_emit_by_name (priv->udpsink[1], "remove", dest, max, NULL);
priv->transports = g_list_remove (priv->transports, trans); priv->transports = g_list_remove (priv->transports, trans);
} }
priv->transports_cookie++; priv->transports_cookie++;