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

hlsdemux: cache total duration to avoid iterating at every query

Browse source 
Duration queries can be done a few times per second and would cause
the segment list to be traversed for every one. Caching the duration
prevents that.
This commit is contained in:
Thiago Santos 2015-01-08 13:03:11 -03:00
parent 4531a341a8
commit e21abb62e0
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/hls/m3u8.c
View file

@ -424,6 +424,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
g_list_free (self->files); g_list_free (self->files);
self->files = NULL; self->files = NULL;
} }
client->duration = GST_CLOCK_TIME_NONE;
/* By default, allow caching */ /* By default, allow caching */
self->allowcache = TRUE; self->allowcache = TRUE;
@ -760,6 +761,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
GST_TIME_FORMAT, GST_TIME_ARGS (client->first_file_start), GST_TIME_FORMAT, GST_TIME_ARGS (client->first_file_start),
GST_TIME_ARGS (client->last_file_end)); GST_TIME_ARGS (client->last_file_end));
} }
client->duration = duration;
} }
return TRUE; return TRUE;
@ -779,6 +781,7 @@ gst_m3u8_client_new (const gchar * uri, const gchar * base_uri)
client->sequence_position = 0; client->sequence_position = 0;
client->update_failed_count = 0; client->update_failed_count = 0;
client->highest_sequence_number = -1; client->highest_sequence_number = -1;
client->duration = GST_CLOCK_TIME_NONE;
g_mutex_init (&client->lock); g_mutex_init (&client->lock);
gst_m3u8_set_uri (client->main, g_strdup (uri), g_strdup (base_uri), NULL); gst_m3u8_set_uri (client->main, g_strdup (uri), g_strdup (base_uri), NULL);
@ -804,6 +807,7 @@ gst_m3u8_client_set_current (GstM3U8Client * self, GstM3U8 * m3u8)
if (m3u8 != self->current) { if (m3u8 != self->current) {
self->current = m3u8; self->current = m3u8;
self->update_failed_count = 0; self->update_failed_count = 0;
self->duration = GST_CLOCK_TIME_NONE;
} }
GST_M3U8_CLIENT_UNLOCK (self); GST_M3U8_CLIENT_UNLOCK (self);
} }
@ -1104,7 +1108,7 @@ _sum_duration (GstM3U8MediaFile * self, GstClockTime * duration)
GstClockTime GstClockTime
gst_m3u8_client_get_duration (GstM3U8Client * client) gst_m3u8_client_get_duration (GstM3U8Client * client)
{ {
GstClockTime duration = 0; GstClockTime duration = GST_CLOCK_TIME_NONE;
g_return_val_if_fail (client != NULL, GST_CLOCK_TIME_NONE); g_return_val_if_fail (client != NULL, GST_CLOCK_TIME_NONE);
@ -1114,9 +1118,15 @@ gst_m3u8_client_get_duration (GstM3U8Client * client)
GST_M3U8_CLIENT_UNLOCK (client); GST_M3U8_CLIENT_UNLOCK (client);
return GST_CLOCK_TIME_NONE; return GST_CLOCK_TIME_NONE;
} }
if (client->current->files)
g_list_foreach (client->current->files, (GFunc) _sum_duration, &duration); if (!GST_CLOCK_TIME_IS_VALID (client->duration) && client->current->files) {
client->duration = 0;
g_list_foreach (client->current->files, (GFunc) _sum_duration,
&client->duration);
}
duration = client->duration;
GST_M3U8_CLIENT_UNLOCK (client); GST_M3U8_CLIENT_UNLOCK (client);
return duration; return duration;
} }

1
ext/hls/m3u8.h
View file

@ -94,6 +94,7 @@ struct _GstM3U8Client
gint64 highest_sequence_number; /* largest seen sequence number */ gint64 highest_sequence_number; /* largest seen sequence number */
GstClockTime first_file_start; /* timecode of the start of the first fragment in the current media playlist */ GstClockTime first_file_start; /* timecode of the start of the first fragment in the current media playlist */
GstClockTime last_file_end; /* timecode of the end of the last fragment in the current media playlist */ GstClockTime last_file_end; /* timecode of the end of the last fragment in the current media playlist */
GstClockTime duration; /* cached total duration */
GMutex lock; GMutex lock;
}; };