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

rtpsink: set properties on children early

Browse source 
The properties on the udpsink/udpsrc elements need to be set before
there is any state change. If not, in a network without default gateway,
udpsink tries to bind an a NULL interface and fails.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1398>
This commit is contained in:
Marc Leeman 2021-11-30 10:24:37 +01:00
parent d10ad61891
commit f699c08af9
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
subprojects/gst-plugins-bad/gst/rtp/gstrtpsink.c
View file

@ -444,9 +444,30 @@ gst_rtp_sink_rtpbin_pad_removed_cb (GstElement * element, GstPad * pad,
} }
static gboolean static gboolean
gst_rtp_sink_start (GstRtpSink * self) gst_rtp_sink_reuse_socket (GstRtpSink * self)
{ {
GSocket *socket = NULL; GSocket *socket = NULL;
gst_element_set_locked_state (self->rtcp_src, FALSE);
gst_element_sync_state_with_parent (self->rtcp_src);
/* share the socket created by the sink */
g_object_get (self->rtcp_src, "used-socket", &socket, NULL);
g_object_set (self->rtcp_sink, "socket", socket, "auto-multicast", FALSE,
"close-socket", FALSE, NULL);
g_object_unref (socket);
g_object_set (self->rtcp_sink, "sync", FALSE, "async", FALSE, NULL);
gst_element_set_locked_state (self->rtcp_sink, FALSE);
gst_element_sync_state_with_parent (self->rtcp_sink);
return TRUE;
}
static gboolean
gst_rtp_sink_start (GstRtpSink * self)
{
GInetAddress *iaddr = NULL; GInetAddress *iaddr = NULL;
gchar *remote_addr = NULL; gchar *remote_addr = NULL;
GError *error = NULL; GError *error = NULL;
@ -497,19 +518,6 @@ gst_rtp_sink_start (GstRtpSink * self)
g_free (remote_addr); g_free (remote_addr);
g_object_unref (iaddr); g_object_unref (iaddr);
gst_element_set_locked_state (self->rtcp_src, FALSE);
gst_element_sync_state_with_parent (self->rtcp_src);
/* share the socket created by the sink */
g_object_get (self->rtcp_src, "used-socket", &socket, NULL);
g_object_set (self->rtcp_sink, "socket", socket, "auto-multicast", FALSE,
"close-socket", FALSE, NULL);
g_object_unref (socket);
g_object_set (self->rtcp_sink, "sync", FALSE, "async", FALSE, NULL);
gst_element_set_locked_state (self->rtcp_sink, FALSE);
gst_element_sync_state_with_parent (self->rtcp_sink);
return TRUE; return TRUE;
dns_resolve_failed: dns_resolve_failed:
@ -532,6 +540,10 @@ gst_rtp_sink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
/* Set the properties to the child elements to avoid binding to
* a NULL interface on a network without a default gateway */
if (gst_rtp_sink_start (self) == FALSE)
return GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
break; break;
@ -545,7 +557,8 @@ gst_rtp_sink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (gst_rtp_sink_start (self) == FALSE) /* re-use the sockets after they have been initialised */
if (gst_rtp_sink_reuse_socket (self) == FALSE)
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED: