From patchwork Mon Aug 9 02:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 29374 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2469339ioh; Sun, 8 Aug 2021 19:16:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4+AUre8Q7EwW5fxXPmUOnYu47Rp7hsTvK9znhq4kE1RqZFx+xClGtdkGLfdOENAgvfBhW X-Received: by 2002:a05:6402:22b0:: with SMTP id cx16mr26773383edb.185.1628475385059; Sun, 08 Aug 2021 19:16:25 -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 a8si14939294edy.276.2021.08.08.19.16.24; Sun, 08 Aug 2021 19:16:25 -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=sAKuZWFQ; 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 487F868A2AE; Mon, 9 Aug 2021 05:16:21 +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-dm6nam12olkn2100.outbound.protection.outlook.com [40.92.22.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C5D268A273 for ; Mon, 9 Aug 2021 05:16:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VAwNSKtKEQzK3Vj1JW/Bvzwg3ZLp0YXJ/vH8Ww+CDDGf1e7Au66UdB3kOD1Ec/CYMA5BXf25dLlw6m/vkg7I/7QA0tQ/X13xyD6gTEXn7qYK9mC56I9xSA9zMwNUdBBewQJ7EXA8QJfoPvbzgG8V972dXQEF70Z3XvHGAp1lW9h9l5aIbtPSO6OQuBvkuge8D5YMl8dPXtz6evw/C2Bd5rknVyQe/bHTUT9dXtN/p7ZDKT1K3Ch1OWRH/e89MyuSfbRNvwvcbcnCSWmmUjG8+0HglQJZnDdzsleIVk341uoqgidFIY7ox8UIYM79C7z5J3/IUpg3EJ8xP/MvC3sp4Q== 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=MdfKu0RwYfGB5BJ/wiC9FZN6vA1zADpPf0P5IN67wlU=; b=VYp56I4/39i8pmZilyPIX2w+GqHob/lMWfx2Ygf8AWeTf8M5bXDZemhXe5yVVd7mCUduhe1RWX0c5WThtZYR0lThbUjFF6Uo8kQADQ/YpMpwSXENF1BED2wF2FGFmc3pKZY1Cd7jlD2649wLIUucIZq36P57SwzLN4sFz1+nnKz26ca3gA7xRR9mCZA4zAveXJZGPvWaNwpzqzjA6x3MFwjc84k+9c+UHk6u7u0Ko6Xre88aLyFWMybj/iNzHO1nNpqFOUrVWfxDzp5SYzQ1+GHav2BpG2pE22hu8TXu1FgutEzoWYEkASQAZlc4Z9ijHq8dO4qyAPDfc4uwuZDgYA== 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=MdfKu0RwYfGB5BJ/wiC9FZN6vA1zADpPf0P5IN67wlU=; b=sAKuZWFQQMcLtRQ8uAL3mY/ZyXpYwyAzyFLFibW1WdIvUlYxytoZSCFSuXNjsC40oPHFBgdvITX22dr8AFzop083R1uL7aIctSS4UwuFNyW+W0+AAGhKqHxvTRXYTP+HuWvjxCGs9vJedvp539VVLRaFuXWfC27Iql2Rk3vjIJWDgje1S4LMtUspvYVks6yK7QYEwttHTp5ninM5fwhvGUK+3j7Bb5LkPQQv8STOJEj7TncKueonGbvTzOXHus1Apn24yD1FGGWXhrWjRvGpPnbhLUAVffTrrB5BTkga5WPdQAzctzR5rclrPDtk7vmj4aEgd+7fJUK1r05e3WS7jA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5677.namprd04.prod.outlook.com (2603:10b6:208:3d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Mon, 9 Aug 2021 02:16:12 +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.022; Mon, 9 Aug 2021 02:16:12 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 2/2] fftools: Add option to log timing Thread-Index: AdeMwqpVPLlRp1ykSOewVwyjw8vrLg== Date: Mon, 9 Aug 2021 02:16:12 +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: [TqWQhzD5DQhF5gj6sCDum4g/VI+oh4Tf] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d770901b-c92e-46ee-7d86-08d95adba8bf x-ms-traffictypediagnostic: MN2PR04MB5677: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: dEEKVBHCtvrH2cJhm/rep+3zofi8FH6C+H2GJwCTW7r/fKTK8M5FUag0aKbBR2DUUeDRT3ZS8kRAxnvw4VwNzWwiwXeYiI475t1PADp973wSSL/WJDB/dObTMWzs9iIAANzIW8lxMDsZcCbMtQoUw06ho7qmWy4SGGNW2Yh8Xz3WwEPgTIo3wwaTKKheaDkBq1NXZAMgVMQFtRTB2zLEqBiAFf8TRE5QNFtCqMxZtaekmx+26UOZwPHYbZx/f3xrA+l5yyxlsU60ZMdMYAbfCOzBlssz2jOEbCoiovPQX3VVhSMO2bO18+7D853w5fGbJB3Y95dOD3zbFb1SieZWXDG3HIzllRGjXKbn6J7z64bocA37YAq45dMxDEdOX1mF3jjyNcNVnR62olPhRKrPOyrIA4yBT1bbBO2/GMBGo4t7na2hY2GTWSyTU+aV8NPI x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: fBQKOlHn05fQQ2xV6YdNqhGZH8GEj33Hcb4nKykIrkETcCkG9K7Y5jAuw1e4u5Ellkhfs7Hlxyp/RLRBQPdx+yQEq02Yx6px97PVlMddjzzf9HeKsA6Xs236P5x8dZbOUvGTo/czbsAyFEFf9Wuc2A== 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: d770901b-c92e-46ee-7d86-08d95adba8bf X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Aug 2021 02:16:12.4315 (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: MN2PR04MB5677 Subject: [FFmpeg-devel] [PATCH v4 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: 48nLQE+YnC70 This commit adds two logging flags: 'timing' and 'datetiming'. Usage: ffmpeg -loglevel +timing or ffmpeg -loglevel +datetiming Signed-off-by: softworkz --- doc/fftools-common-opts.texi | 4 ++++ fftools/cmdutils.c | 14 ++++++++++++++ fftools/ffmpeg.c | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index 7643dd8396..483a50d8e9 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 timing +Prefixes each log line with the current time. +@item datetiming +Same as timing 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 f5e39f616f..72fc67fc3e 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -919,6 +919,20 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg) flags |= AV_LOG_PRINT_LEVEL; } arg = token + 5; + } 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, "datetiming", NULL)) { + if (cmd == '-') { + flags &= ~AV_LOG_PRINT_DATETIME; + } else { + flags |= AV_LOG_PRINT_DATETIME; + } + arg = token + 10; } 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; }