mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-08 00:18:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

m3u8: Ignore empty playlists in check_media_seqnums

Browse source 
Let these error in the immediately following check in gst_m3u8_update.

https://bugzilla.gnome.org/show_bug.cgi?id=788417
This commit is contained in:
Jan Alexander Steffens (heftig) 2017-09-27 09:39:02 +02:00 committed by Sebastian Dröge
parent f80ad048e6
commit 025633b162
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/hls/m3u8.c
View file

@ -316,6 +316,11 @@ check_media_seqnums (GstM3U8 * self, GList * previous_files)
g_return_val_if_fail (previous_files, FALSE); g_return_val_if_fail (previous_files, FALSE);
if (!self->files) {
/* Empty playlists are trivially consistent */
return TRUE;
}
/* Find first case of higher/equal sequence number in new playlist or /* Find first case of higher/equal sequence number in new playlist or
* same URI. From there on we can linearly step ahead */ * same URI. From there on we can linearly step ahead */
for (l = self->files; l; l = l->next) { for (l = self->files; l; l = l->next) {
@ -334,6 +339,10 @@ check_media_seqnums (GstM3U8 * self, GList * previous_files)
break; break;
} }
/* We must have seen at least one entry on each list */
g_assert (f1 != NULL);
g_assert (f2 != NULL);
if (!l) { if (!l) {
/* No match, no sequence in the new playlist was higher than /* No match, no sequence in the new playlist was higher than
* any in the old, and no URI was found again. This is bad! */ * any in the old, and no URI was found again. This is bad! */
@ -341,9 +350,6 @@ check_media_seqnums (GstM3U8 * self, GList * previous_files)
return FALSE; return FALSE;
} }
g_assert (f1 != NULL);
g_assert (f2 != NULL);
for (; l && m; l = l->next, m = m->next) { for (; l && m; l = l->next, m = m->next) {
f1 = l->data; f1 = l->data;
f2 = m->data; f2 = m->data;