From patchwork Thu Nov 29 18:28:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 11235 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B811244BFDC for ; Thu, 29 Nov 2018 20:28:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 626A0689BB3; Thu, 29 Nov 2018 20:28:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 643A0689B90 for ; Thu, 29 Nov 2018 20:28:32 +0200 (EET) Received: by mail-lf1-f66.google.com with SMTP id f23so2172363lfc.13 for ; Thu, 29 Nov 2018 10:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WpzOlMs5Z/ymnqxMUKJgyMk+dbpJidHHZSYx3pRFrmI=; b=f5yt0ubbXyv9BvctzJQfUHXyP0kpEmrBk8UyplJ2PthIsQgY2voftgAvtiCzlVrCd0 2hZurJ5fSALvvCWBICH+nRn3FUSZKIbhqKVeFNOM7kplxo9o+0TIcLHxih/2sfPUyJ/1 Fj+iwjsR9yQQ9QKrC2/M3adK/JapYLowm7yAkHSSU6yBQGqLpztaAg+ham3OSYPcB+lR KZAaLNXF6SApEHgpgYlwIY3ZMP5/oPs3LrpukYA5dpgmiQVNnWJ3NU4yy9gqevZZqumb hz13KffCmhmsDDZTA2dlFN+6uqu6w+ji/Lb6HmuJcPkgLRf8tLOoEp4t8lJ92sJ7/SLi cJcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WpzOlMs5Z/ymnqxMUKJgyMk+dbpJidHHZSYx3pRFrmI=; b=kh8cNonjiJ+OVjxZKoyiyVJcpZePZns/tvrwE+CwewvEpZgGexTvUjL4kGB0P64QWY ld+zeqdoxccU8GKtzmJesAtGF+Uh8HbUqVSHeDnTqdwUD75ojql9oJTntibPhSiD37gp 7wkFIefVItxF3uz4T08SUzRA99XOc46BW4U+2FvW7+aX2TyAg1tcvESX5F2GFTlyqQFx QQDGyUKOE/fw7e/NApdPLUho9MIGEGT5pTDxtDksWi5HA0a/ONgdCdrXeg5ahiWuLpD2 QK1kTw1EAMoE2hi9FRnPR3cmAiyaZktVVFKTqO9+6ym/uxHvHTx6caG6vqyqY7jbKDLt pd3A== X-Gm-Message-State: AA+aEWa7NoS8nZ397cykHimLOfk3oGD26Zt4i/38HjPzb+9HyLvbwBU1 uCr5YkZWL+Te2CU+p9M7tmUSWntu X-Google-Smtp-Source: AFSGD/VGjhnpu9lEYHv2P0jvH2N95q9jBVdXDu/9yIbcdURb6g5XwmU4FVS/FWDZL/hOG0BgxGhGKw== X-Received: by 2002:a19:280f:: with SMTP id o15mr1732809lfo.0.1543516117215; Thu, 29 Nov 2018 10:28:37 -0800 (PST) Received: from localhost.localdomain (broadband-37-110-31-10.ip.moscow.rt.ru. [37.110.31.10]) by smtp.gmail.com with ESMTPSA id g17sm424247lfg.78.2018.11.29.10.28.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 10:28:36 -0800 (PST) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Nov 2018 21:28:32 +0300 Message-Id: <20181129182832.13771-1-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavf/dashenc: Write media trailers when DASH trailer is written. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andrey Semashev Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit ensures that all (potentially, long) filesystem activity is performed when the user calls av_write_trailer on the DASH libavformat context, not when freeing the context. Also, this defers media segment deletion until after the media trailers are written. --- libavformat/dashenc.c | 82 ++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 24 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 6ce70e0076..ecfd84a32c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -424,8 +424,6 @@ static void dash_free(AVFormatContext *s) return; for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; - if (os->ctx && os->ctx_inited) - av_write_trailer(os->ctx); if (os->ctx && os->ctx->pb) ffio_free_dyn_buf(&os->ctx->pb); ff_format_io_close(s, &os->out); @@ -1331,6 +1329,47 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { } } +static int dashenc_delete_segment_file(AVFormatContext *s, const char* file) +{ + DASHContext *c = s->priv_data; + size_t dirname_len, file_len; + char filename[1024]; + + dirname_len = strlen(c->dirname); + if (dirname_len >= sizeof(filename)) { + av_log(s, AV_LOG_WARNING, "Cannot delete segments as the directory path is too long: %"PRIu64" characters: %s\n", + (uint64_t)dirname_len, c->dirname); + return AVERROR(ENAMETOOLONG); + } + + memcpy(filename, c->dirname, dirname_len); + + file_len = strlen(file); + if ((dirname_len + file_len) >= sizeof(filename)) { + av_log(s, AV_LOG_WARNING, "Cannot delete segments as the path is too long: %"PRIu64" characters: %s%s\n", + (uint64_t)(dirname_len + file_len), c->dirname, file); + return AVERROR(ENAMETOOLONG); + } + + memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero + dashenc_delete_file(s, filename); + + return 0; +} + +static inline void dashenc_delete_media_segments(AVFormatContext *s, OutputStream *os, int remove_count) +{ + for (int i = 0; i < remove_count; ++i) { + dashenc_delete_segment_file(s, os->segments[i]->file); + + // Delete the segment regardless of whether the file was successfully deleted + av_free(os->segments[i]); + } + + os->nb_segments -= remove_count; + memmove(os->segments, os->segments + remove_count, os->nb_segments * sizeof(*os->segments)); +} + static int dash_flush(AVFormatContext *s, int final, int stream) { DASHContext *c = s->priv_data; @@ -1420,23 +1459,12 @@ static int dash_flush(AVFormatContext *s, int final, int stream) os->pos += range_length; } - if (c->window_size || (final && c->remove_at_exit)) { + if (c->window_size) { for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; - int j; - int remove = os->nb_segments - c->window_size - c->extra_window_size; - if (final && c->remove_at_exit) - remove = os->nb_segments; - if (remove > 0) { - for (j = 0; j < remove; j++) { - char filename[1024]; - snprintf(filename, sizeof(filename), "%s%s", c->dirname, os->segments[j]->file); - dashenc_delete_file(s, filename); - av_free(os->segments[j]); - } - os->nb_segments -= remove; - memmove(os->segments, os->segments + remove, os->nb_segments * sizeof(*os->segments)); - } + int remove_count = os->nb_segments - c->window_size - c->extra_window_size; + if (remove_count > 0) + dashenc_delete_media_segments(s, os, remove_count); } } @@ -1584,6 +1612,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) static int dash_write_trailer(AVFormatContext *s) { DASHContext *c = s->priv_data; + int i; if (s->nb_streams > 0) { OutputStream *os = &c->streams[0]; @@ -1599,14 +1628,19 @@ static int dash_write_trailer(AVFormatContext *s) } dash_flush(s, 1, -1); - if (c->remove_at_exit) { - char filename[1024]; - int i; - for (i = 0; i < s->nb_streams; i++) { - OutputStream *os = &c->streams[i]; - snprintf(filename, sizeof(filename), "%s%s", c->dirname, os->initfile); - dashenc_delete_file(s, filename); + for (i = 0; i < s->nb_streams; ++i) { + OutputStream *os = &c->streams[i]; + if (os->ctx && os->ctx_inited) { + av_write_trailer(os->ctx); + } + + if (c->remove_at_exit) { + dashenc_delete_media_segments(s, os, os->nb_segments); + dashenc_delete_segment_file(s, os->initfile); } + } + + if (c->remove_at_exit) { dashenc_delete_file(s, s->url); }