AVIOContext *playlist_pb;
} HLSContext;
-static void free_segment_list(struct playlist *pls)
+static void free_segment_dynarray(struct segment **segments, int n_segments)
{
int i;
- for (i = 0; i < pls->n_segments; i++) {
- av_freep(&pls->segments[i]->key);
- av_freep(&pls->segments[i]->url);
- av_freep(&pls->segments[i]);
+ for (i = 0; i < n_segments; i++) {
+ av_freep(&segments[i]->key);
+ av_freep(&segments[i]->url);
+ av_freep(&segments[i]);
}
+}
+
+static void free_segment_list(struct playlist *pls)
+{
+ free_segment_dynarray(pls->segments, pls->n_segments);
av_freep(&pls->segments);
pls->n_segments = 0;
}
} else if (ret < 0) {
if (ret != AVERROR_EOF)
av_log(s, AV_LOG_WARNING,
- "keepalive request failed for '%s', retrying with new connection: %s\n",
+ "keepalive request failed for '%s' when opening url, retrying with new connection: %s\n",
url, av_err2str(ret));
ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp);
}
char tmp_str[MAX_URL_SIZE];
struct segment *cur_init_section = NULL;
int is_http = av_strstart(url, "http", NULL);
+ struct segment **prev_segments = NULL;
+ int prev_n_segments = 0;
+ int prev_start_seq_no = -1;
if (is_http && !in && c->http_persistent && c->playlist_pb) {
in = c->playlist_pb;
} else if (ret < 0) {
if (ret != AVERROR_EOF)
av_log(c->ctx, AV_LOG_WARNING,
- "keepalive request failed for '%s', retrying with new connection: %s\n",
+ "keepalive request failed for '%s' when parsing playlist, retrying with new connection: %s\n",
url, av_err2str(ret));
in = NULL;
}
}
if (pls) {
- free_segment_list(pls);
+ prev_start_seq_no = pls->start_seq_no;
+ prev_segments = pls->segments;
+ prev_n_segments = pls->n_segments;
+ pls->segments = NULL;
+ pls->n_segments = 0;
+
pls->finished = 0;
pls->type = PLS_TYPE_UNSPECIFIED;
}
ff_parse_key_value(ptr, (ff_parse_key_val_cb) handle_init_section_args,
&info);
cur_init_section = new_init_section(pls, &info, url);
+ cur_init_section->key_type = key_type;
+ if (has_iv) {
+ memcpy(cur_init_section->iv, iv, sizeof(iv));
+ } else {
+ int seq = pls->start_seq_no + pls->n_segments;
+ memset(cur_init_section->iv, 0, sizeof(cur_init_section->iv));
+ AV_WB32(cur_init_section->iv + 12, seq);
+ }
+
+ if (key_type != KEY_NONE) {
+ ff_make_absolute_url(tmp_str, sizeof(tmp_str), url, key);
+ cur_init_section->key = av_strdup(tmp_str);
+ if (!cur_init_section->key) {
+ av_free(cur_init_section);
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ } else {
+ cur_init_section->key = NULL;
+ }
+
} else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) {
if (pls)
pls->finished = 1;
}
}
}
+ if (prev_segments) {
+ if (pls->start_seq_no > prev_start_seq_no && c->first_timestamp != AV_NOPTS_VALUE) {
+ int64_t prev_timestamp = c->first_timestamp;
+ int i, diff = pls->start_seq_no - prev_start_seq_no;
+ for (i = 0; i < prev_n_segments && i < diff; i++) {
+ c->first_timestamp += prev_segments[i]->duration;
+ }
+ av_log(c->ctx, AV_LOG_DEBUG, "Media sequence change (%d -> %d)"
+ " reflected in first_timestamp: %"PRId64" -> %"PRId64"\n",
+ prev_start_seq_no, pls->start_seq_no,
+ prev_timestamp, c->first_timestamp);
+ } else if (pls->start_seq_no < prev_start_seq_no) {
+ av_log(c->ctx, AV_LOG_WARNING, "Media sequence changed unexpectedly: %d -> %d\n",
+ prev_start_seq_no, pls->start_seq_no);
+ }
+ free_segment_dynarray(prev_segments, prev_n_segments);
+ av_freep(&prev_segments);
+ }
if (pls)
pls->last_load_time = av_gettime_relative();
{
HLSContext *c = s->priv_data;
static const char * const opts[] = {
- "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL };
+ "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL };
const char * const * opt = opts;
uint8_t *buf;
int ret = 0;
/* Open the demuxer for each playlist */
for (i = 0; i < c->n_playlists; i++) {
struct playlist *pls = c->playlists[i];
- AVInputFormat *in_fmt = NULL;
+ ff_const59 AVInputFormat *in_fmt = NULL;
if (!(pls->ctx = avformat_alloc_context())) {
ret = AVERROR(ENOMEM);
return 0;
}
-static int hls_probe(AVProbeData *p)
+static int hls_probe(const AVProbeData *p)
{
/* Require #EXTM3U at the start, and either one of the ones below
* somewhere for a proper match. */
};
static const AVClass hls_class = {
- .class_name = "hls,applehttp",
+ .class_name = "hls demuxer",
.item_name = av_default_item_name,
.option = hls_options,
.version = LIBAVUTIL_VERSION_INT,
};
AVInputFormat ff_hls_demuxer = {
- .name = "hls,applehttp",
+ .name = "hls",
.long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming"),
.priv_class = &hls_class,
.priv_data_size = sizeof(HLSContext),