From patchwork Wed Nov 28 11:43:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 11206 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 D2AA444DE76 for ; Wed, 28 Nov 2018 13:43:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73B4168A6C6; Wed, 28 Nov 2018 13:43:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05963689F1F for ; Wed, 28 Nov 2018 13:43:41 +0200 (EET) Received: by mail-lj1-f194.google.com with SMTP id 83-v6so23114682ljf.10 for ; Wed, 28 Nov 2018 03:43:46 -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=GlU9QQTD8wwjaNAXopTpjkFslPtQqWNEdIrzbZ4Lawc=; b=nxuFvzby8O0m0OqTAbRsFvcFSvSIZ6QidRFrqset8InoaBeqLXoJHuWqXU6t372rC5 AbujBlfE0IMytvSSJYH1HWVo2pOEg5nJupunugDQtltfGFYR8FH7FUgpxpa6kDTt3PiU ZgcZB6cfQaonlkrKkFM7+iCCivuQ7zD8lMm9K8/THj2pbwgBTSFxnjR0ZInRkrRSzfLd iUBV3EyT8REXhew1QW4lKqSqIpP1kHo4zExLzknxRsspmAvgl5cJJw4T6byLvOzgfSa4 BT35Qvy5hANvAwLMG1gKGrjVOAIS+07lTVZpYuN7pffLJE46atoWeLRsyurj8RXlKnm9 4KXA== 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=GlU9QQTD8wwjaNAXopTpjkFslPtQqWNEdIrzbZ4Lawc=; b=bApC734Nzu5CsRtjKEo5MKG58tzs78E2PByJiHC6QGKm4olT/4PyyFtCgFtEcxp/5p XmUvDHPTGea+K/C8XrGvkdvQoGlVnnP9wA8q+mBbF/gJ6czvF4NjNIgXKnq07+7LE+nu lwWCF5Z6QjSEsIZ585IJ/Y8zhhLidqy1fBIo0DqdQmIO/ntzIj1AOjXY2fEp3DicEIfJ hySa2SEOPjhseW6lPr/MvCBxba/xH0leWzRJtx6uuukOCqbfwurnH6S/R0nDZXb5yvHN 7nbrRzKbp+cJWCJ+0HDzVLJ4aQvV95wb/2FtWpJuSXwAMtcFhDGclAAW+se3Jc8IopSc lI2w== X-Gm-Message-State: AA+aEWYLXCPqIrhiAEBe+7NTTBa9wTE6DUVBzw0Q3XpRMAIwjBzo/lEj Z3HSNPnOhTlGesleyTICy91+oacm X-Google-Smtp-Source: AFSGD/Xg5WCDFlDcIaKE+QdXLYiu+kiu/2ESxnc7RAFEnqWkWlM4wgDPt0BmtUINjUdbPKvypejisA== X-Received: by 2002:a2e:302:: with SMTP id 2-v6mr21736554ljd.137.1543405425531; Wed, 28 Nov 2018 03:43:45 -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 k14sm1169197lfc.70.2018.11.28.03.43.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 03:43:44 -0800 (PST) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Nov 2018 14:43:42 +0300 Message-Id: <20181128114342.16961-1-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 6ce70e0076..e1c959dc89 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); @@ -1420,13 +1418,11 @@ 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]; @@ -1599,11 +1595,24 @@ static int dash_write_trailer(AVFormatContext *s) } dash_flush(s, 1, -1); + for (int 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) { char filename[1024]; int i; for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; + for (int j = 0; j < os->nb_segments; ++j) { + 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 = 0; snprintf(filename, sizeof(filename), "%s%s", c->dirname, os->initfile); dashenc_delete_file(s, filename); }