Skip to content

V
vlc-2-2
Commit a5c4d7af authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

httplive: small simplification

parent 623a50eb
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
modules/stream_filter/httplive.c
View file @ a5c4d7af
......@@ -449,8 +449,9 @@ static int ChooseSegment(stream_t *s, const int current)
int duration = 0;
int sequence = 0;
int count = vlc_array_count(hls->segments);
int i = p_sys->b_live ? count - 1 : 0;
int i = p_sys->b_live ? count - 1 : -1;
/* We do while loop only with live case, otherwise return 0*/
while((i >= 0) && (i < count))
{
segment_t *segment = segment_GetSegment(hls, i);
......@@ -466,15 +467,12 @@ static int ChooseSegment(stream_t *s, const int current)
if (duration >= 3 * hls->duration)
{
/* Start point found */
wanted = p_sys->b_live ? i : 0;
wanted = i;
sequence = segment->sequence;
break;
}
if (p_sys->b_live)
i-- ;
else
i++;
}
msg_Dbg(s, "Choose segment %d/%d (sequence=%d)", wanted, count, sequence);
......@@ -748,7 +746,7 @@ static int parse_MediaSequence(stream_t *s, hls_stream_t *hls, char *p_read)
if ( ( last_segment->sequence < sequence) &&
( sequence - last_segment->sequence >= 1 ))
msg_Err(s, "EXT-X-MEDIA-SEQUENCE gap in playlist (new=%d, old=%d)",
sequence, last->sequence);
sequence, last_segment->sequence);
}
else
msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist (new=%d, old=%d)",
......
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