mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: configure multicast correctly

Browse source 
Take the transport destination for multicast.
Disable loop and autojoin for multicast on the udpsinks.
This commit is contained in:
Wim Taymans 2010-03-05 13:49:31 +01:00
parent 83a0c73dc0
commit 66709a7a68
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/rtsp/gstrtspsrc.c
View file

@ -2398,16 +2398,19 @@ gst_rtspsrc_stream_configure_udp_sinks (GstRTSPSrc * src,
if (transport->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) { if (transport->lower_transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
rtp_port = transport->port.min; rtp_port = transport->port.min;
rtcp_port = transport->port.max; rtcp_port = transport->port.max;
/* multicast destination */
destination = transport->destination;
} else { } else {
rtp_port = transport->server_port.min; rtp_port = transport->server_port.min;
rtcp_port = transport->server_port.max; rtcp_port = transport->server_port.max;
/* first take the source, then the endpoint to figure out where to send
* the RTCP. */
destination = transport->source;
if (destination == NULL)
destination = gst_rtsp_connection_get_ip (src->connection);
} }
/* first take the source, then the endpoint to figure out where to send
* the RTCP. */
destination = transport->source;
if (destination == NULL) if (destination == NULL)
destination = gst_rtsp_connection_get_ip (src->connection); goto no_destination;
/* try to construct the fakesrc to the RTP port of the server to open up any /* try to construct the fakesrc to the RTP port of the server to open up any
* NAT firewalls */ * NAT firewalls */
@ -2421,6 +2424,8 @@ gst_rtspsrc_stream_configure_udp_sinks (GstRTSPSrc * src,
if (stream->udpsink[0] == NULL) if (stream->udpsink[0] == NULL)
goto no_sink_element; goto no_sink_element;
g_object_set (G_OBJECT (stream->udpsink[0]), "auto-multicast", FALSE, NULL);
g_object_set (G_OBJECT (stream->udpsink[0]), "loop", FALSE, NULL);
/* no sync or async state changes needed */ /* no sync or async state changes needed */
g_object_set (G_OBJECT (stream->udpsink[0]), "sync", FALSE, "async", FALSE, g_object_set (G_OBJECT (stream->udpsink[0]), "sync", FALSE, "async", FALSE,
NULL); NULL);
@ -2473,6 +2478,8 @@ gst_rtspsrc_stream_configure_udp_sinks (GstRTSPSrc * src,
if (stream->udpsink[1] == NULL) if (stream->udpsink[1] == NULL)
goto no_sink_element; goto no_sink_element;
g_object_set (G_OBJECT (stream->udpsink[1]), "auto-multicast", FALSE, NULL);
g_object_set (G_OBJECT (stream->udpsink[1]), "loop", FALSE, NULL);
/* no sync needed */ /* no sync needed */
g_object_set (G_OBJECT (stream->udpsink[1]), "sync", FALSE, NULL); g_object_set (G_OBJECT (stream->udpsink[1]), "sync", FALSE, NULL);
/* no async state changes needed */ /* no async state changes needed */
@ -2517,6 +2524,11 @@ gst_rtspsrc_stream_configure_udp_sinks (GstRTSPSrc * src,
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
no_destination:
{
GST_DEBUG_OBJECT (src, "no destination address specified");
return FALSE;
}
no_sink_element: no_sink_element:
{ {
GST_DEBUG_OBJECT (src, "no UDP sink element found"); GST_DEBUG_OBJECT (src, "no UDP sink element found");