From 356ae5f65bd351923e6eda6f35a12bb5f362c6ab Mon Sep 17 00:00:00 2001 From: Andrey Utkin Date: Mon, 26 Dec 2011 21:25:52 +0200 Subject: applehttp: Use the last segment duration as reload interval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to draft-pantos-http-live-streaming-07, 6.3.4, the duration of the last media segment in the playlist should be used as initial minimum reload delay. Signed-off-by: Martin Storsjö --- libavformat/applehttp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libavformat/applehttp.c') diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 6c4d56d305..9ab5927b92 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -377,10 +377,15 @@ static int read_data(void *opaque, uint8_t *buf, int buf_size) restart: if (!v->input) { reload: - /* If this is a live stream and target_duration has elapsed since + /* If this is a live stream and the reload interval has elapsed since * the last playlist reload, reload the variant playlists now. */ + int64_t reload_interval = v->n_segments > 0 ? + v->segments[v->n_segments - 1]->duration : + v->target_duration; + reload_interval *= 1000000; + if (!v->finished && - av_gettime() - v->last_load_time >= v->target_duration*1000000 && + av_gettime() - v->last_load_time >= reload_interval && (ret = parse_playlist(c, v->url, v, NULL)) < 0) return ret; if (v->cur_seq_no < v->start_seq_no) { @@ -392,8 +397,7 @@ reload: if (v->cur_seq_no >= v->start_seq_no + v->n_segments) { if (v->finished) return AVERROR_EOF; - while (av_gettime() - v->last_load_time < - v->target_duration*1000000) { + while (av_gettime() - v->last_load_time < reload_interval) { if (ff_check_interrupt(c->interrupt_callback)) return AVERROR_EXIT; usleep(100*1000); -- cgit v1.2.3