From patchwork Tue Feb 1 11:58:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Zwell X-Patchwork-Id: 33973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp550721iov; Tue, 1 Feb 2022 03:58:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1WTZjaPN+WJT2TwmYtHI8GGCF2yFCudW5RyKZsF4Opt6eu68klW/TJW7JNQsHpkVgp9rl X-Received: by 2002:a17:907:a40a:: with SMTP id sg10mr21334955ejc.44.1643716733810; Tue, 01 Feb 2022 03:58:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643716733; cv=none; d=google.com; s=arc-20160816; b=HV8jFNb+BxJex30NmR6F5mwEf3wATJb4SOVUCrM+T9ge8Bjdt5PfOv8+Kns7jL2IL8 Ki/lFTEttjEaiIrPFggfMV4MA+h1iu/bIVyMF14N683f01RMHzTp4+pT6tS6a4OfxXJS KL/h2XbcMw1w7I6NddH9vkXCTxulDylOBXBWTv8XnIddoUYQq3k53GgCJ3VMJyUMDOj2 vdNmcm1oywiAhFayhGsD+PT4/Xg5e0S1rDhOgkpYDHg4bQQU/v3M+VsFMzOElZhHhGIl q4IeDM9PEfatJ4jUvU2moDHNjADatW3lveyI0Ge91nLnJcgAw4z2jaSI4b0Sy8F03HBh DBWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=zktq7SbqkiVePWOUyUxPU+N/F89xVnjpszIM3qujFeM=; b=ggJ1JbsmTbO4RrNC9u/dwp7Rp6f2X/rG5QMzR87E5e8npoplmSfMZfwCnWsORiujUe VTIjGUF+qaE0VFWQ9cS6s/HCeauiDx1H9hrB6U8PNEeFquLuHj2Wzk76YoO9WLbjeMr1 0dCIn7bO87tGxebwmNnYJpxjUuu1hwoXjvYc9ItQBru3piBQOPVkCk121nMV9D4kVvEB Gfp6AqaB6n7gOhUSNXHBiDMC1ISrbt9maFdXZ9WabVLcsX5LNJUSZXn9C0RyDqxmSB9e 0rUjN+8/cZZtXuI/97r2zl6U0e6+bIFlN+2fpBrz78zgxO72YS2DKMNA9QsN8DkQu39F +RZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zwell-net.20210112.gappssmtp.com header.s=20210112 header.b=LoOhb5Iz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 13si8654108ejj.673.2022.02.01.03.58.52; Tue, 01 Feb 2022 03:58:53 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zwell-net.20210112.gappssmtp.com header.s=20210112 header.b=LoOhb5Iz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F94A68A8D9; Tue, 1 Feb 2022 13:58:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA94368B23A for ; Tue, 1 Feb 2022 13:58:42 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id j16so15196324plx.4 for ; Tue, 01 Feb 2022 03:58:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zwell-net.20210112.gappssmtp.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:from:subject:to :content-language:content-transfer-encoding; bh=PVVbQF9lZKzCBqXLTiHDqOfMCrlkwCFppUULga4+wbc=; b=LoOhb5IzH+FQk2hryAqFAa01cz6Qd9R43DewkIBX3xN9+yfYA3NBh4bCzR8L8SzxE9 drZ5wXy2c8k1fV+dmFZ9G3LC0PVBYDIZeQqB7xz9dE2VD/Pt3eykYiSHQAIPRAfVcwmE sJjz9ZdQHOwIHDUA2GISNeL54OCF9s/i0aOUJlta6gAwp9iASIZ78jHK1QUIAQvpWqSs IV6rZRNgvkWxVZu3K1Gu5qKYEs3B68IZg2NUVCkahcVf7DSA0OQe9AwR+utlBcLvADru KH2huIFW0Hgau2DYG4/ogUFIOgQecfFJfUYuG2Y4BO8RFHXX8QeUnXDaW4/hYkTVfHx8 zkgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :from:subject:to:content-language:content-transfer-encoding; bh=PVVbQF9lZKzCBqXLTiHDqOfMCrlkwCFppUULga4+wbc=; b=mzLovfdWnXLi/Xxdi+aoHvF0AzwwMNhZsZN+/gFewmDu4eqxWzpIqcjguomnlrFWby BTh/52oe+bxOCMXaz7/vUYGdtxDOqINim2WLb7o2l+c7TD3d6ASvaHF1hCiVYsjhCvDa 3xY9inT5l5+kppulETRUutTiygCPPZzqBXqxbRh4E5G2bfJwzrbOL2FVHZO8R6PUQpNk UFxaXtOM0BbE7YclJTiijwbQIbs/wIHW9LkbKcSCp6DL2uA91CF9APVrpesbzxUhX8aj et48SCWIVp/s9OHIQVopUWwzDUUunrrfY61cDEEjxiKy3QVfL2cTAqMA2R6gor4ESep1 K35g== X-Gm-Message-State: AOAM5309nxig64jVUk9CgS1l5GxeQWLZjEX9aGsOsI1AgFuVYpzvt6GX WSmSyn5rQnKu1EpOr/DDgxvZfU9NEe3kpb+mt28= X-Received: by 2002:a17:903:244e:: with SMTP id l14mr3612617pls.148.1643716720380; Tue, 01 Feb 2022 03:58:40 -0800 (PST) Received: from [192.168.1.228] (061092019098.ctinets.com. [61.92.19.98]) by smtp.gmail.com with ESMTPSA id i7sm2627448pjm.36.2022.02.01.03.58.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Feb 2022 03:58:39 -0800 (PST) Message-ID: Date: Tue, 1 Feb 2022 19:58:38 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 From: Dan Zwell To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] fftools/cmdutils: add an option to append to the report file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gIlZUkEB7ynV There are times when we want ffmpeg to log, but we don't want it to overwrite the log file. In addition to the use case described in the ticket, a third party tool that invokes ffmpeg may write additional information to the log file, such as why the encoding options were chosen. This implements: https://trac.ffmpeg.org/ticket/3059 Note: unknown keys are ignored, so adding a new "append" key does not break backward compatibility. Signed-off-by: Dan Zwell --- doc/fftools-common-opts.texi | 3 +++ fftools/cmdutils.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) exit_program(1); } envlevel = 1; + } else if (!strcmp(key, "append")) { + append = strtol(val, NULL, 10); } else { av_log(NULL, AV_LOG_ERROR, "Unknown key '%s' in FFREPORT\n", key); } @@ -1032,7 +1035,10 @@ static int init_report(const char *env) if (!envlevel) report_file_level = FFMAX(report_file_level, prog_loglevel); - report_file = fopen(filename.str, "w"); + if (append) + report_file = fopen(filename.str, "a"); + else + report_file = fopen(filename.str, "w"); if (!report_file) { int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n", diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d9145704d6..4c6c297315 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -270,6 +270,9 @@ of the program, @code{%t} is expanded to a timestamp, @code{%%} is expanded to a plain @code{%} @item level set the log verbosity level using a numerical value (see @code{-loglevel}). +@item append +@code{append=1} tells ffmpeg to append to a report file if it exists instead +of overwriting it. @end table For example, to output a report to a file named @file{ffreport.log} diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15eef..350329ee8b 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -983,6 +983,7 @@ static int init_report(const char *env) time_t now; struct tm *tm; AVBPrint filename; + int append = 0; if (report_file) /* already opened */ return 0; @@ -1012,6 +1013,8 @@ static int init_report(const char *env)