mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 11:55:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Fix forwards and backwards searching in the files list

Browse source
This commit is contained in:
Sebastian Dröge 2014-03-26 07:25:13 +01:00
parent 6039734f3e
commit 8109ed8785
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ext/hls/m3u8.c
View file

@ -679,28 +679,32 @@ out:
return ret;
}
static gint
static gboolean
_find_current (GstM3U8MediaFile * file, GstM3U8Client * client)
{
return file->sequence == client->sequence;
return file->sequence != client->sequence;
}
static gboolean
_find_next (GstM3U8MediaFile * file, GstM3U8Client * client)
static GList *
find_next_fragment (GstM3U8Client * client, GList * l, gboolean forward)
{
GST_DEBUG ("Found fragment %u", (guint) file->sequence);
if (file->sequence >= client->sequence)
return FALSE;
return TRUE;
}
GstM3U8MediaFile *file;
static gboolean
_find_previous (GstM3U8MediaFile * file, GstM3U8Client * client)
{
GST_DEBUG ("Found fragment %u", (guint) file->sequence);
if (file->sequence <= client->sequence)
return FALSE;
return TRUE;
if (!forward)
l = g_list_last (l);
while (l) {
file = l->data;
if (forward && file->sequence >= client->sequence)
break;
else if (!forward && file->sequence <= client->sequence)
break;
l = (forward ? l->next : l->prev);
}
return l;
}
gboolean
@ -721,9 +725,8 @@ gst_m3u8_client_get_next_fragment (GstM3U8Client * client,
GST_M3U8_CLIENT_UNLOCK (client);
return FALSE;
}
l = g_list_find_custom (client->current->files, client,
(GCompareFunc) (forward ? _find_next : _find_previous));
if (l == NULL) {
l = find_next_fragment (client, client->current->files, forward);
if (!l) {
GST_M3U8_CLIENT_UNLOCK (client);
return FALSE;
}
@ -750,6 +753,8 @@ gst_m3u8_client_get_next_fragment (GstM3U8Client * client,
if (iv)
*iv = file->iv;
client->sequence = file->sequence;
GST_M3U8_CLIENT_UNLOCK (client);
return TRUE;
}