mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 15:27:07 +00:00
hlsdemux2: Fix getting starting segment on live playlists
When dealing with live streams, the function was assuming that all segments of the playlist had valid stream_time. But that isn't TRUE, for example in the case of failing to synchronize playlists. Fixes losing sync due to not being able to match playlist on updates Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6610>
This commit is contained in:
parent
1126c1d90e
commit
81c42ee14b
1 changed files with 25 additions and 22 deletions
|
@ -2124,11 +2124,13 @@ gst_hls_media_playlist_get_starting_segment (GstHLSMediaPlaylist * self,
|
|||
}
|
||||
|
||||
if (GST_CLOCK_TIME_IS_VALID (hold_back)) {
|
||||
GstM3U8MediaSegment *last_seg =
|
||||
g_ptr_array_index (self->segments, self->segments->len - 1);
|
||||
|
||||
if (GST_CLOCK_STIME_IS_VALID (last_seg->stream_time)) {
|
||||
GstSeekFlags flags =
|
||||
GST_SEEK_FLAG_SNAP_BEFORE | GST_SEEK_FLAG_KEY_UNIT |
|
||||
GST_HLS_M3U8_SEEK_FLAG_ALLOW_PARTIAL;
|
||||
GstM3U8MediaSegment *last_seg =
|
||||
g_ptr_array_index (self->segments, self->segments->len - 1);
|
||||
GstClockTime playlist_duration =
|
||||
last_seg->stream_time + last_seg->duration;
|
||||
GstClockTime target_ts;
|
||||
|
@ -2157,6 +2159,7 @@ gst_hls_media_playlist_get_starting_segment (GstHLSMediaPlaylist * self,
|
|||
return TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Worst case fallback, start 3 fragments from the end */
|
||||
if (res == NULL) {
|
||||
|
|
Loading…
Reference in a new issue