Commit 93b37f19 authored by Rui Zhang's avatar Rui Zhang Committed by Jean-Baptiste Kempf

httplive: parse EXT-X-MEDIA-SEQUENCE only once

refs #6897
Signed-off-by: default avatarHugo Beauzée-Luyssen <beauze.h@gmail.com>
(cherry picked from commit 4ab81377158ece056cae3a45084f20efb5df79d7)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 5ecc28ae
...@@ -1069,6 +1069,7 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const ...@@ -1069,6 +1069,7 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const
assert(hls); assert(hls);
/* */ /* */
bool media_sequence_loaded = false;
int segment_duration = -1; int segment_duration = -1;
do do
{ {
...@@ -1083,7 +1084,15 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const ...@@ -1083,7 +1084,15 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const
else if (strncmp(line, "#EXT-X-TARGETDURATION", 21) == 0) else if (strncmp(line, "#EXT-X-TARGETDURATION", 21) == 0)
err = parse_TargetDuration(s, hls, line); err = parse_TargetDuration(s, hls, line);
else if (strncmp(line, "#EXT-X-MEDIA-SEQUENCE", 21) == 0) else if (strncmp(line, "#EXT-X-MEDIA-SEQUENCE", 21) == 0)
{
/* A Playlist file MUST NOT contain more than one EXT-X-MEDIA-SEQUENCE tag. */
/* We only care about first one */
if (!media_sequence_loaded)
{
err = parse_MediaSequence(s, hls, line); err = parse_MediaSequence(s, hls, line);
media_sequence_loaded = true;
}
}
else if (strncmp(line, "#EXT-X-KEY", 10) == 0) else if (strncmp(line, "#EXT-X-KEY", 10) == 0)
err = parse_Key(s, hls, line); err = parse_Key(s, hls, line);
else if (strncmp(line, "#EXT-X-PROGRAM-DATE-TIME", 24) == 0) else if (strncmp(line, "#EXT-X-PROGRAM-DATE-TIME", 24) == 0)
......
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