mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

mssdemux: Use gsturi structure to form fragment urls

Browse source 
We can use gst_uri_from_string_with_base () to join base url
and the fragment url path.
The previous method of forming base url in update_base_url(),
by looking for the string 'manifest' or 'Manifest' is insufficient.
A query may include these string in their paths and thus an invalid
base url string will be kept.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8193>
This commit is contained in:
Hosang Lee 2020-08-10 14:27:29 +09:00 committed by Tim-Philipp Müller
parent 10fc594847
commit 228dd25a0a
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
View file

@ -310,11 +310,20 @@ gst_mss_demux_stream_update_fragment_info (GstAdaptiveDemuxStream * stream)
ret = gst_mss_stream_get_fragment_url (mssstream->manifest_stream, &path); ret = gst_mss_stream_get_fragment_url (mssstream->manifest_stream, &path);
if (ret == GST_FLOW_OK) { if (ret == GST_FLOW_OK) {
stream->fragment.uri = g_strdup_printf ("%s/%s", mssdemux->base_url, path); GstUri *base_url, *frag_url;
base_url = gst_uri_from_string (mssdemux->base_url);
frag_url = gst_uri_from_string_with_base (base_url, path);
g_free (stream->fragment.uri);
stream->fragment.uri = gst_uri_to_string (frag_url);
stream->fragment.timestamp = stream->fragment.timestamp =
gst_mss_stream_get_fragment_gst_timestamp (mssstream->manifest_stream); gst_mss_stream_get_fragment_gst_timestamp (mssstream->manifest_stream);
stream->fragment.duration = stream->fragment.duration =
gst_mss_stream_get_fragment_gst_duration (mssstream->manifest_stream); gst_mss_stream_get_fragment_gst_duration (mssstream->manifest_stream);
gst_uri_unref (base_url);
gst_uri_unref (frag_url);
} }
g_free (path); g_free (path);
@ -519,25 +528,14 @@ static void
gst_mss_demux_update_base_url (GstMssDemux * mssdemux) gst_mss_demux_update_base_url (GstMssDemux * mssdemux)
{ {
GstAdaptiveDemux *demux = GST_ADAPTIVE_DEMUX_CAST (mssdemux); GstAdaptiveDemux *demux = GST_ADAPTIVE_DEMUX_CAST (mssdemux);
gchar *baseurl_end;
g_free (mssdemux->base_url); g_free (mssdemux->base_url);
mssdemux->base_url = mssdemux->base_url =
g_strdup (demux->manifest_base_uri ? demux->manifest_base_uri : demux-> g_strdup (demux->manifest_base_uri ? demux->manifest_base_uri : demux->
manifest_uri); manifest_uri);
baseurl_end = g_strrstr (mssdemux->base_url, "/Manifest");
if (baseurl_end == NULL) {
/* second try */
baseurl_end = g_strrstr (mssdemux->base_url, "/manifest");
}
if (baseurl_end) {
/* set the new end of the string */
baseurl_end[0] = '\0';
} else {
GST_WARNING_OBJECT (mssdemux, "Stream's URI didn't end with /manifest");
}
GST_DEBUG ("base url: %s", mssdemux->base_url);
} }
static gboolean static gboolean