From c5e7ea13d2d4da0c5da91973a547afff6fe9e011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 3 Nov 2014 21:42:09 +0200 Subject: [PATCH] dashenc: Use delay_moov MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/dashenc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 2a404b6d46..5afc40b1c3 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -626,7 +626,7 @@ static int dash_write_header(AVFormatContext *s) goto fail; os->init_start_pos = 0; - av_dict_set(&opts, "movflags", "frag_custom+dash", 0); + av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0); if ((ret = avformat_write_header(ctx, &opts)) < 0) { goto fail; } @@ -634,13 +634,7 @@ static int dash_write_header(AVFormatContext *s) avio_flush(ctx->pb); av_dict_free(&opts); - if (c->single_file) { - os->init_range_length = avio_tell(ctx->pb); - } else { - ffurl_close(os->out); - os->out = NULL; - } - av_log(s, AV_LOG_VERBOSE, "Representation %d init segment written to: %s\n", i, filename); + av_log(s, AV_LOG_VERBOSE, "Representation %d init segment will be written to: %s\n", i, filename); s->streams[i]->time_base = st->time_base; // If the muxer wants to shift timestamps, request to have them shifted @@ -746,7 +740,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; char filename[1024] = "", full_path[1024], temp_path[1024]; - int64_t start_pos = avio_tell(os->ctx->pb); + int64_t start_pos; int range_length, index_length = 0; if (!os->packets_written) @@ -764,6 +758,17 @@ static int dash_flush(AVFormatContext *s, int final, int stream) continue; } + if (!os->init_range_length) { + av_write_frame(os->ctx, NULL); + os->init_range_length = avio_tell(os->ctx->pb); + if (!c->single_file) { + ffurl_close(os->out); + os->out = NULL; + } + } + + start_pos = avio_tell(os->ctx->pb); + if (!c->single_file) { dash_fill_tmpl_params(filename, sizeof(filename), c->media_seg_name, i, os->segment_index, os->bit_rate, os->start_dts); snprintf(full_path, sizeof(full_path), "%s%s", c->dirname, filename);