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

media-descriptor: Fine-tune stream-id checking

Browse source 
Only expect fully identical stream-id from URI which are not local files
nor from our local http server.

Fixes issues with non-default http server port
This commit is contained in:
Edward Hervey 2016-07-04 16:12:27 +02:00 committed by Edward Hervey
parent e5f381b96a
commit 0502e6bf5b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
validate/gst/validate/media-descriptor.c
View file

@ -295,7 +295,6 @@ compare_tags (GstValidateMediaDescriptor * ref,
static gboolean
stream_id_is_equal (const gchar * uri, const gchar * rid, const gchar * cid)
{
gboolean is_file = g_str_has_prefix (uri, "file://");
GChecksum *cs;
const gchar *stream_id;
@ -303,8 +302,9 @@ stream_id_is_equal (const gchar * uri, const gchar * rid, const gchar * cid)
if (g_strcmp0 (rid, cid) == 0)
return TRUE;
/* If it's not from file, it should have been the same */
if (!is_file)
/* If it's not from file or from our local http server, it should have been the same */
if (!g_str_has_prefix (uri, "file://")
&& !g_str_has_prefix (uri, "http://127.0.0.1"))
return FALSE;
/* taken from basesrc, compute the reference stream-id */