From patchwork Tue Aug 10 16:12:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 29395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp584940iod; Tue, 10 Aug 2021 09:12:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIFG3lCxGIdMBg1Gy6yxVXhMh2gMV/XAI14M/YtzzlykQ0D+98HAOGejDdMBOeyhbmYKQQ X-Received: by 2002:a50:cac7:: with SMTP id f7mr5748823edi.302.1628611943895; Tue, 10 Aug 2021 09:12: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 v17si10644134edd.77.2021.08.10.09.12.23; Tue, 10 Aug 2021 09:12: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=GDrNxQzT; 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 82EC868A451; Tue, 10 Aug 2021 19:12:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2022.outbound.protection.outlook.com [40.92.20.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E37A268A3B0 for ; Tue, 10 Aug 2021 19:12:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GDWBWHCDwBgOmV9mqHLWfRWVCZQD1ZDH6fGNBqFNlbmNN4n6YICNef5KpBt5jWCcMzPqMYkbgSfNmmQ0uYVMr+vh22488mbif5GT3fA+aHSjVNwwVIla/KyZ4J3a6ST6rA6zgsnGE9Zp4L+q27vHQ/TW1XK5yLSa/sig9AVewyelVvFokr+p47gnN9iYUlgll6bre5yFBQrclk1BTei4du3IbqinhLiGkXkB9NsiyuV1B9z0ry6mAtClASAzryv1sbhLTqjaQR4O2eaXYko7HQYmosWc2fumb7LKaUs9s7+FDUFtnWb7+XlB7HaSnL20UfleGmBBPdXPJ6hdKcrrYQ== 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=PlUxURODzgqgxopLmy/c79lachoQL9JQg3UE4kBrCII=; b=UkOjNWneqafwBwZa/rP6ym45aHHblIIMwFwetAX6YL25S3KM4gMnHqM8a6qHS0DU0MTcUR2jMW+XwW4QOUROEIbJNBWDG974KWQhfznDhti33JQD51Ad4cqpuzWDleYZ/43rDpOl99sskzIQqlRMfXU5BcB1iREhwbo1uRgCDyTtSpoft77vLYqymRWqVsBThOJK5XUwZBK3qG1ddUMe0khsF3PNEU78RWNfZWhA224ugafeb4ZQet3WfxPA7GupUZ1CGdYENSskxpDZfMxyw0daMlg3ghdTqERQqNNdbtvlYmyhPW/Af7tFaasst9uBfdv9xp7p75y2j1ja650nqw== 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=PlUxURODzgqgxopLmy/c79lachoQL9JQg3UE4kBrCII=; b=GDrNxQzTKG8HmvUYJqJbhqadui+qiRu0MLRFaOTmuqWagx1fy6/atJBL/G7YtiFwR8qJ5JL67IHSXaHGkhVpP5Hm6BQsBgLVbPBD3TIsgbuLgr3d6TM23vO+0Bpk1awFDPDYTyAWrwNqzFPdnFYkRQWeGuXIkvOEMCNhQmmPoe6Wy/1YObdek3liXPa2e5RmLv2856eirlH31LRyQGTzzALLABhzbd4OnVg/uvAkCXKCIqLrM2C1L48NF0ZuRbcfhVxCDFT4lnDvmSem5Wv3NxTe3TyZs3Bnp6tt3wLVg4hrw13EPLgkxx5DZziZCfG6zdis34ib9cF13UE/0q9IsA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5533.namprd04.prod.outlook.com (2603:10b6:208:dc::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.19; Tue, 10 Aug 2021 16:12:02 +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 16:12:02 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 2/2] fftools: Add option to log timing Thread-Index: AdeNzcOXxBATLWK3QXS7aiQ+7H3ANw== Date: Tue, 10 Aug 2021 16:12:02 +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: [qbHmNeNqHGzhgE6nLK92XF9LIx8XA3Y6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16b4db68-07f7-40e5-f960-08d95c1996d1 x-ms-traffictypediagnostic: MN2PR04MB5533: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FgIOle2UAeWBQMsTOoSwUj3XVffehTUB43zc+G1RJWw1+k+VqrMoEtzBBnjpn1ui7d2osE3Oe50ynZ6K7Ks6cSJdwFh70STlyAoHWneygtk9WqZ1EK2TuB8/Mc9GnAdCxrFR1OBbeNeh0T1UHLXDSE2M6mJcpAU7mZM2Yww1tFtNjnCHkSm4u8Lol/mwES2KuFhYrjVEW2oylovWC/iBroMk6HifJRa06MSQv/O8pRyBhH3W0MtMtXRrlUYD/FphLzINUMTRrtA1i5RAtCi/O6uu7gsEwit+iLx9B3abIem4T3dK9snPIcWZiCY2XBhDDnVMzKj/udsv1mRvNznmPO8ydcy44TwCuPv6ecINafHwLK3B0T0d21yj+G63qNPKUsVMvf/TNguyu+U5Sg2EJifzl3R0j1+IuoRC7a8TBDMtTLYl0Ty8rwsg31K1Qmeo x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: hiHv69enx9pMs0XifC+uFFCNB28+GjCpb0BN5mKzdHoqFqGhEsqZ048/mxJ6rGfvUmrfwnDH21mA8AJICLJ2Odc4oxyvoIIbH8VTWxeAUtKcXMzxI/DxqKJriy270lYNOtFz/tzyhUdeX7oKUD/MWQ== 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: 16b4db68-07f7-40e5-f960-08d95c1996d1 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2021 16:12:02.2787 (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: MN2PR04MB5533 Subject: [FFmpeg-devel] [PATCH v6 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: dv58VzrHu/4G 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 | 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; }