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

hlsdemux: add support for seeking to fragment boundaries

Browse source 
Setting the seek flags to GST_SEEK_FLAG_SNAP_* will change the seek
target time to a segment boundary.

Based on original work by Ben Willers <bwillers@digisoft.tv>.

https://bugzilla.gnome.org/show_bug.cgi?id=759108
This commit is contained in:
Duncan Palmer 2015-12-07 14:10:30 +10:00 committed by Sebastian Dröge
parent a878d6e67e
commit 612f16936c
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/hls/gsthlsdemux.c
View file

@ -247,6 +247,7 @@ gst_hls_demux_seek (GstAdaptiveDemux * demux, GstEvent * seek)
gint64 current_sequence; gint64 current_sequence;
GstM3U8MediaFile *file; GstM3U8MediaFile *file;
guint64 bitrate; guint64 bitrate;
gboolean snap_before, snap_after, snap_nearest;
gst_event_parse_seek (seek, &rate, &format, &flags, &start_type, &start, gst_event_parse_seek (seek, &rate, &format, &flags, &start_type, &start,
&stop_type, &stop); &stop_type, &stop);
@ -304,13 +305,29 @@ gst_hls_demux_seek (GstAdaptiveDemux * demux, GstEvent * seek)
current_sequence = file->sequence; current_sequence = file->sequence;
current_pos = 0; current_pos = 0;
target_pos = rate > 0 ? start : stop; target_pos = rate > 0 ? start : stop;
/* Snap to segment boundary. Improves seek performance on slow machines. */
snap_before = snap_after = snap_nearest = FALSE;
if ((flags & GST_SEEK_FLAG_SNAP_NEAREST) == GST_SEEK_FLAG_SNAP_NEAREST)
snap_nearest = TRUE;
else if (flags & GST_SEEK_FLAG_SNAP_BEFORE)
snap_before = TRUE;
else if (flags & GST_SEEK_FLAG_SNAP_AFTER)
snap_after = TRUE;
/* FIXME: Here we need proper discont handling */ /* FIXME: Here we need proper discont handling */
for (walk = hlsdemux->client->current->files; walk; walk = walk->next) { for (walk = hlsdemux->client->current->files; walk; walk = walk->next) {
file = walk->data; file = walk->data;
current_sequence = file->sequence; current_sequence = file->sequence;
current_file = walk; current_file = walk;
if (current_pos <= target_pos && target_pos < current_pos + file->duration) { if (snap_after || snap_nearest) {
if (current_pos >= target_pos)
break;
if (snap_nearest && target_pos - current_pos < file->duration / 2)
break;
} else if (current_pos <= target_pos
&& target_pos < current_pos + file->duration) {
break; break;
} }
current_pos += file->duration; current_pos += file->duration;
@ -329,6 +346,10 @@ gst_hls_demux_seek (GstAdaptiveDemux * demux, GstEvent * seek)
hlsdemux->client->sequence_position = current_pos; hlsdemux->client->sequence_position = current_pos;
GST_M3U8_CLIENT_UNLOCK (hlsdemux->client); GST_M3U8_CLIENT_UNLOCK (hlsdemux->client);
if (snap_before || snap_after || snap_nearest)
gst_segment_do_seek (&demux->segment, rate, format, flags, start_type,
current_pos, stop_type, stop, NULL);
return TRUE; return TRUE;
} }