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

rtsp-server: Fix indentation

Browse source
This commit is contained in:
Sebastian Dröge 2016-03-02 11:48:49 +02:00
parent bcee3202d3
commit 406ed190ac
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/rtsp-server/rtsp-client.c
View file

@ -1419,7 +1419,8 @@ default_configure_client_transport (GstRTSPClient * client,
family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4; family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4;
if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct, FALSE)) if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct,
FALSE))
goto no_udp_protocol; goto no_udp_protocol;
gst_rtsp_stream_get_server_port (ctx->stream, &ct->port, family); gst_rtsp_stream_get_server_port (ctx->stream, &ct->port, family);
@ -1478,7 +1479,8 @@ default_configure_client_transport (GstRTSPClient * client,
} else if (ct->lower_transport & GST_RTSP_LOWER_TRANS_UDP) { } else if (ct->lower_transport & GST_RTSP_LOWER_TRANS_UDP) {
GSocketFamily family; GSocketFamily family;
family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4; family = priv->is_ipv6 ? G_SOCKET_FAMILY_IPV6 : G_SOCKET_FAMILY_IPV4;
if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct, FALSE)) if (!gst_rtsp_stream_allocate_udp_sockets (ctx->stream, family, ct,
FALSE))
goto no_udp_protocol; goto no_udp_protocol;
} }
} }

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

@ -1185,7 +1185,7 @@ error:
static gboolean static gboolean
alloc_ports_one_family (GstRTSPStream * stream, GSocketFamily family, alloc_ports_one_family (GstRTSPStream * stream, GSocketFamily family,
GstElement * udpsrc_out[2], GstRTSPRange * server_port_out, GstElement * udpsrc_out[2], GstRTSPRange * server_port_out,
GstRTSPTransport *ct, GstRTSPAddress ** server_addr_out, GstRTSPTransport * ct, GstRTSPAddress ** server_addr_out,
gboolean use_client_settings) gboolean use_client_settings)
{ {
GstRTSPStreamPrivate *priv = stream->priv; GstRTSPStreamPrivate *priv = stream->priv;
@ -1200,7 +1200,7 @@ alloc_ports_one_family (GstRTSPStream * stream, GSocketFamily family,
gchar *addr_str; gchar *addr_str;
GSocketAddress *rtp_sockaddr = NULL; GSocketAddress *rtp_sockaddr = NULL;
GSocketAddress *rtcp_sockaddr = NULL; GSocketAddress *rtcp_sockaddr = NULL;
GstRTSPAddressPool * pool; GstRTSPAddressPool *pool;
GstRTSPLowerTrans transport; GstRTSPLowerTrans transport;
pool = priv->pool; pool = priv->pool;
@ -1248,7 +1248,8 @@ again:
else else
flags |= GST_RTSP_ADDRESS_FLAG_IPV4; flags |= GST_RTSP_ADDRESS_FLAG_IPV4;
if (ct->destination && transport == GST_RTSP_LOWER_TRANS_UDP_MCAST && use_client_settings) if (ct->destination && transport == GST_RTSP_LOWER_TRANS_UDP_MCAST
&& use_client_settings)
gst_rtsp_address_pool_reserve_address (pool, ct->destination, gst_rtsp_address_pool_reserve_address (pool, ct->destination,
ct->port.min, 2, ct->ttl, &addr); ct->port.min, 2, ct->ttl, &addr);
else else
@ -1324,7 +1325,7 @@ again:
g_clear_object (&inetaddr); g_clear_object (&inetaddr);
if (!create_and_configure_udpsources_one_family (udpsrc_out, rtp_socket, if (!create_and_configure_udpsources_one_family (udpsrc_out, rtp_socket,
rtcp_socket, family, addr_str, tmp_rtp, tmp_rtcp, transport)) { rtcp_socket, family, addr_str, tmp_rtp, tmp_rtcp, transport)) {
if (addr == NULL) if (addr == NULL)
g_free (addr_str); g_free (addr_str);
goto no_udp_protocol; goto no_udp_protocol;
@ -1401,7 +1402,7 @@ cleanup:
*/ */
gboolean gboolean
gst_rtsp_stream_allocate_udp_sockets (GstRTSPStream * stream, gst_rtsp_stream_allocate_udp_sockets (GstRTSPStream * stream,
GSocketFamily family, GstRTSPTransport *ct, gboolean use_client_settings) GSocketFamily family, GstRTSPTransport * ct, gboolean use_client_settings)
{ {
GstRTSPStreamPrivate *priv; GstRTSPStreamPrivate *priv;
gboolean result = FALSE; gboolean result = FALSE;
@ -1418,32 +1419,36 @@ gst_rtsp_stream_allocate_udp_sockets (GstRTSPStream * stream,
if (priv->have_ipv4_mcast) if (priv->have_ipv4_mcast)
goto done; goto done;
priv->have_ipv4_mcast = priv->have_ipv4_mcast =
alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4, priv->udpsrc_mcast_v4, alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4,
&priv->server_port_v4, ct, &priv->addr_v4, use_client_settings); priv->udpsrc_mcast_v4, &priv->server_port_v4, ct, &priv->addr_v4,
use_client_settings);
} else { } else {
priv->have_ipv4 = priv->have_ipv4 =
alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4, priv->udpsrc_v4, alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4, priv->udpsrc_v4,
&priv->server_port_v4, ct, &priv->server_addr_v4, use_client_settings); &priv->server_port_v4, ct, &priv->server_addr_v4,
use_client_settings);
} }
} else { } else {
if (transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) { if (transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
if (priv->have_ipv6_mcast) if (priv->have_ipv6_mcast)
goto done; goto done;
priv->have_ipv6_mcast = priv->have_ipv6_mcast =
alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6, priv->udpsrc_mcast_v6, alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6,
&priv->server_port_v6, ct, &priv->addr_v6, use_client_settings); priv->udpsrc_mcast_v6, &priv->server_port_v6, ct, &priv->addr_v6,
use_client_settings);
} else { } else {
if (priv->have_ipv6) if (priv->have_ipv6)
goto done; goto done;
priv->have_ipv6 = priv->have_ipv6 =
alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6, priv->udpsrc_v6, alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6, priv->udpsrc_v6,
&priv->server_port_v6, ct, &priv->server_addr_v6, use_client_settings); &priv->server_port_v6, ct, &priv->server_addr_v6,
use_client_settings);
} }
} }
done: done:
result = priv->have_ipv4 || priv->have_ipv4_mcast || priv->have_ipv6 || result = priv->have_ipv4 || priv->have_ipv4_mcast || priv->have_ipv6 ||
priv->have_ipv6_mcast; priv->have_ipv6_mcast;
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
@ -2272,8 +2277,7 @@ on_npt_stop (GstElement * rtpbin, guint session, guint ssrc,
/* must be called with lock */ /* must be called with lock */
static gboolean static gboolean
create_sender_part (GstRTSPStream * stream, GstBin * bin, create_sender_part (GstRTSPStream * stream, GstBin * bin, GstState state)
GstState state)
{ {
GstRTSPStreamPrivate *priv; GstRTSPStreamPrivate *priv;
GstPad *pad, *sinkpad = NULL; GstPad *pad, *sinkpad = NULL;
@ -2422,8 +2426,7 @@ no_udp_protocol:
/* must be called with lock */ /* must be called with lock */
static void static void
create_receiver_part (GstRTSPStream * stream, GstBin * bin, create_receiver_part (GstRTSPStream * stream, GstBin * bin, GstState state)
GstState state)
{ {
GstRTSPStreamPrivate *priv; GstRTSPStreamPrivate *priv;
GstPad *pad, *selpad; GstPad *pad, *selpad;