Commit 0879b3f6 authored by Chris Smowton's avatar Chris Smowton Committed by Jean-Baptiste Kempf

Fix trying to prefetch 2 segments from a 1-segment HLS stream

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 7e21f34f1cf7fd9f3c9d73b5b39d7c671101d22c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent cd7ab6ee
...@@ -1652,8 +1652,13 @@ static int Prefetch(stream_t *s, int *current) ...@@ -1652,8 +1652,13 @@ static int Prefetch(stream_t *s, int *current)
if (hls == NULL) if (hls == NULL)
return VLC_EGENERIC; return VLC_EGENERIC;
/* Download first 2 segments of this HLS stream */ if (vlc_array_count(hls->segments) == 0)
for (int i = 0; i < 2; i++) return VLC_EGENERIC;
else if (vlc_array_count(hls->segments) == 1 && p_sys->b_live)
msg_Warn(s, "Only 1 segment available to prefetch in live stream; may stall");
/* Download first 2 segments of this HLS stream if they exist */
for (int i = 0; i < __MIN(vlc_array_count(hls->segments), 2); i++)
{ {
segment_t *segment = segment_GetSegment(hls, p_sys->download.segment); segment_t *segment = segment_GetSegment(hls, p_sys->download.segment);
if (segment == NULL ) if (segment == NULL )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment