X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_filter%2Fhttplive.c;h=6748ad25ed4275755817a2f5a5d1af40ac27f45e;hb=eb5ab7ff522fd661a73c5f557f5595b35d2ace40;hp=0df42a0928f538601e1a7a38844909ec4a458d40;hpb=18b1e6cb26e04609013c121c85f1164a3e49b274;p=vlc diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c index 0df42a0928..6748ad25ed 100644 --- a/modules/stream_filter/httplive.c +++ b/modules/stream_filter/httplive.c @@ -1,7 +1,7 @@ /***************************************************************************** * httplive.c: HTTP Live Streaming stream filter ***************************************************************************** - * Copyright (C) 2010 M2X BV + * Copyright (C) 2010-2012 M2X BV * $Id$ * * Author: Jean-Paul Saman @@ -28,18 +28,20 @@ # include "config.h" #endif +#include + #include #include #include +#include +#include #include #include #include -#include - -#include -#include +#include +#include /***************************************************************************** * Module descriptor @@ -58,6 +60,7 @@ vlc_module_end() /***************************************************************************** * *****************************************************************************/ +#define AES_BLOCK_SIZE 16 /* Only support AES-128 */ typedef struct segment_s { int sequence; /* unique sequence number */ @@ -65,7 +68,11 @@ typedef struct segment_s uint64_t size; /* segment size in bytes */ uint64_t bandwidth; /* bandwidth usage of segments (bits per second)*/ - vlc_url_t url; + char *url; + char *psz_key_path; /* url key path */ + uint8_t aes_key[16]; /* AES-128 */ + bool b_key_loaded; + vlc_mutex_t lock; block_t *data; /* data */ } segment_t; @@ -75,24 +82,32 @@ typedef struct hls_stream_s int id; /* program id */ int version; /* protocol version should be 1 */ int sequence; /* media sequence number */ - int duration; /* maximum duration per segment (ms) */ + int duration; /* maximum duration per segment (s) */ uint64_t bandwidth; /* bandwidth usage of segments (bits per second)*/ - uint64_t size; /* stream length (segment->duration * hls->bandwidth/8) */ + uint64_t size; /* stream length is calculated by taking the sum + foreach segment of (segment->duration * hls->bandwidth/8) */ vlc_array_t *segments; /* list of segments */ - vlc_url_t url; /* uri to m3u8 */ + char *url; /* uri to m3u8 */ vlc_mutex_t lock; bool b_cache; /* allow caching */ + + char *psz_current_key_path; /* URL path of the encrypted key */ + uint8_t psz_AES_IV[AES_BLOCK_SIZE]; /* IV used when decypher the block */ + bool b_iv_loaded; } hls_stream_t; struct stream_sys_t { - access_t *p_access; /* HTTP access input */ - vlc_url_t m3u8; /* M3U8 url */ + char *m3u8; /* M3U8 url */ + vlc_thread_t reload; /* HLS m3u8 reload thread */ + vlc_thread_t thread; /* HLS segment download thread */ + + block_t *peeked; /* */ - vlc_array_t *hls_stream;/* bandwidth adaptation */ - uint64_t bandwidth; /* measured bandwidth (bits per second) */ + vlc_array_t *hls_stream; /* bandwidth adaptation */ + uint64_t bandwidth; /* measured bandwidth (bits per second) */ /* Download */ struct hls_download_s @@ -125,6 +140,7 @@ struct stream_sys_t bool b_meta; /* meta playlist */ bool b_live; /* live stream? or vod? */ bool b_error; /* parsing error */ + bool b_aesmsg; /* only print one time that the media is encrypted */ }; /**************************************************************************** @@ -134,13 +150,14 @@ static int Read (stream_t *, void *p_read, unsigned int i_read); 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, const char *psz_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); @@ -150,36 +167,61 @@ static void segment_Free(segment_t *segment); ****************************************************************************/ static bool isHTTPLiveStreaming(stream_t *s) { - const uint8_t *peek, *peek_end; + const uint8_t *peek; - int64_t i_size = stream_Peek(s->p_source, &peek, 46); - if (i_size < 1) + int size = stream_Peek(s->p_source, &peek, 46); + if (size < 7) return false; - if (strncasecmp((const char*)peek, "#EXTM3U", 7) != 0) + if (memcmp(peek, "#EXTM3U", 7) != 0) return false; + peek += 7; + size -= 7; + /* Parse stream and search for * EXT-X-TARGETDURATION or EXT-X-STREAM-INF tag, see * http://tools.ietf.org/html/draft-pantos-http-live-streaming-04#page-8 */ - peek_end = peek + i_size; - while(peek <= peek_end) - { - if (*peek == '#') + while (size--) + { + static const char *const ext[] = { + "TARGETDURATION", + "MEDIA-SEQUENCE", + "KEY", + "ALLOW-CACHE", + "ENDLIST", + "STREAM-INF", + "DISCONTINUITY", + "VERSION" + }; + + if (*peek++ != '#') + continue; + + if (size < 6) + continue; + + if (memcmp(peek, "EXT-X-", 6)) + continue; + + peek += 6; + size -= 6; + + for (size_t i = 0; i < ARRAY_SIZE(ext); i++) { - if (strncasecmp((const char*)peek, "#EXT-X-TARGETDURATION", 21) == 0) - return true; - else if (strncasecmp((const char*)peek, "#EXT-X-STREAM-INF", 17) == 0) + size_t len = strlen(ext[i]); + if (size < len) + continue; + if (!memcmp(peek, ext[i], len)) return true; } - peek++; - }; + } return false; } /* 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; @@ -191,7 +233,13 @@ static hls_stream_t *hls_New(vlc_array_t *hls_stream, int id, uint64_t bw, char hls->sequence = 0; /* default is 0 */ hls->version = 1; /* default protocol version */ hls->b_cache = true; - vlc_UrlParse(&hls->url, uri, 0); + hls->url = strdup(uri); + if (hls->url == NULL) + { + free(hls); + return NULL; + } + hls->psz_current_key_path = NULL; hls->segments = vlc_array_new(); vlc_array_append(hls_stream, hls); vlc_mutex_init(&hls->lock); @@ -206,18 +254,46 @@ static void hls_Free(hls_stream_t *hls) { for (int n = 0; n < vlc_array_count(hls->segments); n++) { - segment_t *segment = (segment_t *)vlc_array_item_at_index(hls->segments, n); + segment_t *segment = segment_GetSegment(hls, n); if (segment) segment_Free(segment); } vlc_array_destroy(hls->segments); } - - vlc_UrlClean(&hls->url); + free(hls->url); + free(hls->psz_current_key_path); free(hls); - 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; + dst->psz_current_key_path = src->psz_current_key_path ? + strdup( src->psz_current_key_path ) : NULL; + dst->url = strdup(src->url); + if (dst->url == NULL) + { + free(dst); + return NULL; + } + 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) @@ -229,7 +305,7 @@ static hls_stream_t *hls_Get(vlc_array_t *hls_stream, int wanted) static inline hls_stream_t *hls_GetFirst(vlc_array_t *hls_stream) { - return (hls_stream_t*) hls_Get(hls_stream, 0); + return hls_Get(hls_stream, 0); } static hls_stream_t *hls_GetLast(vlc_array_t *hls_stream) @@ -238,7 +314,7 @@ static hls_stream_t *hls_GetLast(vlc_array_t *hls_stream) if (count <= 0) return NULL; count--; - return (hls_stream_t *) hls_Get(hls_stream, count); + return hls_Get(hls_stream, count); } static hls_stream_t *hls_Find(vlc_array_t *hls_stream, hls_stream_t *hls_new) @@ -246,12 +322,12 @@ 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); + hls_stream_t *hls = hls_Get(hls_stream, n); if (hls) { /* compare */ if ((hls->id == hls_new->id) && - (hls->bandwidth == hls_new->bandwidth)) + ((hls->bandwidth == hls_new->bandwidth)||(hls_new->bandwidth==0))) return hls; } } @@ -265,6 +341,12 @@ static uint64_t hls_GetStreamSize(hls_stream_t *hls) * 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; + + /* If there is no valid bandwidth yet, then there is no point in + * computing stream size. */ + if (hls->bandwidth == 0) + return size; + int count = vlc_array_count(hls->segments); for (int n = 0; n < count; n++) { @@ -278,7 +360,7 @@ static uint64_t hls_GetStreamSize(hls_stream_t *hls) } /* 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) @@ -288,10 +370,19 @@ static segment_t *segment_New(hls_stream_t* hls, int duration, char *uri) segment->size = 0; /* bytes */ segment->sequence = 0; segment->bandwidth = 0; - vlc_UrlParse(&segment->url, uri, 0); + segment->url = strdup(uri); + if (segment->url == NULL) + { + free(segment); + return NULL; + } segment->data = NULL; vlc_array_append(hls->segments, segment); vlc_mutex_init(&segment->lock); + segment->b_key_loaded = false; + segment->psz_key_path = NULL; + if (hls->psz_current_key_path) + segment->psz_key_path = strdup(hls->psz_current_key_path); return segment; } @@ -299,14 +390,14 @@ static void segment_Free(segment_t *segment) { vlc_mutex_destroy(&segment->lock); - vlc_UrlClean(&segment->url); + free(segment->url); + free(segment->psz_key_path); if (segment->data) block_Release(segment->data); free(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); @@ -318,7 +409,7 @@ static segment_t *segment_GetSegment(hls_stream_t *hls, int wanted) return (segment_t *) vlc_array_item_at_index(hls->segments, wanted); } -static segment_t *segment_Find(hls_stream_t *hls, int sequence) +static segment_t *segment_Find(hls_stream_t *hls, const int sequence) { assert(hls); @@ -326,7 +417,7 @@ static segment_t *segment_Find(hls_stream_t *hls, int sequence) if (count <= 0) return NULL; for (int n = 0; n < count; n++) { - segment_t *segment = vlc_array_item_at_index(hls->segments, n); + segment_t *segment = segment_GetSegment(hls, n); if (segment == NULL) break; if (segment->sequence == sequence) return segment; @@ -334,33 +425,48 @@ static segment_t *segment_Find(hls_stream_t *hls, int sequence) return NULL; } -static int live_ChooseSegment(stream_t *s, int current) +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 then + /* Choose a segment to start which is no closer than * 3 times the target duration from the end of the playlist. */ - int wanted = -1; + int wanted = 0; int duration = 0; + int sequence = 0; int count = vlc_array_count(hls->segments); - for (int i = count; i >= 0; i--) + int i = p_sys->b_live ? count - 1 : 0; + + while((i >= 0) && (i < count)) { segment_t *segment = segment_GetSegment(hls, i); - if (segment) + assert(segment); + + if (segment->duration > hls->duration) { - duration += segment->duration; - if (duration >= 3 * hls->duration) - { - /* Start point found */ - wanted = i; - break; - } + 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; } @@ -396,88 +502,128 @@ static char *parse_Attributes(const char *line, const char *attr) return NULL; } -static char *relative_URI(stream_t *s, const char *uri, const char *path) +static int string_to_IV(char *string_hexa, uint8_t iv[AES_BLOCK_SIZE]) { - stream_sys_t *p_sys = s->p_sys; - - char *p = strchr(uri, ':'); - if (p != NULL) - return NULL; - - if (p_sys->m3u8.psz_path == NULL) - return NULL; + unsigned long long iv_hi, iv_lo; + char *end = NULL; + if (*string_hexa++ != '0') + return VLC_EGENERIC; + if (*string_hexa != 'x' && *string_hexa != 'X') + return VLC_EGENERIC; - char *psz_path = strdup(p_sys->m3u8.psz_path); - if (psz_path == NULL) return NULL; - p = strrchr(psz_path, '/'); - if (p) *p = '\0'; + string_hexa++; - char *psz_uri = NULL; - if (p_sys->m3u8.psz_password || p_sys->m3u8.psz_username) - { - 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; + size_t len = strlen(string_hexa); + if (len <= 16) { + iv_hi = 0; + iv_lo = strtoull(string_hexa, &end, 16); + if (end) + return VLC_EGENERIC; + } else { + iv_lo = strtoull(&string_hexa[len-16], NULL, 16); + if (end) + return VLC_EGENERIC; + string_hexa[len-16] = '\0'; + iv_hi = strtoull(string_hexa, NULL, 16); + if (end) + return VLC_EGENERIC; } - 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; + + for (int i = 8; i ; --i) { + iv[ i] = iv_hi & 0xff; + iv[8+i] = iv_lo & 0xff; + iv_hi >>= 8; + iv_lo >>= 8; } - free(psz_path); - return psz_uri; -fail: - free(psz_path); - return NULL; + return VLC_SUCCESS; } -static void parse_SegmentInformation(stream_t *s, hls_stream_t *hls, char *p_read, char *uri) +static char *relative_URI(const char *psz_url, const char *psz_path) { - stream_sys_t *p_sys = s->p_sys; + assert(psz_url != NULL && psz_path != NULL); + //If the path is actually an absolute URL, don't do anything. + if (strncmp(psz_path, "http", 4) == 0) + return NULL; + + char *path_end = strrchr(psz_url, '/'); + if (path_end == NULL) + return NULL; + unsigned int url_length = path_end - psz_url + 1; + char *psz_res = malloc(url_length + strlen(psz_path) + 1); + strncpy(psz_res, psz_url, url_length); + psz_res[url_length] = 0; + strcat(psz_res, psz_path); + return psz_res; +} +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; + char *endptr; + if (hls->version < 3) { - msg_Err(s, "expected #EXTINF:,"); - p_sys->b_error = true; - return; + errno = 0; + value = strtol(token, &endptr, 10); + if (token == endptr || errno == ERANGE) + { + *duration = -1; + return VLC_EGENERIC; + } + *duration = value; } - - char *psz_path = NULL; - if (hls->url.psz_path != NULL) + else { - psz_path = strdup(hls->url.psz_path); - if (psz_path == NULL) + errno = 0; + double d = strtof(token, &endptr); + if (token == endptr || errno == ERANGE) { - p_sys->b_error = true; - return; + *duration = -1; + return VLC_EGENERIC; } - char *p = strrchr(psz_path, '/'); - if (p) *p = '\0'; + if ((d) - ((int)d) >= 0.5) + value = ((int)d) + 1; + else + value = ((int)d); + *duration = value; } - char *psz_uri = relative_URI(s, uri, psz_path); - free(psz_path); + /* Ignore the rest of the line */ + return VLC_SUCCESS; +} + +static int parse_AddSegment(hls_stream_t *hls, const int duration, const char *uri) +{ + assert(hls); + assert(uri); + + /* Store segment information */ vlc_mutex_lock(&hls->lock); + + char *psz_uri = relative_URI(hls->url, uri); + segment_t *segment = segment_New(hls, duration, psz_uri ? psz_uri : uri); if (segment) segment->sequence = hls->sequence + vlc_array_count(hls->segments) - 1; - if (duration > hls->duration) - { - msg_Err(s, "EXTINF:%d duration is larger then EXT-X-TARGETDURATION:%d", - duration, hls->duration); - } + free(psz_uri); + vlc_mutex_unlock(&hls->lock); - free(psz_uri); + return segment ? VLC_SUCCESS : VLC_ENOMEM; } static int parse_TargetDuration(stream_t *s, hls_stream_t *hls, char *p_read) @@ -496,21 +642,20 @@ static int parse_TargetDuration(stream_t *s, hls_stream_t *hls, char *p_read) return VLC_SUCCESS; } -static void parse_StreamInformation(stream_t *s, vlc_array_t **hls_stream, - 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="); - p_sys->b_error = true; - return; + return VLC_EGENERIC; } id = atol(attr); free(attr); @@ -519,8 +664,7 @@ static void parse_StreamInformation(stream_t *s, vlc_array_t **hls_stream, if (attr == NULL) { msg_Err(s, "#EXT-X-STREAM-INF: expected BANDWIDTH="); - p_sys->b_error = true; - return; + return VLC_EGENERIC; } bw = atoll(attr); free(attr); @@ -528,19 +672,18 @@ static void parse_StreamInformation(stream_t *s, vlc_array_t **hls_stream, 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 = relative_URI(s, uri, NULL); + char *psz_uri = relative_URI(s->p_sys->m3u8, uri); - hls_stream_t *hls = hls_New(*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 int parse_MediaSequence(stream_t *s, hls_stream_t *hls, char *p_read) @@ -556,8 +699,18 @@ static int parse_MediaSequence(stream_t *s, hls_stream_t *hls, char *p_read) } if (hls->sequence > 0) - msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist"); - + { + if (s->p_sys->b_live) + { + hls_stream_t *last = hls_GetLast(s->p_sys->hls_stream); + if ((last->sequence < sequence) && (sequence - last->sequence != 1)) + msg_Err(s, "EXT-X-MEDIA-SEQUENCE gap in playlist (new=%d, old=%d)", + sequence, last->sequence); + } + else + msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist (new=%d, old=%d)", + sequence, hls->sequence); + } hls->sequence = sequence; return VLC_SUCCESS; } @@ -577,7 +730,6 @@ static int parse_Key(stream_t *s, hls_stream_t *hls, char *p_read) if (strncasecmp(attr, "NONE", 4) == 0) { - char *uri = parse_Attributes(p_read, "URI"); if (uri != NULL) { @@ -597,6 +749,65 @@ static int parse_Key(stream_t *s, hls_stream_t *hls, char *p_read) free(iv); } } + else if (strncasecmp(attr, "AES-128", 7) == 0) + { + char *value, *uri, *iv; + if (s->p_sys->b_aesmsg == false) + { + msg_Info(s, "playback of AES-128 encrypted HTTP Live media detected."); + s->p_sys->b_aesmsg = true; + } + value = uri = parse_Attributes(p_read, "URI"); + if (value == NULL) + { + msg_Err(s, "#EXT-X-KEY: URI not found for encrypted HTTP Live media in AES-128"); + free(attr); + return VLC_EGENERIC; + } + + /* Url is put between quotes, remove them */ + if (*value == '"') + { + /* We need to strip the "" from the attribute value */ + uri = value + 1; + char* end = strchr(uri, '"'); + if (end != NULL) + *end = 0; + } + hls->psz_current_key_path = strdup(uri); + free(value); + + value = iv = parse_Attributes(p_read, "IV"); + if (iv == NULL) + { + /* + * If the EXT-X-KEY tag does not have the IV attribute, implementations + * MUST use the sequence number of the media file as the IV when + * encrypting or decrypting that media file. The big-endian binary + * representation of the sequence number SHALL be placed in a 16-octet + * buffer and padded (on the left) with zeros. + */ + hls->b_iv_loaded = false; + } + else + { + /* + * If the EXT-X-KEY tag has the IV attribute, implementations MUST use + * the attribute value as the IV when encrypting or decrypting with that + * key. The value MUST be interpreted as a 128-bit hexadecimal number + * and MUST be prefixed with 0x or 0X. + */ + + if (string_to_IV(iv, hls->psz_AES_IV) == VLC_EGENERIC) + { + msg_Err(s, "IV invalid"); + err = VLC_EGENERIC; + } + else + hls->b_iv_loaded = true; + free(value); + } + } else { msg_Warn(s, "playback of encrypted HTTP Live media is not supported."); @@ -643,9 +854,9 @@ static int parse_Version(stream_t *s, hls_stream_t *hls, char *p_read) /* Check version */ hls->version = version; - if (hls->version != 1) + if (hls->version <= 0 || hls->version > 3) { - msg_Err(s, "#EXT-X-VERSION should be version 1 iso %d", version); + msg_Err(s, "#EXT-X-VERSION should be version 1, 2 or 3 iso %d", version); return VLC_EGENERIC; } return VLC_SUCCESS; @@ -669,328 +880,394 @@ static int parse_Discontinuity(stream_t *s, hls_stream_t *hls, char *p_read) return VLC_SUCCESS; } -static void parse_M3U8ExtLine(stream_t *s, hls_stream_t *hls, char *line) +static int hls_CompareStreams( const void* a, const void* b ) { - if (*line == '#') - { - int err = VLC_SUCCESS; - 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); - - if (err != VLC_SUCCESS) - s->p_sys->b_error = true; - } + hls_stream_t* stream_a = *(hls_stream_t**)a; + hls_stream_t* stream_b = *(hls_stream_t**)b; + return stream_a->bandwidth > stream_b->bandwidth; } -#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 - { - parse_SegmentInformation(s, hls, line, uri); - free(uri); - } - } - else - { - parse_M3U8ExtLine(s, hls, line); - } + /* Is it a meta index file ? */ + bool b_meta = (strstr((const char *)buffer, "#EXT-X-STREAM-INF") == NULL) ? false : true; - /* Error during m3u8 parsing abort */ - if (p_sys->b_error) - goto error; + int err = VLC_SUCCESS; - free(line); - } + if (b_meta) + { + msg_Info(s, "Meta playlist"); - free(line); - free(tmp); - AccessClose(s); - return VLC_SUCCESS; + /* 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; -error: - free(line); - free(tmp); - AccessClose(s); - return VLC_EGENERIC; -} + /* */ + if (strncmp(line, "#EXT-X-STREAM-INF", 17) == 0) + { + p_sys->b_meta = true; + char *uri = ReadLine(p_begin, &p_read, p_end - p_begin); + if (uri == NULL) + err = VLC_ENOMEM; + else + { + if (*uri == '#') + { + msg_Info(s, "Skipping invalid stream-inf: %s", uri); + free(uri); + } + 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; + } -static int get_HTTPLiveMetaPlaylist(stream_t *s, vlc_array_t **streams) -{ - stream_sys_t *p_sys = s->p_sys; - assert(*streams); + free(line); + line = NULL; - /* Download new playlist file from server */ - if (AccessOpen(s, &p_sys->m3u8) != VLC_SUCCESS) - return VLC_EGENERIC; + if (p_begin >= p_end) + break; - /* Parse the rest of the reply */ - uint8_t *tmp = calloc(1, HTTPLIVE_MAX_LINE); - if (tmp == NULL) - { - AccessClose(s); - return VLC_ENOMEM; - } + } while (err == VLC_SUCCESS); - 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; } - free(line); - line = NULL; - - for( ; ; ) + else { - line = AccessReadLine(p_sys->p_access, tmp, HTTPLIVE_MAX_LINE); - if (line == NULL) - { - msg_Dbg(s, "end of data"); - break; - } + msg_Info(s, "%s Playlist HLS protocol version: %d", p_sys->b_live ? "Live": "VOD", version); - if (!vlc_object_alive(s)) - goto error; - - /* some more checks for actual data */ - if (strncmp(line, "#EXT-X-STREAM-INF", 17) == 0) - { - p_sys->b_meta = true; - char *uri = AccessReadLine(p_sys->p_access, tmp, HTTPLIVE_MAX_LINE); - if (uri == NULL) - p_sys->b_error = true; - else - { - parse_StreamInformation(s, streams, line, uri); - free(uri); - } - } - else 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 - { - hls_stream_t *hls = hls_GetLast(*streams); - if (hls) - parse_SegmentInformation(s, hls, line, uri); - else - p_sys->b_error = true; - free(uri); - } - } + hls_stream_t *hls = NULL; + if (p_sys->b_meta) + hls = hls_GetLast(streams); else { - hls_stream_t *hls = hls_GetLast(*streams); - if ((hls == NULL) && (!p_sys->b_meta)) + /* No Meta playlist used */ + hls = hls_New(streams, 0, 0, p_sys->m3u8); + if (hls) { - hls = hls_New(*streams, -1, -1, NULL); - if (hls == NULL) + /* Get TARGET-DURATION first */ + p = (uint8_t *)strstr((const char *)buffer, "#EXT-X-TARGETDURATION:"); + if (p) { - p_sys->b_error = true; - return VLC_ENOMEM; + 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; } - parse_M3U8ExtLine(s, hls, line); + 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(hls, segment_duration, line); + segment_duration = -1; /* reset duration */ + } - /* Error during m3u8 parsing abort */ - if (p_sys->b_error) - goto error; + free(line); + line = NULL; + + if (p_begin >= p_end) + break; + + } while (err == VLC_SUCCESS); 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 hls_DownloadSegmentKey(stream_t *s, segment_t *seg) { - stream_sys_t *p_sys = s->p_sys; - char *p_read, *p_begin, *p_end; + stream_t *p_m3u8 = stream_UrlNew(s, seg->psz_key_path); + if (p_m3u8 == NULL) + { + msg_Err(s, "Failed to load the AES key for segment sequence %d", seg->sequence); + return VLC_EGENERIC; + } - assert(p_sys->hls_stream); + int len = stream_Read(p_m3u8, seg->aes_key, sizeof(seg->aes_key)); + stream_Delete(p_m3u8); + if (len != AES_BLOCK_SIZE) + { + msg_Err(s, "The AES key loaded doesn't have the right size (%d)", len); + return VLC_EGENERIC; + } - p_begin = p_read = stream_ReadLine(s->p_source); - if (!p_begin) - return VLC_ENOMEM; + return VLC_SUCCESS; +} - /* */ - int i_len = strlen(p_begin); - p_end = p_read + i_len; +static int hls_ManageSegmentKeys(stream_t *s, hls_stream_t *hls) +{ + segment_t *seg = NULL; + segment_t *prev_seg; + int count = vlc_array_count(hls->segments); - if (strncmp(p_read, "#EXTM3U", 7) != 0) + for (int i = 0; i < count; i++) { - msg_Err(s, "missing #EXTM3U tag .. aborting"); - free(p_begin); - return VLC_EGENERIC; + prev_seg = seg; + seg = segment_GetSegment(hls, i); + if (seg == NULL ) + continue; + if (seg->psz_key_path == NULL) + continue; /* No key to load ? continue */ + if (seg->b_key_loaded) + continue; /* The key is already loaded */ + + /* if the key has not changed, and already available from previous segment, + * try to copy it, and don't load the key */ + if (prev_seg && prev_seg->b_key_loaded && strcmp(seg->psz_key_path, prev_seg->psz_key_path) == 0) + { + memcpy(seg->aes_key, prev_seg->aes_key, AES_BLOCK_SIZE); + seg->b_key_loaded = true; + continue; + } + if (hls_DownloadSegmentKey(s, seg) != VLC_SUCCESS) + return VLC_EGENERIC; + seg->b_key_loaded = true; } + return VLC_SUCCESS; +} - do { - free(p_begin); +static int hls_DecodeSegmentData(stream_t *s, hls_stream_t *hls, segment_t *segment) +{ + /* Did the segment need to be decoded ? */ + if (segment->psz_key_path == NULL) + return VLC_SUCCESS; - if (p_sys->b_error) + /* Do we have loaded the key ? */ + if (!segment->b_key_loaded) + { + /* No ? try to download it now */ + if (hls_ManageSegmentKeys(s, hls) != VLC_SUCCESS) return VLC_EGENERIC; + } - /* Next line */ - p_begin = stream_ReadLine(s->p_source); - if (p_begin == NULL) - break; + /* For now, we only decode AES-128 data */ + gcry_error_t i_gcrypt_err; + gcry_cipher_hd_t aes_ctx; + /* Setup AES */ + i_gcrypt_err = gcry_cipher_open(&aes_ctx, GCRY_CIPHER_AES, + GCRY_CIPHER_MODE_CBC, 0); + if (i_gcrypt_err) + { + msg_Err(s, "gcry_cipher_open failed: %s", gpg_strerror(i_gcrypt_err)); + gcry_cipher_close(aes_ctx); + return VLC_EGENERIC; + } - i_len = strlen(p_begin); - p_read = p_begin; - p_end = p_read + i_len; + /* Set key */ + i_gcrypt_err = gcry_cipher_setkey(aes_ctx, segment->aes_key, + sizeof(segment->aes_key)); + if (i_gcrypt_err) + { + msg_Err(s, "gcry_cipher_setkey failed: %s", gpg_strerror(i_gcrypt_err)); + gcry_cipher_close(aes_ctx); + 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_sys->hls_stream, p_read, uri); - free(uri); - } - } - else if (strncmp(p_read, "#EXTINF", 7) == 0) - { - char *uri = stream_ReadLine(s->p_source); - if (uri == NULL) - p_sys->b_error = true; - else - { - 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); - } - } - else - { - hls_stream_t *hls = hls_GetLast(p_sys->hls_stream); - if (hls == NULL) - { - 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; - } - } - } - /* Parse M3U8 Ext Line */ - parse_M3U8ExtLine(s, hls, p_read); - } - } while(p_read < p_end); + if (hls->b_iv_loaded == false) + { + memset(hls->psz_AES_IV, 0, AES_BLOCK_SIZE); + hls->psz_AES_IV[15] = segment->sequence & 0xff; + hls->psz_AES_IV[14] = (segment->sequence >> 8)& 0xff; + hls->psz_AES_IV[13] = (segment->sequence >> 16)& 0xff; + hls->psz_AES_IV[12] = (segment->sequence >> 24)& 0xff; + } - free(p_begin); + i_gcrypt_err = gcry_cipher_setiv(aes_ctx, hls->psz_AES_IV, + sizeof(hls->psz_AES_IV)); - /* */ - int count = vlc_array_count(p_sys->hls_stream); - for (int n = 0; n < count; n++) + if (i_gcrypt_err) { - hls_stream_t *hls = hls_Get(p_sys->hls_stream, n); - if (hls == NULL) break; + msg_Err(s, "gcry_cipher_setiv failed: %s", gpg_strerror(i_gcrypt_err)); + gcry_cipher_close(aes_ctx); + return VLC_EGENERIC; + } - /* Is it a meta playlist? */ - if (p_sys->b_meta) + i_gcrypt_err = gcry_cipher_decrypt(aes_ctx, + segment->data->p_buffer, /* out */ + segment->data->i_buffer, + NULL, /* in */ + 0); + if (i_gcrypt_err) + { + msg_Err(s, "gcry_cipher_decrypt failed: %s/%s\n", gcry_strsource(i_gcrypt_err), gcry_strerror(i_gcrypt_err)); + gcry_cipher_close(aes_ctx); + return VLC_EGENERIC; + } + gcry_cipher_close(aes_ctx); + /* remove the PKCS#7 padding from the buffer */ + int pad = segment->data->p_buffer[segment->data->i_buffer-1]; + if (pad <= 0 || pad > AES_BLOCK_SIZE) + { + msg_Err(s, "Bad padding character (0x%x), perhaps we failed to decrypt the segment with the correct key", pad); + return VLC_EGENERIC; + } + int count = pad; + while (count--) + { + if (segment->data->p_buffer[segment->data->i_buffer-1-count] != pad) { - 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." ); + msg_Err(s, "Bad ending buffer, perhaps we failed to decrypt the segment with the correct key"); return VLC_EGENERIC; - } } + } - vlc_mutex_lock(&hls->lock); - if (!p_sys->b_live) + /* not all the data is readable because of padding */ + segment->data->i_buffer -= pad; + + return VLC_SUCCESS; +} + +static int get_HTTPLiveMetaPlaylist(stream_t *s, vlc_array_t **streams) +{ + stream_sys_t *p_sys = s->p_sys; + assert(*streams); + int err = VLC_EGENERIC; + + /* 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_Get(p_sys->hls_stream, i); + if (src == NULL) + return VLC_EGENERIC; + + dst = hls_Copy(src, false); + if (dst == NULL) + return VLC_ENOMEM; + vlc_array_append(*streams, dst); + + /* Download playlist file from server */ + uint8_t *buf = NULL; + ssize_t len = read_M3U8_from_url(s, dst->url, &buf); + if (len < 0) + err = VLC_EGENERIC; + else { - /* Stream size (approximate) */ - hls->size = hls_GetStreamSize(hls); + /* Parse HLS m3u8 content. */ + err = parse_M3U8(s, *streams, buf, len); + free(buf); } - vlc_mutex_unlock(&hls->lock); } - - return VLC_SUCCESS; + return err; } /* Reload playlist */ @@ -1000,6 +1277,7 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t * msg_Info(s, "updating hls stream (program-id=%d, bandwidth=%"PRIu64") has %d segments", hls_new->id, hls_new->bandwidth, count); + for (int n = 0; n < count; n++) { segment_t *p = segment_GetSegment(hls_new, n); @@ -1009,17 +1287,45 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t * segment_t *segment = segment_Find(*hls, p->sequence); if (segment) { + vlc_mutex_lock(&segment->lock); + + assert(p->url); + assert(segment->url); + /* they should be the same */ if ((p->sequence != segment->sequence) || (p->duration != segment->duration) || - (strcmp(p->url.psz_path, segment->url.psz_path) != 0)) + (strcmp(p->url, segment->url) != 0)) { - msg_Err(s, "existing segment %d found with different content", - p->sequence); - msg_Err(s, "- sequence: new=%d, old=%d", p->sequence, segment->sequence); - msg_Err(s, "- duration: new=%d, old=%d", p->duration, segment->duration); - msg_Err(s, "- file: new=%s, old=%s", p->url.psz_path, segment->url.psz_path); + 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); + msg_Warn(s, " old=%s", segment->url); + + /* Resetting content */ + segment->sequence = p->sequence; + segment->duration = p->duration; + free(segment->url); + segment->url = strdup(p->url); + if ( segment->url == NULL ) + { + msg_Err(s, "Failed updating segment %d - skipping it", p->sequence); + segment_Free(p); + vlc_mutex_unlock(&segment->lock); + continue; + } + /* We must free the content, because if the key was not downloaded, content can't be decrypted */ + if (segment->data) + { + block_Release(segment->data); + segment->data = NULL; + } + free(segment->psz_key_path); + segment->psz_key_path = p->psz_key_path ? strdup(p->psz_key_path) : NULL; + segment_Free(p); } + vlc_mutex_unlock(&segment->lock); } else { @@ -1027,23 +1333,27 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t * segment_t *l = segment_GetSegment(*hls, last); if (l == NULL) goto fail_and_unlock; - if ((l->sequence + 1) == p->sequence) + if ((l->sequence + 1) != p->sequence) { - vlc_array_append((*hls)->segments, p); - msg_Info(s, "- segment %d appended", p->sequence); - } - else /* there is a gap */ - { - msg_Err(s, "gap in sequence numbers found: new=%d expected old=%d", - p->sequence, l->sequence); - goto fail_and_unlock; + msg_Err(s, "gap in sequence numbers found: new=%d expected %d", + p->sequence, l->sequence+1); } + vlc_array_append((*hls)->segments, p); + msg_Info(s, "- segment %d appended", p->sequence); } vlc_mutex_unlock(&(*hls)->lock); } + + /* update meta information */ + vlc_mutex_lock(&(*hls)->lock); + (*hls)->sequence = hls_new->sequence; + (*hls)->duration = (hls_new->duration == -1) ? (*hls)->duration : hls_new->duration; + (*hls)->b_cache = hls_new->b_cache; + vlc_mutex_unlock(&(*hls)->lock); return VLC_SUCCESS; fail_and_unlock: + assert(0); vlc_mutex_unlock(&(*hls)->lock); return VLC_EGENERIC; } @@ -1057,33 +1367,29 @@ static int hls_ReloadPlaylist(stream_t *s) return VLC_ENOMEM; msg_Info(s, "Reloading HLS live meta playlist"); - if (get_HTTPLiveMetaPlaylist(s, &hls_streams) != VLC_SUCCESS) - goto fail; - - int count = vlc_array_count(hls_streams); - /* Is it a meta playlist? */ - if (p_sys->b_meta) + if (get_HTTPLiveMetaPlaylist(s, &hls_streams) != VLC_SUCCESS) { - for (int n = 0; n < count; n++) + /* Free hls streams */ + for (int i = 0; i < vlc_array_count(hls_streams); i++) { - hls_stream_t *hls = hls_Get(hls_streams, n); - if (hls == NULL) goto fail; - - msg_Info(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." ); - goto fail; - } + hls_stream_t *hls; + hls = hls_Get(hls_streams, i); + if (hls) hls_Free(hls); } + 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) goto fail; + if (hls_new == NULL) + continue; hls_stream_t *hls_old = hls_Find(p_sys->hls_stream, hls_new); if (hls_old == NULL) @@ -1093,16 +1399,11 @@ static int hls_ReloadPlaylist(stream_t *s) hls_new->id, hls_new->bandwidth); } else if (hls_UpdatePlaylist(s, hls_new, &hls_old) != VLC_SUCCESS) - goto fail; + 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; - -fail: - msg_Err(s, "reloading playlist failed"); - vlc_array_destroy(hls_streams); - return VLC_EGENERIC; } /**************************************************************************** @@ -1138,8 +1439,10 @@ static int BandwidthAdaptation(stream_t *s, int progid, uint64_t *bandwidth) return candidate; } -static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur_stream) +static int hls_DownloadSegmentData(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); @@ -1152,27 +1455,38 @@ static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur } /* sanity check - can we download this segment on time? */ - if (s->p_sys->bandwidth > 0) + if ((p_sys->bandwidth > 0) && (hls->bandwidth > 0)) { uint64_t size = (segment->duration * hls->bandwidth); /* bits */ - int estimated = (int)(size / s->p_sys->bandwidth); + int estimated = (int)(size / p_sys->bandwidth); if (estimated > segment->duration) { - msg_Err(s, "cannot quarantee smooth playback"); - msg_Warn(s,"downloading of segment %d takes %ds, which is longer then its playback (%ds)", + msg_Warn(s,"downloading of segment %d takes %ds, which is longer than its playback (%ds)", segment->sequence, estimated, segment->duration); - vlc_mutex_unlock(&segment->lock); - return VLC_EGENERIC; } } 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; } mtime_t duration = mdate() - start; + if (hls->bandwidth == 0 && segment->duration > 0) + { + /* Try to estimate the bandwidth for this stream */ + hls->bandwidth = (uint64_t)(((double)segment->size * 8) / ((double)segment->duration)); + } + + /* If the segment is encrypted, decode it */ + if (hls_DecodeSegmentData(s, hls, segment) != VLC_SUCCESS) + { + vlc_mutex_unlock(&segment->lock); + return VLC_EGENERIC; + } vlc_mutex_unlock(&segment->lock); @@ -1185,8 +1499,8 @@ static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur return VLC_SUCCESS; uint64_t bw = ((double)(segment->size * 8) / ms) * 1000; /* bits / s */ - s->p_sys->bandwidth = bw; - if (hls->bandwidth != bw) + p_sys->bandwidth = bw; + if (p_sys->b_meta && (hls->bandwidth != bw)) { int newstream = BandwidthAdaptation(s, hls->id, &bw); @@ -1201,7 +1515,7 @@ static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur return VLC_SUCCESS; } -static void* hls_Thread(vlc_object_t *p_this) +static void* hls_Thread(void *p_this) { stream_t *s = (stream_t *)p_this; stream_sys_t *p_sys = s->p_sys; @@ -1228,10 +1542,11 @@ static void* hls_Thread(vlc_object_t *p_this) (p_sys->download.segment >= count)) && (p_sys->download.seek == -1)) { - if (p_sys->b_live && (mdate() >= p_sys->playlist.wakeup)) - break; vlc_cond_wait(&p_sys->download.wait, &p_sys->download.lock_wait); - if (!vlc_object_alive(s)) break; + if (p_sys->b_live /*&& (mdate() >= p_sys->playlist.wakeup)*/) + break; + if (!vlc_object_alive(s)) + break; } /* */ if (p_sys->download.seek >= 0) @@ -1244,38 +1559,12 @@ static void* hls_Thread(vlc_object_t *p_this) if (!vlc_object_alive(s)) break; - /* reload the m3u8 index file */ - if (p_sys->b_live) - { - double wait = 1; - mtime_t now = mdate(); - if (now >= p_sys->playlist.wakeup) - { - if (hls_ReloadPlaylist(s) != VLC_SUCCESS) - { - /* 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 = 3; - } - else p_sys->playlist.tries = 0; - - /* determine next time to update playlist */ - p_sys->playlist.last = now; - p_sys->playlist.wakeup = now + ((mtime_t)(hls->duration * wait) - * (mtime_t)1000000); - } - - 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)) + (hls_DownloadSegmentData(s, hls, segment, &p_sys->download.stream) != VLC_SUCCESS)) { if (!vlc_object_alive(s)) break; @@ -1304,45 +1593,84 @@ static void* hls_Thread(vlc_object_t *p_this) return NULL; } -static int Prefetch(stream_t *s, int *current) +static void* hls_Reload(void *p_this) { + stream_t *s = (stream_t *)p_this; stream_sys_t *p_sys = s->p_sys; - int stream; - /* Try to pick best matching stream */ -again: - stream = *current; + assert(p_sys->b_live); - hls_stream_t *hls = hls_Get(p_sys->hls_stream, *current); - if (hls == NULL) - return VLC_EGENERIC; + int canc = vlc_savecancel(); - segment_t *segment = segment_GetSegment(hls, p_sys->download.segment); - if (segment == NULL ) - return VLC_EGENERIC; + double wait = 0.5; + while (vlc_object_alive(s)) + { + mtime_t now = mdate(); + if (now >= p_sys->playlist.wakeup) + { + /* reload the m3u8 */ + if (hls_ReloadPlaylist(s) != VLC_SUCCESS) + { + /* 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) + { + p_sys->playlist.tries = 0; + wait = 0.5; + } + } + else + { + p_sys->playlist.tries = 0; + wait = 0.5; + } - if (Download(s, hls, segment, current) != VLC_SUCCESS) - return VLC_EGENERIC; + 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; +} - /* Found better bandwidth match, try again */ - if (*current != stream) - goto again; +static int Prefetch(stream_t *s, int *current) +{ + stream_sys_t *p_sys = s->p_sys; + int stream = *current; + + hls_stream_t *hls = hls_Get(p_sys->hls_stream, stream); + if (hls == NULL) + return VLC_EGENERIC; /* 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; + /* It is useless to lock the segment here, as Prefetch is called before + download and playlit thread are started. */ if (segment->data) { p_sys->download.segment++; continue; } - if (Download(s, hls, segment, current) != VLC_SUCCESS) + if (hls_DownloadSegmentData(s, hls, segment, current) != VLC_SUCCESS) return VLC_EGENERIC; p_sys->download.segment++; @@ -1362,168 +1690,152 @@ again: } /**************************************************************************** - * 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)) + stream_t *p_ts = stream_UrlNew(s, segment->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); - if (url->i_port <= 0) + segment->data = block_Alloc(segment->size); + if (segment->data == NULL) { - if (strncmp(url->psz_protocol, "https", 5) == 0) - url->i_port = 443; - else - url->i_port = 80; + stream_Delete(p_ts); + return VLC_ENOMEM; } - 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) - { - if (asprintf(&p_sys->p_access->psz_location, "%s:%s@%s:%d%s", - url->psz_username, url->psz_password, - url->psz_host, url->i_port, url->psz_path) < 0) - { - msg_Err(s, "creating http access module"); - goto fail; - } - } - 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:%d%s", - url->psz_host, url->i_port, 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", p_sys->p_access->psz_access, 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; - - assert(psz_tmp); + char buf[4096]; + int64_t bytes; - 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((uint64_t)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; } - /* 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, const char* psz_url, uint8_t **buffer) { - stream_sys_t *p_sys = (stream_sys_t *) s->p_sys; - - assert(segment); + assert(*buffer == NULL); - /* Download new playlist file from server */ - if (AccessOpen(s, &segment->url) != VLC_SUCCESS) + /* Construct URL */ + stream_t *p_m3u8 = stream_UrlNew(s, 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 == '\r') || (*p == '\n') || (*p == '\0')) + break; + p++; } - assert(segment->data->i_buffer == segment->size); + /* copy line excluding \r \n or \0 */ + line = strndup((char *)begin, p - begin); - ssize_t length = 0, curlen = 0; - do + while ((*p == '\r') || (*p == '\n') || (*p == '\0')) { - if (p_sys->p_access->info.i_size > segment->size) + if (*p == '\0') { - 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)) + *pos = end; break; - curlen += length; - } while (vlc_object_alive(s)); + } + else + { + /* next pass start after \r and \n */ + p++; + *pos = p; + } + } - AccessClose(s); - return VLC_SUCCESS; + return line; } /**************************************************************************** @@ -1539,6 +1851,9 @@ static int Open(vlc_object_t *p_this) msg_Info(p_this, "HTTP Live Streaming (%s)", s->psz_path); + /* Initialize crypto bit */ + vlc_gcrypt_init(); + /* */ s->p_sys = p_sys = calloc(1, sizeof(*p_sys)); if (p_sys == NULL) @@ -1550,10 +1865,19 @@ static int Open(vlc_object_t *p_this) free(p_sys); return VLC_ENOMEM; } - vlc_UrlParse(&p_sys->m3u8, psz_uri, 0); - free(psz_uri); + p_sys->m3u8 = psz_uri; - p_sys->bandwidth = -1; + char *new_path; + if (asprintf(&new_path, "%s.ts", s->psz_path) < 0) + { + free(p_sys->m3u8); + free(p_sys); + return VLC_ENOMEM; + } + free(s->psz_path); + s->psz_path = new_path; + + p_sys->bandwidth = 0; p_sys->b_live = true; p_sys->b_meta = false; p_sys->b_error = false; @@ -1561,7 +1885,7 @@ static int Open(vlc_object_t *p_this) p_sys->hls_stream = vlc_array_new(); if (p_sys->hls_stream == NULL) { - vlc_UrlClean(&p_sys->m3u8); + free(p_sys->m3u8); free(p_sys); return VLC_ENOMEM; } @@ -1571,27 +1895,47 @@ static int Open(vlc_object_t *p_this) s->pf_peek = Peek; s->pf_control = Control; - /* Select first segment to play */ - 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); + /* HLS standard doesn't provide any guaranty about streams + being sorted by bandwidth, so we sort them */ + qsort( p_sys->hls_stream->pp_elems, p_sys->hls_stream->i_count, + sizeof( hls_stream_t* ), &hls_CompareStreams ); /* Choose first HLS stream to start with */ int current = p_sys->playback.stream = 0; - p_sys->playback.segment = p_sys->download.segment = - p_sys->b_live ? live_ChooseSegment(s, current) : 0; + p_sys->playback.segment = p_sys->download.segment = ChooseSegment(s, current); + + /* manage encryption key if needed */ + hls_ManageSegmentKeys(s, hls_Get(p_sys->hls_stream, current)); if (p_sys->b_live && (p_sys->playback.segment < 0)) { - msg_Err(s, "not enough data available for live playback, try again later"); - goto fail; + msg_Warn(s, "less data than 3 times 'target duration' available for live playback, playback may stall"); } if (Prefetch(s, ¤t) != VLC_SUCCESS) { - msg_Err(s, "fetching first segment."); + msg_Err(s, "fetching first segment failed."); goto fail; } + 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) { @@ -1599,18 +1943,17 @@ static int Open(vlc_object_t *p_this) p_sys->playlist.last = mdate(); p_sys->playlist.wakeup = p_sys->playlist.last + ((mtime_t)hls->duration * UINT64_C(1000000)); - } - - 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); + if (vlc_clone(&p_sys->reload, hls_Reload, s, VLC_THREAD_PRIORITY_LOW)) + { + goto fail_thread; + } + } - if (vlc_thread_create(s, "HTTP Live Streaming client", - hls_Thread, VLC_THREAD_PRIORITY_INPUT)) + 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; } @@ -1624,14 +1967,13 @@ fail: /* 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); + hls_stream_t *hls = hls_Get(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->m3u8); free(p_sys); return VLC_EGENERIC; } @@ -1652,21 +1994,24 @@ static void Close(vlc_object_t *p_this) vlc_mutex_unlock(&p_sys->download.lock_wait); /* */ - vlc_thread_join(s); + 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++) { - hls_stream_t *hls; - hls = (hls_stream_t *)vlc_array_item_at_index(p_sys->hls_stream, i); + hls_stream_t *hls = hls_Get(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->m3u8); + if (p_sys->peeked) + block_Release (p_sys->peeked); free(p_sys); } @@ -1686,21 +2031,23 @@ static segment_t *GetSegment(stream_t *s) segment = segment_GetSegment(hls, p_sys->playback.segment); if (segment != NULL) { + vlc_mutex_lock(&segment->lock); /* This segment is ready? */ if (segment->data != NULL) { + vlc_mutex_unlock(&segment->lock); p_sys->b_cache = hls->b_cache; vlc_mutex_unlock(&hls->lock); goto check; } + vlc_mutex_unlock(&segment->lock); } vlc_mutex_unlock(&hls->lock); } /* Was the HLS stream changed to another bitrate? */ - int i_stream = 0; segment = NULL; - while(vlc_object_alive(s)) + for (int i_stream = 0; i_stream < vlc_array_count(p_sys->hls_stream); i_stream++) { /* Is the next segment ready */ hls_stream_t *hls = hls_Get(p_sys->hls_stream, i_stream); @@ -1719,30 +2066,29 @@ static segment_t *GetSegment(stream_t *s) int i_segment = p_sys->download.segment; vlc_mutex_unlock(&p_sys->download.lock_wait); + vlc_mutex_lock(&segment->lock); /* This segment is ready? */ if ((segment->data != NULL) && (p_sys->playback.segment < i_segment)) { p_sys->playback.stream = i_stream; p_sys->b_cache = hls->b_cache; + vlc_mutex_unlock(&segment->lock); vlc_mutex_unlock(&hls->lock); goto check; } + vlc_mutex_unlock(&segment->lock); 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; } /* */ return NULL; check: /* sanity check */ + assert(segment->data); if (segment->data->i_buffer == 0) { vlc_mutex_lock(&hls->lock); @@ -1759,10 +2105,25 @@ check: return segment; } +static int segment_RestorePos(segment_t *segment) +{ + if (segment->data) + { + uint64_t size = segment->size - segment->data->i_buffer; + if (size > 0) + { + segment->data->i_buffer += size; + segment->data->p_buffer -= size; + } + } + return VLC_SUCCESS; +} + +/* p_read might be NULL if caller wants to skip data */ static ssize_t hls_Read(stream_t *s, uint8_t *p_read, unsigned int i_read) { stream_sys_t *p_sys = s->p_sys; - ssize_t copied = 0; + ssize_t used = 0; do { @@ -1782,14 +2143,8 @@ static ssize_t hls_Read(stream_t *s, uint8_t *p_read, unsigned int i_read) segment->data = NULL; } 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; - } - } + segment_RestorePos(segment); + p_sys->playback.segment++; vlc_mutex_unlock(&segment->lock); @@ -1812,17 +2167,18 @@ static ssize_t hls_Read(stream_t *s, uint8_t *p_read, unsigned int i_read) if (len > 0) { - memcpy(p_read + copied, segment->data->p_buffer, len); + if (p_read) /* if NULL, then caller skips data */ + memcpy(p_read + used, segment->data->p_buffer, len); segment->data->i_buffer -= len; segment->data->p_buffer += len; - copied += len; + used += len; i_read -= len; } vlc_mutex_unlock(&segment->lock); - } while ((i_read > 0) && vlc_object_alive(s)); + } while (i_read > 0); - return copied; + return used; } static int Read(stream_t *s, void *buffer, unsigned int i_read) @@ -1835,15 +2191,7 @@ static int Read(stream_t *s, void *buffer, unsigned int i_read) if (p_sys->b_error) return 0; - if (buffer == NULL) - { - /* caller skips data, get big enough buffer */ - msg_Warn(s, "buffer is NULL (allocate %d)", i_read); - buffer = calloc(1, i_read); - if (buffer == NULL) - return 0; /* NO MEMORY left*/ - } - + /* NOTE: buffer might be NULL if caller wants to skip data */ length = hls_Read(s, (uint8_t*) buffer, i_read); if (length < 0) return 0; @@ -1855,10 +2203,9 @@ static int Read(stream_t *s, void *buffer, unsigned int i_read) 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; -again: segment = GetSegment(s); if (segment == NULL) { @@ -1869,29 +2216,78 @@ again: vlc_mutex_lock(&segment->lock); - /* remember segment to peek */ - int peek_segment = p_sys->playback.segment; - do + size_t i_buff = segment->data->i_buffer; + uint8_t *p_buff = segment->data->p_buffer; + + if (i_peek < i_buff) { - if (i_peek < segment->data->i_buffer) - { - *pp_peek = segment->data->p_buffer; - curlen += i_peek; - } - else + *pp_peek = p_buff; + vlc_mutex_unlock(&segment->lock); + return i_peek; + } + + 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; + p_sys->peeked = peeked; + + 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) { - p_sys->playback.segment++; - vlc_mutex_unlock(&segment->lock); - goto again; - } - } while ((curlen < i_peek) && vlc_object_alive(s)); + 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? */ + } - /* restore segment to read */ - p_sys->playback.segment = peek_segment; + vlc_mutex_lock(&nsegment->lock); - vlc_mutex_unlock(&segment->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); + } - return curlen; + /* restore segment to read */ + p_sys->playback.segment = peek_segment; + return curlen; + } } static bool hls_MaySeek(stream_t *s) @@ -1929,13 +2325,15 @@ static uint64_t GetStreamSize(stream_t *s) if (hls == NULL) return 0; vlc_mutex_lock(&hls->lock); + if (hls->size == 0) + hls->size = hls_GetStreamSize(hls); 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; @@ -1950,9 +2348,20 @@ static int segment_Seek(stream_t *s, uint64_t pos) uint64_t size = hls->size; int count = vlc_array_count(hls->segments); + /* restore current 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); + segment_RestorePos(segment); + vlc_mutex_unlock(&segment->lock); + for (int n = 0; n < count; n++) { - segment_t *segment = vlc_array_item_at_index(hls->segments, n); + segment_t *segment = segment_GetSegment(hls, n); if (segment == NULL) { vlc_mutex_unlock(&hls->lock); @@ -1963,7 +2372,7 @@ static int segment_Seek(stream_t *s, uint64_t pos) length += segment->duration * (hls->bandwidth/8); vlc_mutex_unlock(&segment->lock); - if (!b_found && (pos <= length)) + if (pos <= length) { if (count - n >= 3) { @@ -1996,15 +2405,7 @@ static int segment_Seek(stream_t *s, uint64_t pos) } vlc_mutex_lock(&segment->lock); - if (segment->data) - { - uint64_t size = segment->size -segment->data->i_buffer; - if (size > 0) - { - segment->data->i_buffer += size; - segment->data->p_buffer -= size; - } - } + segment_RestorePos(segment); vlc_mutex_unlock(&segment->lock); /* start download at current playback segment */ @@ -2014,14 +2415,12 @@ static int segment_Seek(stream_t *s, uint64_t pos) 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))) + while ((p_sys->download.seek != -1) || + ((p_sys->download.segment - p_sys->playback.segment < 3) && + (p_sys->download.segment < count))) { vlc_cond_wait(&p_sys->download.wait, &p_sys->download.lock_wait); if (!vlc_object_alive(s) || s->b_error) break; @@ -2042,7 +2441,6 @@ 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: