summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-03-02 11:48:49 +0200
committerSebastian Dröge <sebastian@centricular.com>2016-03-02 11:48:49 +0200
commit406ed190acdba2007f42cc12d30ce4029cd1c3d1 (patch)
treea4686791aa8d551ee6e0a11bb2d5827b7b588054
parentbcee3202d3a6c8749d9a0c7158096d7009f8e337 (diff)
rtsp-server: Fix indentation
-rw-r--r--gst/rtsp-server/rtsp-client.c6
-rw-r--r--gst/rtsp-server/rtsp-stream.c39
2 files changed, 25 insertions, 20 deletions
diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index b27f52b..7258d77 100644
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -1419,7 +1419,8 @@ default_configure_client_transport (GstRTSPClient * client,
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;
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) {
GSocketFamily family;
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;
}
}
diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c
index 8cbedc3..70abb99 100644
--- a/gst/rtsp-server/rtsp-stream.c
+++ b/gst/rtsp-server/rtsp-stream.c
@@ -1185,7 +1185,7 @@ error:
static gboolean
alloc_ports_one_family (GstRTSPStream * stream, GSocketFamily family,
GstElement * udpsrc_out[2], GstRTSPRange * server_port_out,
- GstRTSPTransport *ct, GstRTSPAddress ** server_addr_out,
+ GstRTSPTransport * ct, GstRTSPAddress ** server_addr_out,
gboolean use_client_settings)
{
GstRTSPStreamPrivate *priv = stream->priv;
@@ -1200,7 +1200,7 @@ alloc_ports_one_family (GstRTSPStream * stream, GSocketFamily family,
gchar *addr_str;
GSocketAddress *rtp_sockaddr = NULL;
GSocketAddress *rtcp_sockaddr = NULL;
- GstRTSPAddressPool * pool;
+ GstRTSPAddressPool *pool;
GstRTSPLowerTrans transport;
pool = priv->pool;
@@ -1248,7 +1248,8 @@ again:
else
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,
ct->port.min, 2, ct->ttl, &addr);
else
@@ -1324,7 +1325,7 @@ again:
g_clear_object (&inetaddr);
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)
g_free (addr_str);
goto no_udp_protocol;
@@ -1401,7 +1402,7 @@ cleanup:
*/
gboolean
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;
gboolean result = FALSE;
@@ -1418,32 +1419,36 @@ gst_rtsp_stream_allocate_udp_sockets (GstRTSPStream * stream,
if (priv->have_ipv4_mcast)
goto done;
priv->have_ipv4_mcast =
- alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4, priv->udpsrc_mcast_v4,
- &priv->server_port_v4, ct, &priv->addr_v4, use_client_settings);
+ alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4,
+ priv->udpsrc_mcast_v4, &priv->server_port_v4, ct, &priv->addr_v4,
+ use_client_settings);
} else {
priv->have_ipv4 =
- alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4, priv->udpsrc_v4,
- &priv->server_port_v4, ct, &priv->server_addr_v4, use_client_settings);
+ alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV4, priv->udpsrc_v4,
+ &priv->server_port_v4, ct, &priv->server_addr_v4,
+ use_client_settings);
}
} else {
if (transport == GST_RTSP_LOWER_TRANS_UDP_MCAST) {
if (priv->have_ipv6_mcast)
goto done;
priv->have_ipv6_mcast =
- alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6, priv->udpsrc_mcast_v6,
- &priv->server_port_v6, ct, &priv->addr_v6, use_client_settings);
+ alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6,
+ priv->udpsrc_mcast_v6, &priv->server_port_v6, ct, &priv->addr_v6,
+ use_client_settings);
} else {
if (priv->have_ipv6)
goto done;
priv->have_ipv6 =
- alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6, priv->udpsrc_v6,
- &priv->server_port_v6, ct, &priv->server_addr_v6, use_client_settings);
+ alloc_ports_one_family (stream, G_SOCKET_FAMILY_IPV6, priv->udpsrc_v6,
+ &priv->server_port_v6, ct, &priv->server_addr_v6,
+ use_client_settings);
}
}
done:
result = priv->have_ipv4 || priv->have_ipv4_mcast || priv->have_ipv6 ||
- priv->have_ipv6_mcast;
+ priv->have_ipv6_mcast;
g_mutex_unlock (&priv->lock);
@@ -2272,8 +2277,7 @@ on_npt_stop (GstElement * rtpbin, guint session, guint ssrc,
/* must be called with lock */
static gboolean
-create_sender_part (GstRTSPStream * stream, GstBin * bin,
- GstState state)
+create_sender_part (GstRTSPStream * stream, GstBin * bin, GstState state)
{
GstRTSPStreamPrivate *priv;
GstPad *pad, *sinkpad = NULL;
@@ -2422,8 +2426,7 @@ no_udp_protocol:
/* must be called with lock */
static void
-create_receiver_part (GstRTSPStream * stream, GstBin * bin,
- GstState state)
+create_receiver_part (GstRTSPStream * stream, GstBin * bin, GstState state)
{
GstRTSPStreamPrivate *priv;
GstPad *pad, *selpad;