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

srt: Reduce useless call depth

Browse source 
Providing simplified _client_connect() is not required for now.

https://bugzilla.gnome.org/show_bug.cgi?id=796842
This commit is contained in:
Seungha Yang 2018-07-20 14:05:32 +09:00 committed by Olivier Crête
parent aafdfdb5e4
commit 85d04e9335
4 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/srt/gstsrt.c
View file

@ -33,7 +33,7 @@
GST_DEBUG_CATEGORY (GST_CAT_DEFAULT); GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
SRTSOCKET SRTSOCKET
gst_srt_client_connect_full (GstElement * elem, int sender, gst_srt_client_connect (GstElement * elem, int sender,
const gchar * host, guint16 port, int rendez_vous, const gchar * host, guint16 port, int rendez_vous,
const gchar * bind_address, guint16 bind_port, int latency, const gchar * bind_address, guint16 bind_port, int latency,
GSocketAddress ** socket_address, gint * poll_id, gchar * passphrase, GSocketAddress ** socket_address, gint * poll_id, gchar * passphrase,
@ -165,17 +165,6 @@ failed:
return SRT_INVALID_SOCK; return SRT_INVALID_SOCK;
} }
SRTSOCKET
gst_srt_client_connect (GstElement * elem, int sender,
const gchar * host, guint16 port, int rendez_vous,
const gchar * bind_address, guint16 bind_port, int latency,
GSocketAddress ** socket_address, gint * poll_id)
{
return gst_srt_client_connect_full (elem, sender, host, port,
rendez_vous, bind_address, bind_port, latency, socket_address, poll_id,
NULL, 0);
}
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {

6
ext/srt/gstsrt.h
View file

@ -38,12 +38,6 @@ G_BEGIN_DECLS
SRTSOCKET SRTSOCKET
gst_srt_client_connect (GstElement * elem, int sender, gst_srt_client_connect (GstElement * elem, int sender,
const gchar * host, guint16 port, int rendez_vous,
const gchar * bind_address, guint16 bind_port, int latency,
GSocketAddress ** socket_address, gint * poll_id);
SRTSOCKET
gst_srt_client_connect_full (GstElement * elem, int sender,
const gchar * host, guint16 port, int rendez_vous, const gchar * host, guint16 port, int rendez_vous,
const gchar * bind_address, guint16 bind_port, int latency, const gchar * bind_address, guint16 bind_port, int latency,
GSocketAddress ** socket_address, gint * poll_id, GSocketAddress ** socket_address, gint * poll_id,

2
ext/srt/gstsrtclientsink.c
View file

@ -159,7 +159,7 @@ gst_srt_client_sink_start (GstBaseSink * sink)
GstSRTBaseSink *base = GST_SRT_BASE_SINK (sink); GstSRTBaseSink *base = GST_SRT_BASE_SINK (sink);
GstUri *uri = gst_uri_ref (GST_SRT_BASE_SINK (self)->uri); GstUri *uri = gst_uri_ref (GST_SRT_BASE_SINK (self)->uri);
priv->sock = gst_srt_client_connect_full (GST_ELEMENT (sink), FALSE, priv->sock = gst_srt_client_connect (GST_ELEMENT (sink), FALSE,
gst_uri_get_host (uri), gst_uri_get_port (uri), priv->rendez_vous, gst_uri_get_host (uri), gst_uri_get_port (uri), priv->rendez_vous,
priv->bind_address, priv->bind_port, base->latency, priv->bind_address, priv->bind_port, base->latency,
&priv->sockaddr, &priv->poll_id, base->passphrase, base->key_length); &priv->sockaddr, &priv->poll_id, base->passphrase, base->key_length);

2
ext/srt/gstsrtclientsrc.c
View file

@ -238,7 +238,7 @@ gst_srt_client_src_start (GstBaseSrc * src)
GstUri *uri = gst_uri_ref (base->uri); GstUri *uri = gst_uri_ref (base->uri);
GSocketAddress *socket_address = NULL; GSocketAddress *socket_address = NULL;
priv->sock = gst_srt_client_connect_full (GST_ELEMENT (src), FALSE, priv->sock = gst_srt_client_connect (GST_ELEMENT (src), FALSE,
gst_uri_get_host (uri), gst_uri_get_port (uri), priv->rendez_vous, gst_uri_get_host (uri), gst_uri_get_port (uri), priv->rendez_vous,
priv->bind_address, priv->bind_port, base->latency, priv->bind_address, priv->bind_port, base->latency,
&socket_address, &priv->poll_id, base->passphrase, base->key_length); &socket_address, &priv->poll_id, base->passphrase, base->key_length);