From: Bart Van Severen <bart.vanseveren@barco.com>
Date: Tue, 28 Mar 2023 13:38:07 +0000 (+0200)
Subject: Revert "rtsp: gstrtspurl: gst_rtsp_url_get_request_uri: fix incorrect scheme for... 
X-Git-Tag: 1.22.7~385
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8d7f326ff7a325ea5f87f44d255298fc4f6bc46;p=platform%2Fupstream%2Fgstreamer.git

Revert "rtsp: gstrtspurl: gst_rtsp_url_get_request_uri: fix incorrect scheme for tls transport methods"

This reverts commit 024ef7659d3cb1ceee6628646aa37001399be92d because it causes a regression:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2412

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4298>
---

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/rtsp/gstrtspurl.c b/subprojects/gst-plugins-base/gst-libs/gst/rtsp/gstrtspurl.c
index 1cacd4d..4b46de7 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/rtsp/gstrtspurl.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/rtsp/gstrtspurl.c
@@ -59,11 +59,9 @@
 G_DEFINE_BOXED_TYPE (GstRTSPUrl, gst_rtsp_url,
     (GBoxedCopyFunc) gst_rtsp_url_copy, (GBoxedFreeFunc) gst_rtsp_url_free);
 
-#define SCHEME_SIZE 7
-
 static const struct
 {
-  const char scheme[SCHEME_SIZE];
+  const char scheme[6];
   GstRTSPLowerTrans transports;
 } rtsp_schemes_map[] = {
   {
@@ -328,8 +326,6 @@ gst_rtsp_url_get_request_uri (const GstRTSPUrl * url)
   const gchar *post_host;
   const gchar *pre_query;
   const gchar *query;
-  gchar scheme[SCHEME_SIZE] = "rtsp";
-  guint i;
 
   g_return_val_if_fail (url != NULL, NULL);
 
@@ -337,18 +333,12 @@ gst_rtsp_url_get_request_uri (const GstRTSPUrl * url)
   post_host = url->family == GST_RTSP_FAM_INET6 ? "]" : "";
   pre_query = url->query ? "?" : "";
   query = url->query ? url->query : "";
-  for (i = 0; i < G_N_ELEMENTS (rtsp_schemes_map); i++) {
-    if (url->transports == rtsp_schemes_map[i].transports) {
-      strcpy (scheme, rtsp_schemes_map[i].scheme);
-      break;
-    }
-  }
 
   if (url->port != 0) {
-    uri = g_strdup_printf ("%s://%s%s%s:%u%s%s%s", scheme, pre_host, url->host,
+    uri = g_strdup_printf ("rtsp://%s%s%s:%u%s%s%s", pre_host, url->host,
         post_host, url->port, url->abspath, pre_query, query);
   } else {
-    uri = g_strdup_printf ("%s://%s%s%s%s%s%s", scheme, pre_host, url->host,
+    uri = g_strdup_printf ("rtsp://%s%s%s%s%s%s", pre_host, url->host,
         post_host, url->abspath, pre_query, query);
   }
   return uri;