/*****************************************************************************
* httplive.c: HTTP Live Streaming stream filter
*****************************************************************************
- * Copyright (C) 2010 M2X BV
+ * Copyright (C) 2010-2011 M2X BV
* $Id$
*
* Author: Jean-Paul Saman <jpsaman _AT_ videolan _DOT_ org>
# include "config.h"
#endif
+#include <limits.h>
+#include <errno.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_arrays.h>
#include <vlc_stream.h>
#include <vlc_url.h>
-
-#include <vlc_modules.h>
-#include <vlc_access.h>
+#include <vlc_memory.h>
/*****************************************************************************
* Module descriptor
typedef struct segment_s
{
int sequence; /* unique sequence number */
- int length; /* segment duration (ms) */
+ int duration; /* segment duration (seconds) */
uint64_t size; /* segment size in bytes */
+ uint64_t bandwidth; /* bandwidth usage of segments (bits per second)*/
vlc_url_t url;
vlc_mutex_t lock;
int version; /* protocol version should be 1 */
int sequence; /* media sequence number */
int duration; /* maximum duration per segment (ms) */
- uint64_t bandwidth; /* bandwidth usage of segments (kbps)*/
+ uint64_t bandwidth; /* bandwidth usage of segments (bits per second)*/
+ uint64_t size; /* stream length (segment->duration * hls->bandwidth/8) */
vlc_array_t *segments; /* list of segments */
- int segment; /* current segment downloading */
-
vlc_url_t url; /* uri to m3u8 */
vlc_mutex_t lock;
bool b_cache; /* allow caching */
} hls_stream_t;
-typedef struct
-{
- VLC_COMMON_MEMBERS
-
- /* */
- int current; /* current hls_stream */
- vlc_array_t *hls_stream;/* bandwidth adaptation */
-
- stream_t *s;
-} hls_thread_t;
-
struct stream_sys_t
{
- access_t *p_access; /* HTTP access input */
+ vlc_url_t m3u8; /* M3U8 url */
+ vlc_thread_t reload; /* HLS m3u8 reload thread */
+ vlc_thread_t thread; /* HLS segment download thread */
+
+ block_t *peeked;
/* */
- hls_thread_t *thread;
- vlc_array_t *hls_stream;/* bandwidth adaptation */
+ vlc_array_t *hls_stream; /* bandwidth adaptation */
+ uint64_t bandwidth; /* measured bandwidth (bits per second) */
+
+ /* Download */
+ struct hls_download_s
+ {
+ int stream; /* current hls_stream */
+ int segment; /* current segment for downloading */
+ int seek; /* segment requested by seek (default -1) */
+ vlc_mutex_t lock_wait; /* protect segment download counter */
+ vlc_cond_t wait; /* some condition to wait on */
+ } download;
/* Playback */
- uint64_t offset; /* current offset in media */
- int current; /* current hls_stream */
- int segment; /* current segment for playback */
+ struct hls_playback_s
+ {
+ uint64_t offset; /* current offset in media */
+ int stream; /* current hls_stream */
+ int segment; /* current segment for playback */
+ } playback;
/* Playlist */
- mtime_t last; /* playlist last loaded */
- mtime_t wakeup; /* next reload time */
- int tries; /* times it was not changed */
+ struct hls_playlist_s
+ {
+ mtime_t last; /* playlist last loaded */
+ mtime_t wakeup; /* next reload time */
+ int tries; /* times it was not changed */
+ } playlist;
/* state */
bool b_cache; /* can cache files */
static int Peek (stream_t *, const uint8_t **pp_peek, unsigned int i_peek);
static int Control(stream_t *, int i_query, va_list);
-static int AccessOpen(stream_t *s, vlc_url_t *url);
-static void AccessClose(stream_t *s);
-static char *AccessReadLine(access_t *p_access, uint8_t *psz_tmp, size_t i_len);
-static int AccessDownload(stream_t *s, segment_t *segment);
+static ssize_t read_M3U8_from_stream(stream_t *s, uint8_t **buffer);
+static ssize_t read_M3U8_from_url(stream_t *s, vlc_url_t *url, uint8_t **buffer);
+static char *ReadLine(uint8_t *buffer, uint8_t **pos, size_t len);
+
+static int hls_Download(stream_t *s, segment_t *segment);
-static void* hls_Thread(vlc_object_t *);
-static int get_HTTPLivePlaylist(stream_t *s, hls_stream_t *hls);
+static void* hls_Thread(void *);
+static void* hls_Reload(void *);
+static segment_t *segment_GetSegment(hls_stream_t *hls, int wanted);
static void segment_Free(segment_t *segment);
+static char *ConstructUrl(vlc_url_t *url);
+
/****************************************************************************
*
****************************************************************************/
+static const char *const ext[] = {
+ "#EXT-X-TARGETDURATION",
+ "#EXT-X-MEDIA-SEQUENCE",
+ "#EXT-X-KEY",
+ "#EXT-X-ALLOW-CACHE",
+ "#EXT-X-ENDLIST",
+ "#EXT-X-STREAM-INF",
+ "#EXT-X-DISCONTINUITY",
+ "#EXT-X-VERSION"
+};
+
static bool isHTTPLiveStreaming(stream_t *s)
{
const uint8_t *peek, *peek_end;
{
if (*peek == '#')
{
- if (strncasecmp((const char*)peek, "#EXT-X-TARGETDURATION", 21) == 0)
- return true;
- else if (strncasecmp((const char*)peek, "#EXT-X-STREAM-INF", 17) == 0)
- return true;
+ for (unsigned int i = 0; i < ARRAY_SIZE(ext); i++)
+ {
+ char *p = strstr((const char*)peek, ext[i]);
+ if (p != NULL)
+ return true;
+ }
}
peek++;
};
}
/* HTTP Live Streaming */
-static hls_stream_t *hls_New(vlc_array_t *hls_stream, int id, uint64_t bw, char *uri)
+static hls_stream_t *hls_New(vlc_array_t *hls_stream, const int id, const uint64_t bw, const char *uri)
{
hls_stream_t *hls = (hls_stream_t *)malloc(sizeof(hls_stream_t));
if (hls == NULL) return NULL;
hls->id = id;
hls->bandwidth = bw;
hls->duration = -1;/* unknown */
+ hls->size = 0;
hls->sequence = 0; /* default is 0 */
hls->version = 1; /* default protocol version */
- hls->segment = 0;
hls->b_cache = true;
vlc_UrlParse(&hls->url, uri, 0);
hls->segments = vlc_array_new();
hls = NULL;
}
-static hls_stream_t *hls_Get(vlc_array_t *hls_stream, int wanted)
+static hls_stream_t *hls_Copy(hls_stream_t *src, const bool b_cp_segments)
+{
+ assert(src);
+ assert(!b_cp_segments); /* FIXME: copying segments is not implemented */
+
+ hls_stream_t *dst = (hls_stream_t *)malloc(sizeof(hls_stream_t));
+ if (dst == NULL) return NULL;
+
+ dst->id = src->id;
+ dst->bandwidth = src->bandwidth;
+ dst->duration = src->duration;
+ dst->size = src->size;
+ dst->sequence = src->sequence;
+ dst->version = src->version;
+ dst->b_cache = src->b_cache;
+ char *uri = ConstructUrl(&src->url);
+ if (uri == NULL)
+ {
+ free(dst);
+ return NULL;
+ }
+ vlc_UrlParse(&dst->url, uri, 0);
+ if (!b_cp_segments)
+ dst->segments = vlc_array_new();
+ vlc_mutex_init(&dst->lock);
+ return dst;
+}
+
+static hls_stream_t *hls_Get(vlc_array_t *hls_stream, const int wanted)
{
int count = vlc_array_count(hls_stream);
if (count <= 0)
return (hls_stream_t *) hls_Get(hls_stream, count);
}
+static hls_stream_t *hls_Find(vlc_array_t *hls_stream, hls_stream_t *hls_new)
+{
+ int count = vlc_array_count(hls_stream);
+ for (int n = 0; n < count; n++)
+ {
+ hls_stream_t *hls = vlc_array_item_at_index(hls_stream, n);
+ if (hls)
+ {
+ /* compare */
+ if ((hls->id == hls_new->id) &&
+ (hls->bandwidth == hls_new->bandwidth))
+ return hls;
+ }
+ }
+ return NULL;
+}
+
+static uint64_t hls_GetStreamSize(hls_stream_t *hls)
+{
+ /* NOTE: Stream size is calculated based on segment duration and
+ * HLS stream bandwidth from the .m3u8 file. If these are not correct
+ * then the deviation from exact byte size will be big and the seek/
+ * progressbar will not behave entirely as one expects. */
+ uint64_t size = 0UL;
+ int count = vlc_array_count(hls->segments);
+ for (int n = 0; n < count; n++)
+ {
+ segment_t *segment = segment_GetSegment(hls, n);
+ if (segment)
+ {
+ size += (segment->duration * (hls->bandwidth / 8));
+ }
+ }
+ return size;
+}
+
/* Segment */
-static segment_t *segment_New(hls_stream_t* hls, int duration, char *uri)
+static segment_t *segment_New(hls_stream_t* hls, const int duration, const char *uri)
{
segment_t *segment = (segment_t *)malloc(sizeof(segment_t));
if (segment == NULL)
return NULL;
- segment->length = duration; /* seconds */
+ segment->duration = duration; /* seconds */
segment->size = 0; /* bytes */
segment->sequence = 0;
+ segment->bandwidth = 0;
vlc_UrlParse(&segment->url, uri, 0);
segment->data = NULL;
vlc_array_append(hls->segments, segment);
segment = NULL;
}
-static segment_t *segment_GetSegment(hls_stream_t *hls, int wanted)
+static segment_t *segment_GetSegment(hls_stream_t *hls, const int wanted)
{
assert(hls);
return (segment_t *) vlc_array_item_at_index(hls->segments, wanted);
}
+static segment_t *segment_Find(hls_stream_t *hls, const int sequence)
+{
+ assert(hls);
+
+ int count = vlc_array_count(hls->segments);
+ if (count <= 0) return NULL;
+ for (int n = 0; n < count; n++)
+ {
+ segment_t *segment = vlc_array_item_at_index(hls->segments, n);
+ if (segment == NULL) break;
+ if (segment->sequence == sequence)
+ return segment;
+ }
+ return NULL;
+}
+
+static int ChooseSegment(stream_t *s, const int current)
+{
+ stream_sys_t *p_sys = (stream_sys_t *)s->p_sys;
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, current);
+ if (hls == NULL) return 0;
+
+ /* Choose a segment to start which is no closer than
+ * 3 times the target duration from the end of the playlist.
+ */
+ int wanted = 0;
+ int duration = 0;
+ int sequence = 0;
+ int count = vlc_array_count(hls->segments);
+ int i = p_sys->b_live ? count - 1 : 0;
+
+ while((i >= 0) && (i < count) && vlc_object_alive(s))
+ {
+ segment_t *segment = segment_GetSegment(hls, i);
+ assert(segment);
+
+ if (segment->duration > hls->duration)
+ {
+ msg_Err(s, "EXTINF:%d duration is larger than EXT-X-TARGETDURATION:%d",
+ segment->duration, hls->duration);
+ }
+
+ duration += segment->duration;
+ if (duration >= 3 * hls->duration)
+ {
+ /* Start point found */
+ wanted = p_sys->b_live ? i : 0;
+ sequence = segment->sequence;
+ break;
+ }
+
+ if (p_sys->b_live)
+ i-- ;
+ else
+ i++;
+ }
+
+ msg_Info(s, "Choose segment %d/%d (sequence=%d)", wanted, count, sequence);
+ return wanted;
+}
+
/* Parsing */
static char *parse_Attributes(const char *line, const char *attr)
{
return NULL;
}
-static char *relative_URI(stream_t *s, const char *uri, char *psz_uri)
+static char *relative_URI(stream_t *s, const char *uri, const char *path)
{
+ stream_sys_t *p_sys = s->p_sys;
+
char *p = strchr(uri, ':');
if (p != NULL)
return NULL;
- char *tmp;
- if (asprintf(&tmp,"%s://%s", s->psz_access, s->psz_path) < 0)
- {
- s->p_sys->b_error = true;
+ if (p_sys->m3u8.psz_path == NULL)
return NULL;
- }
- char *psz_path = strrchr(tmp, '/');
- if (psz_path) *psz_path = '\0';
+ char *psz_path = strdup(p_sys->m3u8.psz_path);
+ if (psz_path == NULL) return NULL;
+ p = strrchr(psz_path, '/');
+ if (p) *p = '\0';
- vlc_url_t url;
- vlc_UrlParse(&url, tmp, 0);
- if (asprintf(&psz_uri, "%s://%s%s/%s",
- url.psz_protocol, url.psz_host, url.psz_path, uri) < 0)
+ char *psz_uri = NULL;
+ if (p_sys->m3u8.psz_password || p_sys->m3u8.psz_username)
{
- free(tmp);
- vlc_UrlClean(&url);
- s->p_sys->b_error = true;
- return NULL;
+ if (asprintf(&psz_uri, "%s://%s:%s@%s:%d%s/%s", p_sys->m3u8.psz_protocol,
+ p_sys->m3u8.psz_username, p_sys->m3u8.psz_password,
+ p_sys->m3u8.psz_host, p_sys->m3u8.i_port,
+ path ? path : psz_path, uri) < 0)
+ goto fail;
+ }
+ else
+ {
+ if (asprintf(&psz_uri, "%s://%s:%d%s/%s", p_sys->m3u8.psz_protocol,
+ p_sys->m3u8.psz_host, p_sys->m3u8.i_port,
+ path ? path : psz_path, uri) < 0)
+ goto fail;
}
- vlc_UrlClean(&url);
- free(tmp);
+ free(psz_path);
return psz_uri;
+
+fail:
+ free(psz_path);
+ return NULL;
}
-static void parse_SegmentInformation(stream_t *s, hls_stream_t *hls, char *p_read, char *uri)
+static char *ConstructUrl(vlc_url_t *url)
{
- stream_sys_t *p_sys = s->p_sys;
+ if ((url->psz_protocol == NULL) ||
+ (url->psz_path == NULL))
+ return NULL;
+
+ if (url->i_port <= 0)
+ {
+ if (strncmp(url->psz_protocol, "https", 5) == 0)
+ url->i_port = 443;
+ else
+ url->i_port = 80;
+ }
+
+ char *psz_url = NULL;
+ if (url->psz_password || url->psz_username)
+ {
+ if (asprintf(&psz_url, "%s://%s:%s@%s:%d%s",
+ url->psz_protocol,
+ url->psz_username, url->psz_password,
+ url->psz_host, url->i_port, url->psz_path) < 0)
+ return NULL;
+ }
+ else
+ {
+ if (asprintf(&psz_url, "%s://%s:%d%s",
+ url->psz_protocol,
+ url->psz_host, url->i_port, url->psz_path) < 0)
+ return NULL;
+ }
+
+ return psz_url;
+}
+static int parse_SegmentInformation(hls_stream_t *hls, char *p_read, int *duration)
+{
assert(hls);
+ assert(p_read);
- int duration;
- int ret = sscanf(p_read, "#EXTINF:%d,", &duration);
- if (ret != 1)
+ /* strip of #EXTINF: */
+ char *p_next = NULL;
+ char *token = strtok_r(p_read, ":", &p_next);
+ if (token == NULL)
+ return VLC_EGENERIC;
+
+ /* read duration */
+ token = strtok_r(NULL, ",", &p_next);
+ if (token == NULL)
+ return VLC_EGENERIC;
+
+ int value;
+ if (hls->version < 3)
+ {
+ value = strtol(token, NULL, 10);
+ if (errno == ERANGE)
+ {
+ *duration = -1;
+ return VLC_EGENERIC;
+ }
+ *duration = value;
+ }
+ else
{
- msg_Err(s, "expected #EXTINF:<s>,");
- p_sys->b_error = true;
- return;
+ double d = strtod(token, (char **) NULL);
+ if (errno == ERANGE)
+ {
+ *duration = -1;
+ return VLC_EGENERIC;
+ }
+ if ((d) - ((int)d) >= 0.5)
+ value = ((int)d) + 1;
+ else
+ value = ((int)d);
}
- char *psz_uri = NULL;
- psz_uri = relative_URI(s, uri, psz_uri);
+ /* Ignore the rest of the line */
+
+ return VLC_SUCCESS;
+}
+
+static int parse_AddSegment(stream_t *s, hls_stream_t *hls, const int duration, const char *uri)
+{
+ assert(hls);
+ assert(uri);
+
+ /* Store segment information */
+ char *psz_path = NULL;
+ if (hls->url.psz_path != NULL)
+ {
+ psz_path = strdup(hls->url.psz_path);
+ if (psz_path == NULL)
+ return VLC_ENOMEM;
+ char *p = strrchr(psz_path, '/');
+ if (p) *p = '\0';
+ }
+ char *psz_uri = relative_URI(s, uri, psz_path);
+ free(psz_path);
vlc_mutex_lock(&hls->lock);
segment_t *segment = segment_New(hls, duration, psz_uri ? psz_uri : uri);
if (segment)
- segment->sequence = hls->sequence + vlc_array_count(hls->segments);
- if (duration > hls->duration)
- {
- msg_Err(s, "EXTINF:%d duration is larger then EXT-X-TARGETDURATION:%d",
- duration, hls->duration);
- }
+ segment->sequence = hls->sequence + vlc_array_count(hls->segments) - 1;
vlc_mutex_unlock(&hls->lock);
+
+ free(psz_uri);
+ return segment ? VLC_SUCCESS : VLC_ENOMEM;
}
-static void parse_TargetDuration(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_TargetDuration(stream_t *s, hls_stream_t *hls, char *p_read)
{
- stream_sys_t *p_sys = s->p_sys;
-
assert(hls);
int duration = -1;
if (ret != 1)
{
msg_Err(s, "expected #EXT-X-TARGETDURATION:<s>");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
hls->duration = duration; /* seconds */
+ return VLC_SUCCESS;
}
-static void parse_StreamInformation(stream_t *s, char *p_read, char *uri)
+static int parse_StreamInformation(stream_t *s, vlc_array_t **hls_stream,
+ hls_stream_t **hls, char *p_read, const char *uri)
{
- stream_sys_t *p_sys = s->p_sys;
-
int id;
uint64_t bw;
char *attr;
+ assert(*hls == NULL);
+
attr = parse_Attributes(p_read, "PROGRAM-ID");
if (attr == NULL)
{
msg_Err(s, "#EXT-X-STREAM-INF: expected PROGRAM-ID=<value>");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
id = atol(attr);
free(attr);
if (attr == NULL)
{
msg_Err(s, "#EXT-X-STREAM-INF: expected BANDWIDTH=<value>");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
bw = atoll(attr);
free(attr);
if (bw == 0)
{
msg_Err(s, "#EXT-X-STREAM-INF: bandwidth cannot be 0");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
- msg_Info(s, "bandwidth adaption detected (program-id=%d, bandwidth=%"PRIu64").", id, bw);
+ msg_Info(s, "bandwidth adaptation detected (program-id=%d, bandwidth=%"PRIu64").", id, bw);
- char *psz_uri = NULL;
- psz_uri = relative_URI(s, uri, psz_uri);
+ char *psz_uri = relative_URI(s, uri, NULL);
- hls_stream_t *hls = hls_New(p_sys->hls_stream, id, bw, psz_uri ? psz_uri : uri);
- if (hls == NULL)
- p_sys->b_error = true;
+ *hls = hls_New(*hls_stream, id, bw, psz_uri ? psz_uri : uri);
+
+ free(psz_uri);
+
+ return (*hls == NULL) ? VLC_ENOMEM : VLC_SUCCESS;
}
-static void parse_MediaSequence(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_MediaSequence(stream_t *s, hls_stream_t *hls, char *p_read)
{
- stream_sys_t *p_sys = s->p_sys;
-
assert(hls);
int sequence;
if (ret != 1)
{
msg_Err(s, "expected #EXT-X-MEDIA-SEQUENCE:<s>");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
if (hls->sequence > 0)
- msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist");
+ msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist (new=%d, old=%d)",
+ sequence, hls->sequence);
hls->sequence = sequence;
+ return VLC_SUCCESS;
}
-static void parse_Key(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_Key(stream_t *s, hls_stream_t *hls, char *p_read)
{
- stream_sys_t *p_sys = s->p_sys;
-
assert(hls);
/* #EXT-X-KEY:METHOD=<method>[,URI="<URI>"][,IV=<IV>] */
- char *attr;
- attr = parse_Attributes(p_read, "METHOD");
+ int err = VLC_SUCCESS;
+ char *attr = parse_Attributes(p_read, "METHOD");
if (attr == NULL)
{
msg_Err(s, "#EXT-X-KEY: expected METHOD=<value>");
- p_sys->b_error = true;
+ return err;
}
- else if (strncasecmp(attr, "NONE", 4) == 0)
+
+ if (strncasecmp(attr, "NONE", 4) == 0)
{
+
char *uri = parse_Attributes(p_read, "URI");
if (uri != NULL)
{
msg_Err(s, "#EXT-X-KEY: URI not expected");
- p_sys->b_error = true;
+ err = VLC_EGENERIC;
}
free(uri);
/* IV is only supported in version 2 and above */
if (iv != NULL)
{
msg_Err(s, "#EXT-X-KEY: IV not expected");
- p_sys->b_error = true;
+ err = VLC_EGENERIC;
}
free(iv);
}
else
{
msg_Warn(s, "playback of encrypted HTTP Live media is not supported.");
- p_sys->b_error = true;
+ err = VLC_EGENERIC;
}
free(attr);
+ return err;
}
-static void parse_ProgramDateTime(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_ProgramDateTime(stream_t *s, hls_stream_t *hls, char *p_read)
{
VLC_UNUSED(hls);
msg_Dbg(s, "tag not supported: #EXT-X-PROGRAM-DATE-TIME %s", p_read);
+ return VLC_SUCCESS;
}
-static void parse_AllowCache(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_AllowCache(stream_t *s, hls_stream_t *hls, char *p_read)
{
- stream_sys_t *p_sys = s->p_sys;
-
assert(hls);
char answer[4] = "\0";
if (ret != 1)
{
msg_Err(s, "#EXT-X-ALLOW-CACHE, ignoring ...");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
hls->b_cache = (strncmp(answer, "NO", 2) != 0);
+ return VLC_SUCCESS;
}
-static void parse_Version(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_Version(stream_t *s, hls_stream_t *hls, char *p_read)
{
- stream_sys_t *p_sys = s->p_sys;
-
assert(hls);
int version;
if (ret != 1)
{
msg_Err(s, "#EXT-X-VERSION: no protocol version found, should be version 1.");
- p_sys->b_error = true;
- return;
+ return VLC_EGENERIC;
}
/* Check version */
if (hls->version != 1)
{
msg_Err(s, "#EXT-X-VERSION should be version 1 iso %d", version);
- p_sys->b_error = true;
+ return VLC_EGENERIC;
}
+ return VLC_SUCCESS;
}
-static void parse_EndList(stream_t *s, hls_stream_t *hls)
+static int parse_EndList(stream_t *s, hls_stream_t *hls)
{
- stream_sys_t *p_sys = s->p_sys;
-
assert(hls);
- p_sys->b_live = false;
+ s->p_sys->b_live = false;
msg_Info(s, "video on demand (vod) mode");
+ return VLC_SUCCESS;
}
-static void parse_Discontinuity(stream_t *s, hls_stream_t *hls, char *p_read)
+static int parse_Discontinuity(stream_t *s, hls_stream_t *hls, char *p_read)
{
assert(hls);
/* FIXME: Do we need to act on discontinuity ?? */
msg_Dbg(s, "#EXT-X-DISCONTINUITY %s", p_read);
+ return VLC_SUCCESS;
}
-static void parse_M3U8ExtLine(stream_t *s, hls_stream_t *hls, char *line)
-{
- if (*line == '#')
- {
- if (strncmp(line, "#EXT-X-TARGETDURATION", 21) == 0)
- parse_TargetDuration(s, hls, line);
- else if (strncmp(line, "#EXT-X-MEDIA-SEQUENCE", 22) == 0)
- parse_MediaSequence(s, hls, line);
- else if (strncmp(line, "#EXT-X-KEY", 11) == 0)
- parse_Key(s, hls, line);
- else if (strncmp(line, "#EXT-X-PROGRAM-DATE-TIME", 25) == 0)
- parse_ProgramDateTime(s, hls, line);
- else if (strncmp(line, "#EXT-X-ALLOW-CACHE", 17) == 0)
- parse_AllowCache(s, hls, line);
- else if (strncmp(line, "#EXT-X-DISCONTINUITY", 20) == 0)
- parse_Discontinuity(s, hls, line);
- else if (strncmp(line, "#EXT-X-VERSION", 14) == 0)
- parse_Version(s, hls, line);
- else if (strncmp(line, "#EXT-X-ENDLIST", 14) == 0)
- parse_EndList(s, hls);
- }
-}
-
-#define HTTPLIVE_MAX_LINE 4096
-static int get_HTTPLivePlaylist(stream_t *s, hls_stream_t *hls)
+/* The http://tools.ietf.org/html/draft-pantos-http-live-streaming-04#page-8
+ * document defines the following new tags: EXT-X-TARGETDURATION,
+ * EXT-X-MEDIA-SEQUENCE, EXT-X-KEY, EXT-X-PROGRAM-DATE-TIME, EXT-X-
+ * ALLOW-CACHE, EXT-X-STREAM-INF, EXT-X-ENDLIST, EXT-X-DISCONTINUITY,
+ * and EXT-X-VERSION.
+ */
+static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const ssize_t len)
{
stream_sys_t *p_sys = s->p_sys;
+ uint8_t *p_read, *p_begin, *p_end;
- /* Download new playlist file from server */
- if (AccessOpen(s, &hls->url) != VLC_SUCCESS)
- return VLC_EGENERIC;
+ assert(streams);
+ assert(buffer);
- /* Parse the rest of the reply */
- uint8_t *tmp = calloc(1, HTTPLIVE_MAX_LINE);
- if (tmp == NULL)
- {
- AccessClose(s);
+ msg_Dbg(s, "parse_M3U8\n%s", buffer);
+ p_begin = buffer;
+ p_end = p_begin + len;
+
+ char *line = ReadLine(p_begin, &p_read, p_end - p_begin);
+ if (line == NULL)
return VLC_ENOMEM;
- }
+ p_begin = p_read;
- char *line = AccessReadLine(p_sys->p_access, tmp, HTTPLIVE_MAX_LINE);
if (strncmp(line, "#EXTM3U", 7) != 0)
{
- msg_Err(s, "missing #EXTM3U tag");
- goto error;
+ msg_Err(s, "missing #EXTM3U tag .. aborting");
+ free(line);
+ return VLC_EGENERIC;
}
+
free(line);
line = NULL;
- for( ; ; )
+ /* What is the version ? */
+ int version = 1;
+ uint8_t *p = (uint8_t *)strstr((const char *)buffer, "#EXT-X-VERSION:");
+ if (p != NULL)
{
- line = AccessReadLine(p_sys->p_access, tmp, HTTPLIVE_MAX_LINE);
- if (line == NULL)
+ uint8_t *tmp = NULL;
+ char *psz_version = ReadLine(p, &tmp, p_end - p);
+ if (psz_version == NULL)
+ return VLC_ENOMEM;
+ int ret = sscanf((const char*)psz_version, "#EXT-X-VERSION:%d", &version);
+ if (ret != 1)
{
- msg_Dbg(s, "end of data");
- break;
+ msg_Warn(s, "#EXT-X-VERSION: no protocol version found, assuming version 1.");
+ version = 1;
}
+ free(psz_version);
+ p = NULL;
+ }
- if (!vlc_object_alive(s))
- goto error;
+ /* Is it a live stream ? */
+ p_sys->b_live = (strstr((const char *)buffer, "#EXT-X-ENDLIST") == NULL) ? true : false;
- /* some more checks for actual data */
- if (strncmp(line, "#EXTINF", 7) == 0)
- {
- char *uri = AccessReadLine(p_sys->p_access, tmp, HTTPLIVE_MAX_LINE);
- if (uri == NULL)
- p_sys->b_error = true;
- else
+ /* Is it a meta index file ? */
+ bool b_meta = (strstr((const char *)buffer, "#EXT-X-STREAM-INF") == NULL) ? false : true;
+
+ int err = VLC_SUCCESS;
+
+ if (b_meta)
+ {
+ msg_Info(s, "Meta playlist");
+
+ /* M3U8 Meta Index file */
+ do {
+ /* Next line */
+ line = ReadLine(p_begin, &p_read, p_end - p_begin);
+ if (line == NULL)
+ break;
+ p_begin = p_read;
+
+ /* */
+ if (strncmp(line, "#EXT-X-STREAM-INF", 17) == 0)
{
- parse_SegmentInformation(s, hls, line, uri);
- free(uri);
+ p_sys->b_meta = true;
+ char *uri = ReadLine(p_begin, &p_read, p_end - p_begin);
+ if (uri == NULL)
+ err = VLC_ENOMEM;
+ else
+ {
+ hls_stream_t *hls = NULL;
+ err = parse_StreamInformation(s, &streams, &hls, line, uri);
+ free(uri);
+
+ /* Download playlist file from server */
+ uint8_t *buf = NULL;
+ ssize_t len = read_M3U8_from_url(s, &hls->url, &buf);
+ if (len < 0)
+ err = VLC_EGENERIC;
+ else
+ {
+ /* Parse HLS m3u8 content. */
+ err = parse_M3U8(s, streams, buf, len);
+ free(buf);
+ }
+
+ if (hls)
+ {
+ hls->version = version;
+ if (!p_sys->b_live)
+ hls->size = hls_GetStreamSize(hls); /* Stream size (approximate) */
+ }
+ }
+ p_begin = p_read;
}
- }
+
+ free(line);
+ line = NULL;
+
+ if (p_begin >= p_end)
+ break;
+
+ } while ((err == VLC_SUCCESS) && vlc_object_alive(s));
+
+ }
+ else
+ {
+ msg_Info(s, "%s Playlist HLS protocol version: %d", p_sys->b_live ? "Live": "VOD", version);
+
+ hls_stream_t *hls = NULL;
+ if (p_sys->b_meta)
+ hls = hls_GetLast(streams);
else
{
- parse_M3U8ExtLine(s, hls, line);
+ /* No Meta playlist used */
+ hls = hls_New(streams, 0, -1, NULL);
+ if (hls)
+ {
+ /* Get TARGET-DURATION first */
+ p = (uint8_t *)strstr((const char *)buffer, "#EXT-X-TARGETDURATION:");
+ if (p)
+ {
+ uint8_t *p_rest = NULL;
+ char *psz_duration = ReadLine(p, &p_rest, p_end - p);
+ if (psz_duration == NULL)
+ return VLC_EGENERIC;
+ err = parse_TargetDuration(s, hls, psz_duration);
+ free(psz_duration);
+ p = NULL;
+ }
+
+ /* Store version */
+ hls->version = version;
+ }
+ else return VLC_ENOMEM;
}
+ assert(hls);
+
+ /* */
+ int segment_duration = -1;
+ do
+ {
+ /* Next line */
+ line = ReadLine(p_begin, &p_read, p_end - p_begin);
+ if (line == NULL)
+ break;
+ p_begin = p_read;
+
+ if (strncmp(line, "#EXTINF", 7) == 0)
+ err = parse_SegmentInformation(hls, line, &segment_duration);
+ else if (strncmp(line, "#EXT-X-TARGETDURATION", 21) == 0)
+ err = parse_TargetDuration(s, hls, line);
+ else if (strncmp(line, "#EXT-X-MEDIA-SEQUENCE", 21) == 0)
+ err = parse_MediaSequence(s, hls, line);
+ else if (strncmp(line, "#EXT-X-KEY", 10) == 0)
+ err = parse_Key(s, hls, line);
+ else if (strncmp(line, "#EXT-X-PROGRAM-DATE-TIME", 24) == 0)
+ err = parse_ProgramDateTime(s, hls, line);
+ else if (strncmp(line, "#EXT-X-ALLOW-CACHE", 18) == 0)
+ err = parse_AllowCache(s, hls, line);
+ else if (strncmp(line, "#EXT-X-DISCONTINUITY", 20) == 0)
+ err = parse_Discontinuity(s, hls, line);
+ else if (strncmp(line, "#EXT-X-VERSION", 14) == 0)
+ err = parse_Version(s, hls, line);
+ else if (strncmp(line, "#EXT-X-ENDLIST", 14) == 0)
+ err = parse_EndList(s, hls);
+ else if ((strncmp(line, "#", 1) != 0) && (*line != '\0') )
+ {
+ err = parse_AddSegment(s, hls, segment_duration, line);
+ segment_duration = -1; /* reset duration */
+ }
+
+ free(line);
+ line = NULL;
+
+ if (p_begin >= p_end)
+ break;
- /* Error during m3u8 parsing abort */
- if (p_sys->b_error)
- goto error;
+ } while ((err == VLC_SUCCESS) && vlc_object_alive(s));
free(line);
}
- free(line);
- free(tmp);
- AccessClose(s);
- return VLC_SUCCESS;
-
-error:
- free(line);
- free(tmp);
- AccessClose(s);
- return VLC_EGENERIC;
+ return err;
}
-#undef HTTPLIVE_MAX_LINE
-/* The http://tools.ietf.org/html/draft-pantos-http-live-streaming-04#page-8
- * document defines the following new tags: EXT-X-TARGETDURATION,
- * EXT-X-MEDIA-SEQUENCE, EXT-X-KEY, EXT-X-PROGRAM-DATE-TIME, EXT-X-
- * ALLOW-CACHE, EXT-X-STREAM-INF, EXT-X-ENDLIST, EXT-X-DISCONTINUITY,
- * and EXT-X-VERSION.
- */
-static int parse_HTTPLiveStreaming(stream_t *s)
+static int get_HTTPLiveMetaPlaylist(stream_t *s, vlc_array_t **streams)
{
stream_sys_t *p_sys = s->p_sys;
- char *p_read, *p_begin, *p_end;
+ assert(*streams);
+ int err = VLC_EGENERIC;
- assert(p_sys->hls_stream);
+ /* Duplicate HLS stream META information */
+ for (int i = 0; i < vlc_array_count(p_sys->hls_stream); i++)
+ {
+ hls_stream_t *src, *dst;
+ src = (hls_stream_t *)vlc_array_item_at_index(p_sys->hls_stream, i);
+ if (src == NULL)
+ return VLC_EGENERIC;
- p_begin = p_read = stream_ReadLine(s->p_source);
- if (!p_begin)
- return VLC_ENOMEM;
+ dst = hls_Copy(src, false);
+ if (dst == NULL)
+ return VLC_ENOMEM;
- /* */
- int i_len = strlen(p_begin);
- p_end = p_read + i_len;
+ vlc_array_append(*streams, dst);
+ }
- if (strncmp(p_read, "#EXTM3U", 7) != 0)
+ /* Download new playlist file from server */
+ for (int i = 0; i < vlc_array_count(*streams); i++)
{
- msg_Err(s, "missing #EXTM3U tag .. aborting");
- free(p_begin);
- return VLC_EGENERIC;
- }
+ hls_stream_t *hls;
+ hls = (hls_stream_t *)vlc_array_item_at_index(*streams, i);
+ if (hls == NULL)
+ return VLC_EGENERIC;
- do {
- free(p_begin);
+ /* Download playlist file from server */
+ uint8_t *buf = NULL;
+ ssize_t len = read_M3U8_from_url(s, &hls->url, &buf);
+ if (len < 0)
+ err = VLC_EGENERIC;
+ else
+ {
+ /* Parse HLS m3u8 content. */
+ err = parse_M3U8(s, *streams, buf, len);
+ free(buf);
+ }
+ }
+ return err;
+}
- if (p_sys->b_error)
- return VLC_EGENERIC;
+/* Reload playlist */
+static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t **hls)
+{
+ int count = vlc_array_count(hls_new->segments);
- /* Next line */
- p_begin = stream_ReadLine(s->p_source);
- if (p_begin == NULL)
- break;
+ msg_Info(s, "updating hls stream (program-id=%d, bandwidth=%"PRIu64") has %d segments",
+ hls_new->id, hls_new->bandwidth, count);
- i_len = strlen(p_begin);
- p_read = p_begin;
- p_end = p_read + i_len;
+ for (int n = 0; n < count; n++)
+ {
+ segment_t *p = segment_GetSegment(hls_new, n);
+ if (p == NULL) return VLC_EGENERIC;
- if (strncmp(p_read, "#EXT-X-STREAM-INF", 17) == 0)
- {
- p_sys->b_meta = true;
- char *uri = stream_ReadLine(s->p_source);
- if (uri == NULL)
- p_sys->b_error = true;
- else
- {
- parse_StreamInformation(s, p_read, uri);
- free(uri);
- }
- }
- else if (strncmp(p_read, "#EXTINF", 7) == 0)
+ vlc_mutex_lock(&(*hls)->lock);
+ segment_t *segment = segment_Find(*hls, p->sequence);
+ if (segment)
{
- char *uri = stream_ReadLine(s->p_source);
- if (uri == NULL)
- p_sys->b_error = true;
- else
+ assert(p->url.psz_path);
+ assert(segment->url.psz_path);
+
+ /* they should be the same */
+ if ((p->sequence != segment->sequence) ||
+ (p->duration != segment->duration) ||
+ (strcmp(p->url.psz_path, segment->url.psz_path) != 0))
{
- hls_stream_t *hls = hls_GetLast(p_sys->hls_stream);
- if (hls)
- parse_SegmentInformation(s, hls, p_read, uri);
- else
- p_sys->b_error = true;
- free(uri);
+ msg_Warn(s, "existing segment found with different content - resetting");
+ msg_Warn(s, "- sequence: new=%d, old=%d", p->sequence, segment->sequence);
+ msg_Warn(s, "- duration: new=%d, old=%d", p->duration, segment->duration);
+ msg_Warn(s, "- file: new=%s", p->url.psz_path);
+ msg_Warn(s, " old=%s", segment->url.psz_path);
+
+ /* Resetting content */
+ char *psz_url = ConstructUrl(&p->url);
+ if (psz_url == NULL)
+ {
+ msg_Err(s, "Failed updating segment %d - skipping it", p->sequence);
+ segment_Free(p);
+ continue;
+ }
+ segment->sequence = p->sequence;
+ segment->duration = p->duration;
+ vlc_UrlClean(&segment->url);
+ vlc_UrlParse(&segment->url, psz_url, 0);
+ segment_Free(p);
+ free(psz_url);
}
}
else
{
- hls_stream_t *hls = hls_GetLast(p_sys->hls_stream);
- if (hls == NULL)
+ int last = vlc_array_count((*hls)->segments) - 1;
+ segment_t *l = segment_GetSegment(*hls, last);
+ if (l == NULL) goto fail_and_unlock;
+
+ if ((l->sequence + 1) != p->sequence)
{
- if (!p_sys->b_meta)
- {
- hls = hls_New(p_sys->hls_stream, -1, -1, NULL);
- if (hls == NULL)
- {
- p_sys->b_error = true;
- return VLC_ENOMEM;
- }
- }
+ msg_Err(s, "gap in sequence numbers found: new=%d expected %d",
+ p->sequence, l->sequence+1);
}
- /* Parse M3U8 Ext Line */
- parse_M3U8ExtLine(s, hls, p_read);
+ vlc_array_append((*hls)->segments, p);
+ msg_Info(s, "- segment %d appended", p->sequence);
}
- } while(p_read < p_end);
+ vlc_mutex_unlock(&(*hls)->lock);
+ }
+ return VLC_SUCCESS;
- free(p_begin);
+fail_and_unlock:
+ assert(0);
+ vlc_mutex_unlock(&(*hls)->lock);
+ return VLC_EGENERIC;
+}
- /* */
- int count = vlc_array_count(p_sys->hls_stream);
- for (int n = 0; n < count; n++)
- {
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, n);
- if (hls == NULL) break;
+static int hls_ReloadPlaylist(stream_t *s)
+{
+ stream_sys_t *p_sys = s->p_sys;
- /* Is it a meta playlist? */
- if (p_sys->b_meta)
- {
- msg_Dbg(s, "parsing %s", hls->url.psz_path);
- if (get_HTTPLivePlaylist(s, hls) != VLC_SUCCESS)
- {
- msg_Err(s, "could not parse playlist file from meta index." );
- return VLC_EGENERIC;
- }
- }
+ vlc_array_t *hls_streams = vlc_array_new();
+ if (hls_streams == NULL)
+ return VLC_ENOMEM;
- if (p_sys->b_live)
+ msg_Info(s, "Reloading HLS live meta playlist");
+
+ if (get_HTTPLiveMetaPlaylist(s, &hls_streams) != VLC_SUCCESS)
+ {
+ /* Free hls streams */
+ for (int i = 0; i < vlc_array_count(hls_streams); i++)
{
- /* There should at least be 3 segments of hls->duration */
- int ok = 0;
- int num = vlc_array_count(hls->segments);
- for (int i = 0; i < num; i++)
- {
- segment_t *segment = segment_GetSegment(hls, i);
- if (segment && segment->length >= hls->duration)
- ok++;
- }
- if (ok < 3)
- {
- msg_Err(s, "cannot start live playback at this time, try again later.");
- return VLC_EGENERIC;
- }
- /* Determine next time to reload playlist */
- p_sys->wakeup = p_sys->last + (hls->duration * 2 * (mtime_t)1000000);
+ hls_stream_t *hls;
+ hls = (hls_stream_t *)vlc_array_item_at_index(hls_streams, i);
+ if (hls) hls_Free(hls);
}
- /* Can we cache files after playback */
- p_sys->b_cache = hls->b_cache;
+ vlc_array_destroy(hls_streams);
+
+ msg_Err(s, "reloading playlist failed");
+ return VLC_EGENERIC;
}
+ /* merge playlists */
+ int count = vlc_array_count(hls_streams);
+ for (int n = 0; n < count; n++)
+ {
+ hls_stream_t *hls_new = hls_Get(hls_streams, n);
+ if (hls_new == NULL)
+ continue;
+
+ hls_stream_t *hls_old = hls_Find(p_sys->hls_stream, hls_new);
+ if (hls_old == NULL)
+ { /* new hls stream - append */
+ vlc_array_append(p_sys->hls_stream, hls_new);
+ msg_Info(s, "new HLS stream appended (id=%d, bandwidth=%"PRIu64")",
+ hls_new->id, hls_new->bandwidth);
+ }
+ else if (hls_UpdatePlaylist(s, hls_new, &hls_old) != VLC_SUCCESS)
+ msg_Info(s, "failed updating HLS stream (id=%d, bandwidth=%"PRIu64")",
+ hls_new->id, hls_new->bandwidth);
+ }
+ vlc_array_destroy(hls_streams);
return VLC_SUCCESS;
}
stream_sys_t *p_sys = s->p_sys;
int candidate = -1;
uint64_t bw = *bandwidth;
-
- msg_Dbg(s, "bandwidth (bits/s) %"PRIu64, bw * 1000); /* bits / s */
+ uint64_t bw_candidate = 0;
int count = vlc_array_count(p_sys->hls_stream);
for (int n = 0; n < count; n++)
/* only consider streams with the same PROGRAM-ID */
if (hls->id == progid)
{
- if (bw <= hls->bandwidth)
+ if ((bw >= hls->bandwidth) && (bw_candidate < hls->bandwidth))
{
- *bandwidth = hls->bandwidth;
+ msg_Dbg(s, "candidate %d bandwidth (bits/s) %"PRIu64" >= %"PRIu64,
+ n, bw, hls->bandwidth); /* bits / s */
+ bw_candidate = hls->bandwidth;
candidate = n; /* possible candidate */
}
}
}
+ *bandwidth = bw_candidate;
return candidate;
}
static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur_stream)
{
+ stream_sys_t *p_sys = s->p_sys;
+
assert(hls);
assert(segment);
return VLC_SUCCESS;
}
+ /* sanity check - can we download this segment on time? */
+ if ((p_sys->bandwidth > 0) && (hls->bandwidth > 0))
+ {
+ uint64_t size = (segment->duration * hls->bandwidth); /* bits */
+ int estimated = (int)(size / p_sys->bandwidth);
+ if (estimated > segment->duration)
+ {
+ msg_Warn(s,"downloading of segment %d takes %ds, which is longer than its playback (%ds)",
+ segment->sequence, estimated, segment->duration);
+ }
+ }
+
mtime_t start = mdate();
- if (AccessDownload(s, segment) != VLC_SUCCESS)
+ if (hls_Download(s, segment) != VLC_SUCCESS)
{
+ msg_Err(s, "downloaded segment %d from stream %d failed",
+ segment->sequence, *cur_stream);
vlc_mutex_unlock(&segment->lock);
return VLC_EGENERIC;
}
vlc_mutex_unlock(&segment->lock);
- uint64_t bw = (segment->size * 8) / (duration/1000); /* bits / ms */
- if (hls->bandwidth != bw)
+ msg_Info(s, "downloaded segment %d from stream %d",
+ segment->sequence, *cur_stream);
+
+ /* check for division by zero */
+ double ms = (double)duration / 1000.0; /* ms */
+ if (ms <= 0.0)
+ return VLC_SUCCESS;
+
+ uint64_t bw = ((double)(segment->size * 8) / ms) * 1000; /* bits / s */
+ p_sys->bandwidth = bw;
+ if (p_sys->b_meta && (hls->bandwidth != bw))
{
int newstream = BandwidthAdaptation(s, hls->id, &bw);
+
+ /* FIXME: we need an average here */
if ((newstream >= 0) && (newstream != *cur_stream))
{
- msg_Info(s, "switching to %s bandwidth (%"PRIu64") stream",
- (hls->bandwidth <= bw) ? "faster" : "lower", bw);
+ msg_Info(s, "detected %s bandwidth (%"PRIu64") stream",
+ (bw >= hls->bandwidth) ? "faster" : "lower", bw);
*cur_stream = newstream;
}
}
return VLC_SUCCESS;
}
-static void* hls_Thread(vlc_object_t *p_this)
+static void* hls_Thread(void *p_this)
{
- hls_thread_t *client = (hls_thread_t *) p_this;
- stream_t *s = client->s;
+ stream_t *s = (stream_t *)p_this;
stream_sys_t *p_sys = s->p_sys;
int canc = vlc_savecancel();
- while (vlc_object_alive(p_this))
+ while (vlc_object_alive(s))
{
- hls_stream_t *hls = hls_Get(client->hls_stream, client->current);
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->download.stream);
assert(hls);
+ /* Sliding window (~60 seconds worth of movie) */
vlc_mutex_lock(&hls->lock);
- segment_t *segment = segment_GetSegment(hls, hls->segment);
- if (segment) hls->segment++;
+ int count = vlc_array_count(hls->segments);
vlc_mutex_unlock(&hls->lock);
/* Is there a new segment to process? */
- if (segment == NULL)
+ if ((!p_sys->b_live && (p_sys->playback.segment < (count - 6))) ||
+ (p_sys->download.segment >= count))
{
- if (!p_sys->b_live) break;
- mwait(p_sys->wakeup);
+ /* wait */
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ while (((p_sys->download.segment - p_sys->playback.segment > 6) ||
+ (p_sys->download.segment >= count)) &&
+ (p_sys->download.seek == -1))
+ {
+ vlc_cond_wait(&p_sys->download.wait, &p_sys->download.lock_wait);
+ if (p_sys->b_live /*&& (mdate() >= p_sys->playlist.wakeup)*/)
+ break;
+ if (!vlc_object_alive(s))
+ break;
+ }
+ /* */
+ if (p_sys->download.seek >= 0)
+ {
+ p_sys->download.segment = p_sys->download.seek;
+ p_sys->download.seek = -1;
+ }
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
}
- else if (Download(client->s, hls, segment, &client->current) != VLC_SUCCESS)
+
+ if (!vlc_object_alive(s)) break;
+
+ vlc_mutex_lock(&hls->lock);
+ segment_t *segment = segment_GetSegment(hls, p_sys->download.segment);
+ vlc_mutex_unlock(&hls->lock);
+
+ if ((segment != NULL) &&
+ (Download(s, hls, segment, &p_sys->download.stream) != VLC_SUCCESS))
{
- if (!p_sys->b_live) break;
+ if (!vlc_object_alive(s)) break;
+
+ if (!p_sys->b_live)
+ {
+ p_sys->b_error = true;
+ break;
+ }
}
- /* FIXME: Reread the m3u8 index file */
- if (p_sys->b_live)
+ /* download succeeded */
+ /* determine next segment to download */
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ if (p_sys->download.seek >= 0)
+ {
+ p_sys->download.segment = p_sys->download.seek;
+ p_sys->download.seek = -1;
+ }
+ else if (p_sys->download.segment < count)
+ p_sys->download.segment++;
+ vlc_cond_signal(&p_sys->download.wait);
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
+ }
+
+ vlc_restorecancel(canc);
+ return NULL;
+}
+
+static void* hls_Reload(void *p_this)
+{
+ stream_t *s = (stream_t *)p_this;
+ stream_sys_t *p_sys = s->p_sys;
+
+ assert(p_sys->b_live);
+
+ int canc = vlc_savecancel();
+
+ double wait = 0.5;
+ while (vlc_object_alive(s))
+ {
+ mtime_t now = mdate();
+ if (now >= p_sys->playlist.wakeup)
{
- double wait = 1;
- mtime_t now = mdate();
- if (now >= p_sys->wakeup)
+ /* reload the m3u8 */
+ if (hls_ReloadPlaylist(s) != VLC_SUCCESS)
{
-#if 0
- /** FIXME: Implement m3u8 playlist reloading */
- if (!hls_ReloadPlaylist(client->s))
+ /* No change in playlist, then backoff */
+ p_sys->playlist.tries++;
+ if (p_sys->playlist.tries == 1) wait = 0.5;
+ else if (p_sys->playlist.tries == 2) wait = 1;
+ else if (p_sys->playlist.tries >= 3) wait = 2;
+
+ /* Can we afford to backoff? */
+ if (p_sys->download.segment - p_sys->playback.segment < 3)
{
- /* No change in playlist, then backoff */
- p_sys->tries++;
- if (p_sys->tries == 1) wait = 0.5;
- else if (p_sys->tries == 2) wait = 1;
- else if (p_sys->tries >= 3) wait = 3;
+ p_sys->playlist.tries = 0;
+ wait = 0.5;
}
-#endif
- /* determine next time to update playlist */
- p_sys->last = now;
- p_sys->wakeup = now + ((mtime_t)(hls->duration * wait) * (mtime_t)1000000);
}
+ else
+ {
+ p_sys->playlist.tries = 0;
+ wait = 0.5;
+ }
+
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->download.stream);
+ assert(hls);
+
+ /* determine next time to update playlist */
+ p_sys->playlist.last = now;
+ p_sys->playlist.wakeup = now + ((mtime_t)(hls->duration * wait)
+ * (mtime_t)1000000);
}
+
+ mwait(p_sys->playlist.wakeup);
}
vlc_restorecancel(canc);
return NULL;
}
-static int Prefetch(stream_t *s)
+static int Prefetch(stream_t *s, int *current)
{
stream_sys_t *p_sys = s->p_sys;
- int current;
+ int stream;
+ /* Try to pick best matching stream */;
again:
- current = p_sys->current;
+ stream = *current;
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, *current);
if (hls == NULL)
return VLC_EGENERIC;
- segment_t *segment = segment_GetSegment(hls, hls->segment);
+ segment_t *segment = segment_GetSegment(hls, p_sys->download.segment);
if (segment == NULL )
return VLC_EGENERIC;
- if (Download(s, hls, segment, &p_sys->current) != VLC_SUCCESS)
+ if (Download(s, hls, segment, current) != VLC_SUCCESS)
return VLC_EGENERIC;
- /* Bandwidth changed? */
- if (current != p_sys->current)
+ /* Found better bandwidth match, try again */
+ if (*current != stream)
goto again;
+ /* Download first 2 segments of this HLS stream */
+ stream = *current;
+ for (int i = 0; i < 2; i++)
+ {
+ segment_t *segment = segment_GetSegment(hls, p_sys->download.segment);
+ if (segment == NULL )
+ return VLC_EGENERIC;
+
+ if (segment->data)
+ {
+ p_sys->download.segment++;
+ continue;
+ }
+
+ if (Download(s, hls, segment, current) != VLC_SUCCESS)
+ return VLC_EGENERIC;
+
+ p_sys->download.segment++;
+
+ /* adapt bandwidth? */
+ if (*current != stream)
+ {
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, *current);
+ if (hls == NULL)
+ return VLC_EGENERIC;
+
+ stream = *current;
+ }
+ }
+
return VLC_SUCCESS;
}
/****************************************************************************
- * Access
+ *
****************************************************************************/
-static int AccessOpen(stream_t *s, vlc_url_t *url)
+static int hls_Download(stream_t *s, segment_t *segment)
{
- stream_sys_t *p_sys = (stream_sys_t *) s->p_sys;
+ assert(segment);
- if ((url->psz_protocol == NULL) ||
- (url->psz_path == NULL))
+ /* Construct URL */
+ char *psz_url = ConstructUrl(&segment->url);
+ if (psz_url == NULL)
+ return VLC_ENOMEM;
+
+ stream_t *p_ts = stream_UrlNew(s, psz_url);
+ free(psz_url);
+ if (p_ts == NULL)
return VLC_EGENERIC;
- p_sys->p_access = vlc_object_create(s, sizeof(access_t));
- if (p_sys->p_access == NULL)
- return VLC_ENOMEM;
+ segment->size = stream_Size(p_ts);
+ assert(segment->size > 0);
- p_sys->p_access->psz_access = strdup(url->psz_protocol);
- p_sys->p_access->psz_filepath = strdup(url->psz_path);
- if (url->psz_password || url->psz_username)
+ segment->data = block_Alloc(segment->size);
+ if (segment->data == NULL)
{
- if (asprintf(&p_sys->p_access->psz_location, "%s:%s@%s%s",
- url->psz_username, url->psz_password,
- url->psz_host, url->psz_path) < 0)
- {
- msg_Err(s, "creating http access module");
- goto fail;
- }
+ stream_Delete(p_ts);
+ return VLC_ENOMEM;
}
- else
+
+ assert(segment->data->i_buffer == segment->size);
+
+ ssize_t length = 0, curlen = 0;
+ uint64_t size;
+ do
{
- if (asprintf(&p_sys->p_access->psz_location, "%s%s",
- url->psz_host, url->psz_path) < 0)
+ size = stream_Size(p_ts);
+ if (size > segment->size)
{
- msg_Err(s, "creating http access module");
- goto fail;
+ msg_Dbg(s, "size changed %"PRIu64, segment->size);
+ block_t *p_block = block_Realloc(segment->data, 0, size);
+ if (p_block == NULL)
+ {
+ stream_Delete(p_ts);
+ block_Release(segment->data);
+ segment->data = NULL;
+ return VLC_ENOMEM;
+ }
+ segment->data = p_block;
+ segment->size = size;
+ assert(segment->data->i_buffer == segment->size);
+ p_block = NULL;
}
- }
- vlc_object_attach(p_sys->p_access, s);
- p_sys->p_access->p_module =
- module_need(p_sys->p_access, "access", "http", true);
- if (p_sys->p_access->p_module == NULL)
- {
- msg_Err(s, "could not load http access module");
- goto fail;
- }
+ length = stream_Read(p_ts, segment->data->p_buffer + curlen, segment->size - curlen);
+ if (length <= 0)
+ break;
+ curlen += length;
+ } while (vlc_object_alive(s));
+ stream_Delete(p_ts);
return VLC_SUCCESS;
-
-fail:
- vlc_object_release(p_sys->p_access);
- p_sys->p_access = NULL;
- return VLC_EGENERIC;
}
-static void AccessClose(stream_t *s)
+/* Read M3U8 file */
+static ssize_t read_M3U8_from_stream(stream_t *s, uint8_t **buffer)
{
- stream_sys_t *p_sys = (stream_sys_t *) s->p_sys;
+ int64_t total_bytes = 0;
+ int64_t total_allocated = 0;
+ uint8_t *p = NULL;
- if (p_sys->p_access)
+ while (1)
{
- vlc_object_kill(p_sys->p_access);
- free(p_sys->p_access->psz_access);
- if (p_sys->p_access->p_module)
- module_unneed(p_sys->p_access,
- p_sys->p_access->p_module);
-
- vlc_object_release(p_sys->p_access);
- p_sys->p_access = NULL;
- }
-}
-
-static char *AccessReadLine(access_t *p_access, uint8_t *psz_tmp, size_t i_len)
-{
- char *line = NULL;
- char *begin = (char *)psz_tmp;
+ char buf[4096];
+ int64_t bytes;
- assert(psz_tmp);
-
- int skip = strlen(begin);
- ssize_t len = p_access->pf_read(p_access, psz_tmp + skip, i_len - skip);
- if (len < 0) return NULL;
- if ((len == 0) && (skip == 0))
- return NULL;
+ bytes = stream_Read(s, buf, sizeof(buf));
+ if (bytes == 0)
+ break; /* EOF ? */
+ else if (bytes < 0)
+ return bytes;
- char *p = begin;
- char *end = p + len + skip;
+ if ( (total_bytes + bytes + 1) > total_allocated )
+ {
+ if (total_allocated)
+ total_allocated *= 2;
+ else
+ total_allocated = __MIN(bytes+1, sizeof(buf));
- while (p < end)
- {
- if (*p == '\n')
- break;
+ p = realloc_or_free(p, total_allocated);
+ if (p == NULL)
+ return VLC_ENOMEM;
+ }
- p++;
+ memcpy(p+total_bytes, buf, bytes);
+ total_bytes += bytes;
}
- /* EOL */
- line = calloc(1, p - begin + 1);
- if (line == NULL)
- return NULL;
- /* copy line excluding \n */
- line = strndup(begin, p - begin);
+ if (total_allocated == 0)
+ return VLC_EGENERIC;
- p++;
- if (p < end)
- {
- psz_tmp = memmove(begin, p, end - p);
- psz_tmp[end - p] = '\0';
- }
- else memset(psz_tmp, 0, i_len);
+ p[total_bytes] = '\0';
+ *buffer = p;
- return line;
+ return total_bytes;
}
-static int AccessDownload(stream_t *s, segment_t *segment)
+static ssize_t read_M3U8_from_url(stream_t *s, vlc_url_t *url, uint8_t **buffer)
{
- stream_sys_t *p_sys = (stream_sys_t *) s->p_sys;
+ assert(*buffer == NULL);
- assert(segment);
+ /* Construct URL */
+ char *psz_url = ConstructUrl(url);
+ if (psz_url == NULL)
+ return VLC_ENOMEM;
- /* Download new playlist file from server */
- if (AccessOpen(s, &segment->url) != VLC_SUCCESS)
+ stream_t *p_m3u8 = stream_UrlNew(s, psz_url);
+ free(psz_url);
+ if (p_m3u8 == NULL)
return VLC_EGENERIC;
- segment->size = p_sys->p_access->info.i_size;
- assert(segment->size > 0);
+ ssize_t size = read_M3U8_from_stream(p_m3u8, buffer);
+ stream_Delete(p_m3u8);
- segment->data = block_Alloc(segment->size);
- if (segment->data == NULL)
+ return size;
+}
+
+static char *ReadLine(uint8_t *buffer, uint8_t **pos, const size_t len)
+{
+ assert(buffer);
+
+ char *line = NULL;
+ uint8_t *begin = buffer;
+ uint8_t *p = begin;
+ uint8_t *end = p + len;
+
+ while (p < end)
{
- AccessClose(s);
- return VLC_ENOMEM;
+ if ((*p == '\n') || (*p == '\0'))
+ break;
+ p++;
}
- assert(segment->data->i_buffer == segment->size);
+ /* copy line excluding \n or \0 */
+ line = strndup((char *)begin, p - begin);
- ssize_t length = 0, curlen = 0;
- do
+ if (*p == '\0')
+ *pos = end;
+ else
{
- if (p_sys->p_access->info.i_size > segment->size)
- {
- msg_Dbg(s, "size changed %"PRIu64, segment->size);
- segment->data = block_Realloc(segment->data, 0, p_sys->p_access->info.i_size);
- if (segment->data == NULL)
- {
- AccessClose(s);
- return VLC_ENOMEM;
- }
- segment->size = p_sys->p_access->info.i_size;
- assert(segment->data->i_buffer == segment->size);
- }
- length = p_sys->p_access->pf_read(p_sys->p_access,
- segment->data->p_buffer + curlen, segment->size - curlen);
- if ((length <= 0) || ((uint64_t)length >= segment->size))
- break;
- curlen += length;
- } while (vlc_object_alive(s));
+ /* next pass start after \n */
+ p++;
+ *pos = p;
+ }
- AccessClose(s);
- return VLC_SUCCESS;
+ return line;
}
/****************************************************************************
if (p_sys == NULL)
return VLC_ENOMEM;
+ char *psz_uri = NULL;
+ if (asprintf(&psz_uri,"%s://%s", s->psz_access, s->psz_path) < 0)
+ {
+ free(p_sys);
+ return VLC_ENOMEM;
+ }
+ vlc_UrlParse(&p_sys->m3u8, psz_uri, 0);
+ free(psz_uri);
+
+ p_sys->bandwidth = -1;
p_sys->b_live = true;
p_sys->b_meta = false;
+ p_sys->b_error = false;
p_sys->hls_stream = vlc_array_new();
if (p_sys->hls_stream == NULL)
{
+ vlc_UrlClean(&p_sys->m3u8);
free(p_sys);
return VLC_ENOMEM;
}
s->pf_peek = Peek;
s->pf_control = Control;
- /* Select first segment to play */
- p_sys->last = mdate();
- if (parse_HTTPLiveStreaming(s) != VLC_SUCCESS)
+ /* Parse HLS m3u8 content. */
+ uint8_t *buffer = NULL;
+ ssize_t len = read_M3U8_from_stream(s->p_source, &buffer);
+ if (len < 0)
+ goto fail;
+ if (parse_M3U8(s, p_sys->hls_stream, buffer, len) != VLC_SUCCESS)
{
+ free(buffer);
goto fail;
}
+ free(buffer);
- /* */
- p_sys->segment = 0;
- p_sys->current = 0;
+ /* Choose first HLS stream to start with */
+ int current = p_sys->playback.stream = 0;
+ p_sys->playback.segment = p_sys->download.segment = ChooseSegment(s, current);
- if (Prefetch(s) != VLC_SUCCESS)
+ if (p_sys->b_live && (p_sys->playback.segment < 0))
{
- msg_Err(s, "fetching first segment.");
- goto fail;
+ msg_Warn(s, "less data than 3 times 'target duration' available for live playback, playback may stall");
}
- p_sys->thread = vlc_object_create(s, sizeof(hls_thread_t));
- if( p_sys->thread == NULL )
+ if (Prefetch(s, ¤t) != VLC_SUCCESS)
{
- msg_Err(s, "creating HTTP Live Streaming client thread");
+ msg_Err(s, "fetching first segment failed.");
goto fail;
}
- p_sys->thread->hls_stream = p_sys->hls_stream;
- p_sys->thread->current = p_sys->current;
- p_sys->thread->s = s;
- if (vlc_thread_create(p_sys->thread, "HTTP Live Streaming client",
- hls_Thread, VLC_THREAD_PRIORITY_INPUT))
+ p_sys->download.stream = current;
+ p_sys->playback.stream = current;
+ p_sys->download.seek = -1;
+
+ vlc_mutex_init(&p_sys->download.lock_wait);
+ vlc_cond_init(&p_sys->download.wait);
+
+ /* Initialize HLS live stream */
+ if (p_sys->b_live)
{
- goto fail;
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, current);
+ p_sys->playlist.last = mdate();
+ p_sys->playlist.wakeup = p_sys->playlist.last +
+ ((mtime_t)hls->duration * UINT64_C(1000000));
+
+ if (vlc_clone(&p_sys->reload, hls_Reload, s, VLC_THREAD_PRIORITY_LOW))
+ {
+ goto fail_thread;
+ }
}
- vlc_object_attach(p_sys->thread, s);
+ if (vlc_clone(&p_sys->thread, hls_Thread, s, VLC_THREAD_PRIORITY_INPUT))
+ {
+ if (p_sys->b_live)
+ vlc_join(p_sys->reload, NULL);
+ goto fail_thread;
+ }
return VLC_SUCCESS;
+fail_thread:
+ vlc_mutex_destroy(&p_sys->download.lock_wait);
+ vlc_cond_destroy(&p_sys->download.wait);
+
fail:
- Close(p_this);
+ /* Free hls streams */
+ for (int i = 0; i < vlc_array_count(p_sys->hls_stream); i++)
+ {
+ hls_stream_t *hls;
+ hls = (hls_stream_t *)vlc_array_item_at_index(p_sys->hls_stream, i);
+ if (hls) hls_Free(hls);
+ }
+ vlc_array_destroy(p_sys->hls_stream);
+
+ /* */
+ vlc_UrlClean(&p_sys->m3u8);
+ free(p_sys);
return VLC_EGENERIC;
}
assert(p_sys->hls_stream);
/* */
- if (p_sys->thread)
- {
- vlc_object_kill(p_sys->thread);
- vlc_thread_join(p_sys->thread);
- vlc_object_release(p_sys->thread);
- }
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ vlc_cond_signal(&p_sys->download.wait);
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
+
+ /* */
+ if (p_sys->b_live)
+ vlc_join(p_sys->reload, NULL);
+ vlc_join(p_sys->thread, NULL);
+ vlc_mutex_destroy(&p_sys->download.lock_wait);
+ vlc_cond_destroy(&p_sys->download.wait);
/* Free hls streams */
for (int i = 0; i < vlc_array_count(p_sys->hls_stream); i++)
vlc_array_destroy(p_sys->hls_stream);
/* */
+ vlc_UrlClean(&p_sys->m3u8);
+ if (p_sys->peeked)
+ block_Release (p_sys->peeked);
free(p_sys);
}
/****************************************************************************
* Stream filters functions
****************************************************************************/
-static segment_t *NextSegment(stream_t *s)
+static segment_t *GetSegment(stream_t *s)
{
stream_sys_t *p_sys = s->p_sys;
- segment_t *segment;
+ segment_t *segment = NULL;
- do
+ /* Is this segment of the current HLS stream ready? */
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->playback.stream);
+ if (hls != NULL)
{
- /* Is the next segment ready */
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
- if (hls == NULL) return NULL;
-
- segment = segment_GetSegment(hls, p_sys->segment);
- if (segment == NULL) return NULL;
-
- /* This segment is ready? */
- if (segment->data != NULL)
- return segment;
+ vlc_mutex_lock(&hls->lock);
+ segment = segment_GetSegment(hls, p_sys->playback.segment);
+ if (segment != NULL)
+ {
+ /* This segment is ready? */
+ if (segment->data != NULL)
+ {
+ p_sys->b_cache = hls->b_cache;
+ vlc_mutex_unlock(&hls->lock);
+ goto check;
+ }
+ }
+ vlc_mutex_unlock(&hls->lock);
+ }
- /* Was the stream changed to another bitrate? */
- if (!p_sys->b_meta) return NULL;
+ /* Was the HLS stream changed to another bitrate? */
+ int i_stream = 0;
+ segment = NULL;
+ while(vlc_object_alive(s))
+ {
+ /* Is the next segment ready */
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, i_stream);
+ if (hls == NULL)
+ return NULL;
- if (p_sys->current != p_sys->thread->current)
+ vlc_mutex_lock(&hls->lock);
+ segment = segment_GetSegment(hls, p_sys->playback.segment);
+ if (segment == NULL)
{
- /* YES it was */
- p_sys->current = p_sys->thread->current;
+ vlc_mutex_unlock(&hls->lock);
+ break;
}
- else
+
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ int i_segment = p_sys->download.segment;
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
+
+ /* This segment is ready? */
+ if ((segment->data != NULL) &&
+ (p_sys->playback.segment < i_segment))
{
-#if 0
- /* Not downloaded yet, do it here */
- if (Download(s, hls, segment, &p_sys->current) != VLC_SUCCESS)
- return segment;
- else
-#endif
- return NULL;
+ p_sys->playback.stream = i_stream;
+ p_sys->b_cache = hls->b_cache;
+ vlc_mutex_unlock(&hls->lock);
+ goto check;
}
+ vlc_mutex_unlock(&hls->lock);
+
+ if (!p_sys->b_meta)
+ break;
+
+ /* Was the stream changed to another bitrate? */
+ i_stream++;
+ if (i_stream >= vlc_array_count(p_sys->hls_stream))
+ break;
}
- while(vlc_object_alive(s));
+ /* */
+ return NULL;
+
+check:
+ /* sanity check */
+ if (segment->data->i_buffer == 0)
+ {
+ vlc_mutex_lock(&hls->lock);
+ int count = vlc_array_count(hls->segments);
+ vlc_mutex_unlock(&hls->lock);
+ if ((p_sys->download.segment - p_sys->playback.segment == 0) &&
+ ((count != p_sys->download.segment) || p_sys->b_live))
+ msg_Err(s, "playback will stall");
+ else if ((p_sys->download.segment - p_sys->playback.segment < 3) &&
+ ((count != p_sys->download.segment) || p_sys->b_live))
+ msg_Warn(s, "playback in danger of stalling");
+ }
return segment;
}
/* Determine next segment to read. If this is a meta playlist and
* bandwidth conditions changed, then the stream might have switched
* to another bandwidth. */
- segment_t *segment = NextSegment(s);
+ segment_t *segment = GetSegment(s);
if (segment == NULL)
break;
vlc_mutex_lock(&segment->lock);
if (segment->data->i_buffer == 0)
{
- if (!p_sys->b_cache)
+ if (!p_sys->b_cache || p_sys->b_live)
{
block_Release(segment->data);
segment->data = NULL;
}
- msg_Dbg(s, "switching to segment %d", p_sys->segment);
- p_sys->segment++;
+ else
+ { /* reset playback pointer to start of buffer */
+ uint64_t size = segment->size - segment->data->i_buffer;
+ if (size > 0)
+ {
+ segment->data->i_buffer += size;
+ segment->data->p_buffer -= size;
+ }
+ }
+ p_sys->playback.segment++;
vlc_mutex_unlock(&segment->lock);
+
+ /* signal download thread */
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ vlc_cond_signal(&p_sys->download.wait);
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
continue;
}
+ if (segment->size == segment->data->i_buffer)
+ msg_Info(s, "playing segment %d from stream %d",
+ segment->sequence, p_sys->playback.stream);
+
ssize_t len = -1;
if (i_read <= segment->data->i_buffer)
len = i_read;
assert(p_sys->hls_stream);
+ if (p_sys->b_error)
+ return 0;
+
if (buffer == NULL)
{
/* caller skips data, get big enough buffer */
if (length < 0)
return 0;
- p_sys->offset += length;
+ p_sys->playback.offset += length;
return length;
}
static int Peek(stream_t *s, const uint8_t **pp_peek, unsigned int i_peek)
{
stream_sys_t *p_sys = s->p_sys;
- size_t curlen = 0;
+ segment_t *segment;
+ unsigned int len = i_peek;
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
- if (hls == NULL)
- return 0;
+ segment = GetSegment(s);
+ if (segment == NULL)
+ {
+ msg_Err(s, "segment %d should have been available (stream %d)",
+ p_sys->playback.segment, p_sys->playback.stream);
+ return 0; /* eof? */
+ }
- int peek_segment = p_sys->segment;
- do
+ vlc_mutex_lock(&segment->lock);
+
+ size_t i_buff = segment->data->i_buffer;
+ uint8_t *p_buff = segment->data->p_buffer;
+
+ if (i_peek < i_buff)
{
- segment_t *segment = segment_GetSegment(hls, peek_segment);
- if (segment == NULL) return 0;
+ *pp_peek = p_buff;
+ vlc_mutex_unlock(&segment->lock);
+ return i_peek;
+ }
- vlc_mutex_lock(&segment->lock);
- if (i_peek < segment->data->i_buffer)
- {
- *pp_peek = segment->data->p_buffer;
- curlen += i_peek;
- }
- else
+ else /* This will seldom be run */
+ {
+ /* remember segment to read */
+ int peek_segment = p_sys->playback.segment;
+ size_t curlen = 0;
+ segment_t *nsegment;
+ p_sys->playback.segment++;
+ block_t *peeked = p_sys->peeked;
+
+ if (peeked == NULL)
+ peeked = block_Alloc (i_peek);
+ else if (peeked->i_buffer < i_peek)
+ peeked = block_Realloc (peeked, 0, i_peek);
+ if (peeked == NULL)
+ return 0;
+
+ memcpy(peeked->p_buffer, p_buff, i_buff);
+ curlen = i_buff;
+ len -= i_buff;
+ vlc_mutex_unlock(&segment->lock);
+
+ i_buff = peeked->i_buffer;
+ p_buff = peeked->p_buffer;
+ *pp_peek = p_buff;
+
+ while ((curlen < i_peek) && vlc_object_alive(s))
{
- peek_segment++;
+ nsegment = GetSegment(s);
+ if (nsegment == NULL)
+ {
+ msg_Err(s, "segment %d should have been available (stream %d)",
+ p_sys->playback.segment, p_sys->playback.stream);
+ /* restore segment to read */
+ p_sys->playback.segment = peek_segment;
+ return curlen; /* eof? */
+ }
+
+ vlc_mutex_lock(&nsegment->lock);
+
+ if (len < nsegment->data->i_buffer)
+ {
+ memcpy(p_buff + curlen, nsegment->data->p_buffer, len);
+ curlen += len;
+ }
+ else
+ {
+ size_t i_nbuff = nsegment->data->i_buffer;
+ memcpy(p_buff + curlen, nsegment->data->p_buffer, i_nbuff);
+ curlen += i_nbuff;
+ len -= i_nbuff;
+
+ p_sys->playback.segment++;
+ }
+
+ vlc_mutex_unlock(&nsegment->lock);
}
- vlc_mutex_unlock(&segment->lock);
- } while ((curlen < i_peek) && vlc_object_alive(s));
- return curlen;
+ /* restore segment to read */
+ p_sys->playback.segment = peek_segment;
+ return curlen;
+ }
}
static bool hls_MaySeek(stream_t *s)
if (p_sys->hls_stream == NULL)
return false;
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->playback.stream);
if (hls == NULL) return false;
if (p_sys->b_live)
{
- int count = vlc_array_count(hls->segments);
- vlc_mutex_lock(&hls->lock);
- bool may_seek = (hls->segment < count - 2);
- vlc_mutex_unlock(&hls->lock);
- return may_seek;
+ vlc_mutex_lock(&hls->lock);
+ int count = vlc_array_count(hls->segments);
+ vlc_mutex_unlock(&hls->lock);
+
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ bool may_seek = (p_sys->download.segment < (count - 2));
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
+ return may_seek;
}
return true;
}
if (p_sys->b_live)
return 0;
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->playback.stream);
if (hls == NULL) return 0;
- /* FIXME: Stream size is not entirely exacts at this point */
- uint64_t length = 0UL;
- int count = vlc_array_count(hls->segments);
- for (int n = 0; n < count; n++)
- {
- segment_t *segment = segment_GetSegment(hls, n);
- if (segment)
- {
- length += (segment->size > 0) ? segment->size :
- (segment->length * hls->bandwidth);
- }
- }
- return length;
+ vlc_mutex_lock(&hls->lock);
+ uint64_t size = hls->size;
+ vlc_mutex_unlock(&hls->lock);
+
+ return size;
}
-static int segment_Seek(stream_t *s, uint64_t pos)
+static int segment_Seek(stream_t *s, const uint64_t pos)
{
stream_sys_t *p_sys = s->p_sys;
- /* Find the right offset */
- hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
+ hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->playback.stream);
if (hls == NULL)
return VLC_EGENERIC;
- uint64_t length = 0;
- bool b_found = false;
+ vlc_mutex_lock(&hls->lock);
+ bool b_found = false;
+ uint64_t length = 0;
+ uint64_t size = hls->size;
int count = vlc_array_count(hls->segments);
+
for (int n = 0; n < count; n++)
{
- /* FIXME: Seeking in segments not dowloaded is not supported. */
- if (n >= hls->segment)
+ segment_t *segment = vlc_array_item_at_index(hls->segments, n);
+ if (segment == NULL)
{
- msg_Err(s, "seeking in segment not downloaded yet.");
+ vlc_mutex_unlock(&hls->lock);
return VLC_EGENERIC;
}
- segment_t *segment = vlc_array_item_at_index(hls->segments, n);
+ vlc_mutex_lock(&segment->lock);
+ length += segment->duration * (hls->bandwidth/8);
+ vlc_mutex_unlock(&segment->lock);
+
+ if (!b_found && (pos <= length))
+ {
+ if (count - n >= 3)
+ {
+ p_sys->playback.segment = n;
+ b_found = true;
+ break;
+ }
+ /* Do not search in last 3 segments */
+ vlc_mutex_unlock(&hls->lock);
+ return VLC_EGENERIC;
+ }
+ }
+
+ /* */
+ if (!b_found && (pos >= size))
+ {
+ p_sys->playback.segment = count - 1;
+ b_found = true;
+ }
+
+ /* */
+ if (b_found)
+ {
+ /* restore segment to start position */
+ segment_t *segment = segment_GetSegment(hls, p_sys->playback.segment);
if (segment == NULL)
+ {
+ vlc_mutex_unlock(&hls->lock);
return VLC_EGENERIC;
+ }
vlc_mutex_lock(&segment->lock);
- length += segment->size;
- uint64_t size = segment->size -segment->data->i_buffer;
- if (size > 0)
+ if (segment->data)
{
- segment->data->i_buffer += size;
- segment->data->p_buffer -= size;
+ uint64_t size = segment->size -segment->data->i_buffer;
+ if (size > 0)
+ {
+ segment->data->i_buffer += size;
+ segment->data->p_buffer -= size;
+ }
}
+ vlc_mutex_unlock(&segment->lock);
- if (!b_found && (pos <= length))
- {
- uint64_t used = length - pos;
- segment->data->i_buffer -= used;
- segment->data->p_buffer += used;
+ /* start download at current playback segment */
+ vlc_mutex_unlock(&hls->lock);
- count = p_sys->segment;
- p_sys->segment = n;
- b_found = true;
+ /* Wake up download thread */
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ p_sys->download.seek = p_sys->playback.segment;
+ vlc_cond_signal(&p_sys->download.wait);
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
+
+ /* Wait for download to be finished */
+ vlc_mutex_lock(&p_sys->download.lock_wait);
+ msg_Info(s, "seek to segment %d", p_sys->playback.segment);
+ while (((p_sys->download.seek != -1) ||
+ (p_sys->download.segment - p_sys->playback.segment < 3)) &&
+ (p_sys->download.segment < (count - 6)))
+ {
+ vlc_cond_wait(&p_sys->download.wait, &p_sys->download.lock_wait);
+ if (!vlc_object_alive(s) || s->b_error) break;
}
- vlc_mutex_unlock(&segment->lock);
+ vlc_mutex_unlock(&p_sys->download.lock_wait);
+
+ return VLC_SUCCESS;
}
- return VLC_SUCCESS;
+ vlc_mutex_unlock(&hls->lock);
+
+ return b_found ? VLC_SUCCESS : VLC_EGENERIC;
}
static int Control(stream_t *s, int i_query, va_list args)
switch (i_query)
{
case STREAM_CAN_SEEK:
- case STREAM_CAN_FASTSEEK:
*(va_arg (args, bool *)) = hls_MaySeek(s);
break;
case STREAM_GET_POSITION:
- *(va_arg (args, uint64_t *)) = p_sys->offset;
+ *(va_arg (args, uint64_t *)) = p_sys->playback.offset;
break;
case STREAM_SET_POSITION:
if (hls_MaySeek(s))
uint64_t pos = (uint64_t)va_arg(args, uint64_t);
if (segment_Seek(s, pos) == VLC_SUCCESS)
{
- p_sys->offset = pos;
+ p_sys->playback.offset = pos;
break;
}
}
projects / vlc / blobdiff