From patchwork Tue Aug 10 17:56:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 29398 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp666369iod; Tue, 10 Aug 2021 10:56:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysSugzFYd35naYjuWcy47tbkI0O/2MoVkR0LC+Uqcjj9SXqorhHXXb7cDgdoldYxAHXwvX X-Received: by 2002:aa7:d3cc:: with SMTP id o12mr1807259edr.335.1628618183097; Tue, 10 Aug 2021 10:56:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q5si21492784edh.490.2021.08.10.10.56.22; Tue, 10 Aug 2021 10:56:23 -0700 (PDT) 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=@hotmail.com header.s=selector1 header.b=VxzDd+UJ; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2551668A2C4; Tue, 10 Aug 2021 20:56:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2047.outbound.protection.outlook.com [40.92.22.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B3F368A242 for ; Tue, 10 Aug 2021 20:56:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VAPNZqPtSYIjnlAme0SYFXDC0IUg90OXgehjh+gGnOs+8jYzhc+cmm2G55ihWeCuwlOSl13QE5mo18lpD1k8noF18wmN9eCc6cQZ4rZ1qn2F/JAccZjWCU6WHcxfArQmecqCdecY5tOWaLm3TGhlq5L1RqC0sx4Sdblr27SCYgwundNHB0ARW/Hm1ReFyHaSZXW2Zh9HfCwjApTyb6LWekMQg35Jy+LFPp7tz8yBF4IpPAf4iQUkK67hniDxnNODae9VM3kdRJ+esaIimH06RMuwWb39AXCNWAVGZufDSqAqmxJ/DBCtMSXhqR5GfShlndYGAH3lbUwd/p8IMAqb/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5INOq6B2X9g6jvHKkojsNSp01AWImtjS9+TQSxx7+oE=; b=gf7bkqziQET0PxrBdsniKMKiFiF9LN1Pw9e6O5OSnYPrTBwrPyqY/kCFPv10pRpxJmpKKYpYkjGUEeKYAzB+zwY7pZP9pea3YzHMWtIcB5z3dlJ9bdqhN5D7w3anR1fIfUvzEIE8dsl7/RtxTREpgLvqrX3FTP4s6sWAyA4aC2Fa+Y+p1nyBN4By9C+69JAlAf3Atcksh+RWqXycwQwhgizfePxJGBBGmPpJ8ufYXV2j8eIEArDxSEaEhCX57iB/JBcxePR5ykytAVPvcAtMM4m6hHOOBDH7mO8wU8skxiNfV47B/39inxNKe4G02Ck8vThXIvN7v8cN2ayRmP4YKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5INOq6B2X9g6jvHKkojsNSp01AWImtjS9+TQSxx7+oE=; b=VxzDd+UJnFFVixmy1DuYQU7DzZszf+TBWOElaR62JLLNa9dLcWg0PolxSNqCbkPNyAoZWQa/LxQHrQqF9aXxtk0A89+J229sUBmt2QDGNdz2fjoqgKVZuevLjorSosltJ45UJ+dMdC0GMLOGufGLY9NbClpxcQU2WMhBzPkkazJ0Z4KmMxi0PsW92rwLykwXQ0TBZbKBbWaSE0WYcpciyYLrcLul4mhoLy+yZiRoBMRt1YtasHIloGUpNHeSxHbBH4Qf+kMNtP+IfLtuKkDSBce47wZk+v1YxXaGFni3JWGsbC8EKVm2kRvwieAYybzcQfusYnpanJ7csdne7VxwVg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5552.namprd04.prod.outlook.com (2603:10b6:208:de::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Tue, 10 Aug 2021 17:56:11 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::5d83:1c26:c2b1:3a30]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::5d83:1c26:c2b1:3a30%6]) with mapi id 15.20.4394.023; Tue, 10 Aug 2021 17:56:11 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v7 2/2] fftools: Add option to log timing Thread-Index: AdeNzcOXVuPHpusjRQqzNVhT5ii3Ug== Date: Tue, 10 Aug 2021 17:56:11 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [9TNaqCSloZeG/BH5TdoY9wj9RR1QAznw] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ca263392-8f44-4b53-9a84-08d95c282386 x-ms-traffictypediagnostic: MN2PR04MB5552: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: O7uE/tHTfxOoRjRX1laeMqUjkGaAmQOFriO4nRpMO96/88dqg5lRU7Oa5AvTj6Q4c1kDOtYvVgNyn2ja0fF1HYL9hdNs0q7n190odY9lnIeZgAv+LR4BNfsRUvhmOByROe+vV3hKN5e69NMhB6T9qa0Gg5EZWzf92vBmO2SXvhvdSoHE/vzF9fVFFcZOU8ajIW9jRkkB+hx8daqQIWn9HtrwSPFfID4IK7ovRHSeRFqKqdtbcjRrcbK2l1tbZpfglqgBypGf++tjJ/ALtDbOBriqvAY2tpoyzGl3IXyKAkRFYQkNX8nP85KOY0Wz6kU6EQjUePiNg1Dy//+FeSvx8Qk39ge+670RlVRkDJp/iVTDFZrjKbh/DRanIbzt0JtQf/IGf0lx8OuiQrIDMpeopQ/NpAJ+KH8w+RvnTHHoiUpIeRBkKM3amR37edear0yA x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 9usVUTRIKKVbR0XyU6ejehNSvQlKnOvIwFFlfFW1oQ6RVF/nJP8wJrZqyu+jfWYhLsI107rXXOdoiAmfizQ25zZxYVvDilL2HlaSdkf6QjF/i4tRdk0pUSUqHJULY++hB/HUX64QzcR+JHPDdRJZOA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: ca263392-8f44-4b53-9a84-08d95c282386 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2021 17:56:11.3587 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB5552 Subject: [FFmpeg-devel] [PATCH v7 2/2] fftools: Add option to log timing 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: Xm+P3zsbH3Ml This commit adds two logging flags: 'time' and 'datetime'. Usage: ffmpeg -loglevel +time or ffmpeg -loglevel +datetime Signed-off-by: softworkz --- doc/fftools-common-opts.texi | 4 ++++ fftools/cmdutils.c | 21 +++++++++++++++++++++ fftools/ffmpeg.c | 6 +++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index 7643dd8396..aae26c28d0 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -198,6 +198,10 @@ and the "Last message repeated n times" line will be omitted. Indicates that log output should add a @code{[level]} prefix to each message line. This can be used as an alternative to log coloring, e.g. when dumping the log to file. +@item time +Prefixes each log line with the local time. +@item datetime +Same as time but also prints the current date in each line. @end table Flags can also be used alone by adding a '+'/'-' prefix to set/reset a single flag without affecting other @var{flags} or changing @var{loglevel}. When diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 912e881174..7918078766 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -918,6 +918,27 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg) flags |= AV_LOG_PRINT_LEVEL; } arg = token + 5; + } else if (av_strstart(token, "time", NULL)) { + if (cmd == '-') { + flags &= ~AV_LOG_PRINT_TIME; + } else { + flags |= AV_LOG_PRINT_TIME; + } + arg = token + 4; + } else if (av_strstart(token, "timing", NULL)) { + if (cmd == '-') { + flags &= ~AV_LOG_PRINT_TIME; + } else { + flags |= AV_LOG_PRINT_TIME; + } + arg = token + 6; + } else if (av_strstart(token, "datetime", NULL)) { + if (cmd == '-') { + flags &= ~AV_LOG_PRINT_DATETIME; + } else { + flags |= AV_LOG_PRINT_DATETIME; + } + arg = token + 8; } else { break; } diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index b0ce7c7c32..b0b105be1c 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4983,7 +4983,7 @@ static void log_callback_null(void *ptr, int level, const char *fmt, va_list vl) int main(int argc, char **argv) { - int i, ret; + int i, ret, log_flags; BenchmarkTimeStamps ti; init_dynload(); @@ -5049,6 +5049,10 @@ int main(int argc, char **argv) if ((decode_error_stat[0] + decode_error_stat[1]) * max_error_rate < decode_error_stat[1]) exit_program(69); + log_flags = av_log_get_flags(); + if (log_flags & AV_LOG_PRINT_TIME || log_flags & AV_LOG_PRINT_DATETIME) + av_log(NULL, AV_LOG_INFO, "\n"); /* end with line break to avoid mixing up with shell prompt */ + exit_program(received_nb_signals ? 255 : main_return_code); return main_return_code; }