FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dashdemux: Properly handle relative and non-HTTP URIs for the headers/indices

Browse Source 
gst_uri_join_strings() will return the second parameter if it is an absolute
URI. No need to do a (wrong) check if the URI is absolute or not beforehand.

https://bugzilla.gnome.org/show_bug.cgi?id=755134
This commit is contained in:
Sebastian Dröge 2015-09-16 23:38:24 +02:00
parent 6cafc64416
commit 7c9525830e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/dash/gstdashdemux.c
View File

@ -911,27 +911,23 @@ gst_dash_demux_stream_update_headers_info (GstAdaptiveDemuxStream * stream)
&path, dashstream->index, &path, dashstream->index,
&stream->fragment.header_range_start, &stream->fragment.header_range_end); &stream->fragment.header_range_start, &stream->fragment.header_range_end);
if (path != NULL && strncmp (path, "http://", 7) != 0) { if (path != NULL) {
stream->fragment.header_uri = stream->fragment.header_uri =
gst_uri_join_strings (gst_mpdparser_get_baseURL (dashdemux->client, gst_uri_join_strings (gst_mpdparser_get_baseURL (dashdemux->client,
dashstream->index), path); dashstream->index), path);
g_free (path); g_free (path);
} else { path = NULL;
stream->fragment.header_uri = path;
} }
path = NULL;
gst_mpd_client_get_next_header_index (dashdemux->client, gst_mpd_client_get_next_header_index (dashdemux->client,
&path, dashstream->index, &path, dashstream->index,
&stream->fragment.index_range_start, &stream->fragment.index_range_end); &stream->fragment.index_range_start, &stream->fragment.index_range_end);
if (path != NULL && strncmp (path, "http://", 7) != 0) { if (path != NULL) {
stream->fragment.index_uri = stream->fragment.index_uri =
gst_uri_join_strings (gst_mpdparser_get_baseURL (dashdemux->client, gst_uri_join_strings (gst_mpdparser_get_baseURL (dashdemux->client,
dashstream->index), path); dashstream->index), path);
g_free (path); g_free (path);
} else {
stream->fragment.index_uri = path;
} }
} }