Commit d59558af authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

rtspurl: minor clean-up

Merge and const-ify two arrays that should be one.
parent 06afe5f0
...@@ -71,20 +71,17 @@ gst_rtsp_url_get_type (void) ...@@ -71,20 +71,17 @@ gst_rtsp_url_get_type (void)
return id; return id;
} }
static const gchar *rtsp_url_schemes[] = { static const struct
"rtsp", {
"rtspu", const char scheme[6];
"rtspt", GstRTSPLowerTrans transports;
"rtsph", } rtsp_schemes_map[] = {
NULL {
}; "rtsp", GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_UDP |
GST_RTSP_LOWER_TRANS_UDP_MCAST}, {
static GstRTSPLowerTrans rtsp_url_transports[] = { "rtspu", GST_RTSP_LOWER_TRANS_UDP | GST_RTSP_LOWER_TRANS_UDP_MCAST}, {
GST_RTSP_LOWER_TRANS_TCP | GST_RTSP_LOWER_TRANS_UDP | "rtspt", GST_RTSP_LOWER_TRANS_TCP}, {
GST_RTSP_LOWER_TRANS_UDP_MCAST, "rtsph", GST_RTSP_LOWER_TRANS_HTTP | GST_RTSP_LOWER_TRANS_TCP}
GST_RTSP_LOWER_TRANS_UDP | GST_RTSP_LOWER_TRANS_UDP_MCAST,
GST_RTSP_LOWER_TRANS_TCP,
GST_RTSP_LOWER_TRANS_HTTP | GST_RTSP_LOWER_TRANS_TCP,
}; };
/* format is rtsp[u]://[user:passwd@]host[:port]/abspath[?query] where host /* format is rtsp[u]://[user:passwd@]host[:port]/abspath[?query] where host
...@@ -109,7 +106,7 @@ gst_rtsp_url_parse (const gchar * urlstr, GstRTSPUrl ** url) ...@@ -109,7 +106,7 @@ gst_rtsp_url_parse (const gchar * urlstr, GstRTSPUrl ** url)
GstRTSPUrl *res; GstRTSPUrl *res;
gchar *p, *delim, *at, *col; gchar *p, *delim, *at, *col;
gchar *host_end = NULL; gchar *host_end = NULL;
guint scheme; guint i;
g_return_val_if_fail (urlstr != NULL, GST_RTSP_EINVAL); g_return_val_if_fail (urlstr != NULL, GST_RTSP_EINVAL);
g_return_val_if_fail (url != NULL, GST_RTSP_EINVAL); g_return_val_if_fail (url != NULL, GST_RTSP_EINVAL);
...@@ -122,9 +119,9 @@ gst_rtsp_url_parse (const gchar * urlstr, GstRTSPUrl ** url) ...@@ -122,9 +119,9 @@ gst_rtsp_url_parse (const gchar * urlstr, GstRTSPUrl ** url)
if (col == NULL) if (col == NULL)
goto invalid; goto invalid;
for (scheme = 0; rtsp_url_schemes[scheme] != NULL; scheme++) { for (i = 0; i < G_N_ELEMENTS (rtsp_schemes_map); i++) {
if (g_ascii_strncasecmp (rtsp_url_schemes[scheme], p, col - p) == 0) { if (g_ascii_strncasecmp (rtsp_schemes_map[i].scheme, p, col - p) == 0) {
res->transports = rtsp_url_transports[scheme]; res->transports = rtsp_schemes_map[i].transports;
p = col + 3; p = col + 3;
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment