From patchwork Mon Aug 9 02:15:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 29373 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2469232ioh; Sun, 8 Aug 2021 19:16:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxc6hJvBeIemTTx8YRAgiEgYo57sGuANH2DKoB0N1BpZPbRXEStpFlMXhj0FBJVqlfPvez6 X-Received: by 2002:a17:907:2e01:: with SMTP id ig1mr20770882ejc.387.1628475372233; Sun, 08 Aug 2021 19:16:12 -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 e14si16923743ejj.279.2021.08.08.19.16.11; Sun, 08 Aug 2021 19:16:12 -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=svcCSKZ+; 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 38E5068A0F1; Mon, 9 Aug 2021 05:16:07 +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-dm6nam12olkn2099.outbound.protection.outlook.com [40.92.22.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12873689F16 for ; Mon, 9 Aug 2021 05:16:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IArYnDQqvgGd14BPn/PosIj73I0+VeZ2XzZVJ1U2kJ2U+cbX6LxYdiq8ANiP7hGxSk4D9X7MsixIwxXaBMGp9RGNUMDiHyYH0nPrKc79mdApdJGr71rss8Lh1xsTNpHtLAXvxS1v4EDXjBxcK43gwvtF4Mv8h3JNbtgvKiEUTjdpZ1JUQBkAcWgx6s9jUsj5CZdI1WagrXSiTclB2oCYgDbR3TVyE1IdxTmAMp8Yu40atSiZsI+SQ7xGr71z9UCm35CM3DAdhmOd4R+xJRCmbmj/wp9zJWs0csyowmBwGcHbF1EC1E1BRppSP/EP5rJd47rJ3eL5v8VbycI7ifX9hg== 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=dgsLrfFmaEw+5pO/9kOxj2LYb5O6cxPVZMf4D8E8FGs=; b=ikYbPCQ6gSomsnsFYSabWu2VzN7v4usEyyyImsW5/5uUjxhp8BvNQ+h5ZW/QjW+YN5jS9AqbjM8XEQ7ONM8WsUnHUZe3tbKPnvwzN8S3Tahev5Y8D19SDJexzgjd4LvOk/0L704FhQui05eQ99FlO90mahyH480FLO+zC1nQZ/BCpJ1GIcmu59+gaAX3cTSox1GXP11/aX6S2VS4AMrvVj76PZrLdo1859ydULaunxJ7VJGdGqbrC7pnpCGuFDMkxTgzSgHWsQ1QteO2ZMzxbN7pzMuhX0pZ8a3NUndfsPL7hdWOGT1clJJZGP32vxOLXlcVaxb/dC88vSAkJLLviA== 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=dgsLrfFmaEw+5pO/9kOxj2LYb5O6cxPVZMf4D8E8FGs=; b=svcCSKZ+Zq7B3x27uKTwdreGqJSIQVz10bc9jFsKYElraW2Xel09fIdIPbC5J9GYyXSCofABnNYPiNnPgv2Sxna5AJypGMLwZNs4buDb24dn22ayb84tnCZvPmajmiKXYyBufzhAbKhe7k9z4VceAaN6JUNavp7adLIIJbqIBLyoRxDwL8rGQdV+WuNAnAsrywKp1/cjvHbOm1dPqjMKNO7grU626Tgpe+KfY1xnb+JjfchgKG97IeQBOXRj562ESVjmCp30TpLbpTeMqJeek07npGPDJqryKO+Kwt114XBZgpcae7ZJR7XJPqDeeAg1J6r1nImH9GNI1YPIaKwTsg== 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:15:57 +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:15:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 1/2] libavutil/log: Add capability to prefix loglines with current time or current date+time Thread-Index: AdeMwjMgUPQp4rpDQR6IeGqAVILT9w== Date: Mon, 9 Aug 2021 02:15:57 +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: [vkgaVDA575ZnNlWIWB8hibdymPwi72ge] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 189d7dea-7892-44e8-a8d0-08d95adb9fb9 x-ms-traffictypediagnostic: MN2PR04MB5677: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VtzCCHlThS72bvuFP51IL5Un5cIaeGAAut3jbG5XUypL9XdqCyiHzwncthj4/bZINI+n4UXfFLxbQxqma5gIotVJ/GhoAVmTtYRxzHcgHV4h3VSVpKHu0gIkGnuhvcTZW6/JtPgt3cyB6BTHHP5iqZxhGUr3z6qCU2QO7UyWVL3LH8SL7bO41i15csazzDVxKmes69EgbOrq7/rdLOg5iwIv9+T4aoh9GQ7XGSRBdC8kbumvq2uW+/jH6fqEIfKaXU5hGBf7LqdloJtcLwfXaLsibzMxu7EP2IyzR1TNOuOwkKoj5oahrLLYVKZTJhkmRDxyjc5m76KZZooUQEkEKjk8U2ifYJJx3TB/VRsmHYkwnZ5jM1T/NMD4S1xj+6ykKRtnYV76Z7UtaWEG5A0R0bBXhAfFmi/BdLqClWJ1X3VD3d4P7dGZ3vKnaHAFLBRC x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: I3jhOXmSGTIuQezhHIrVmobNJKStenxGj/SJ6H6PzTk7IhWsNRaJP/voGQz6W0gWwWwtp+xnmS9wKwcnc6CARX5Y/S1SyZxVcXay/A3c8D9kDxlEbUL9rQqXJK34o8t1aq9p5WpflJmL2ZeE+hfPIA== 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: 189d7dea-7892-44e8-a8d0-08d95adb9fb9 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Aug 2021 02:15:57.3158 (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 1/2] libavutil/log: Add capability to prefix loglines with current time or current date+time 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: CwZ1FcOsZcxy Signed-off-by: softworkz --- v2: split commits differently, fix AVBPrint finalization doc/APIchanges | 3 +++ libavutil/log.c | 33 ++++++++++++++++++++++++++++++--- libavutil/log.h | 10 ++++++++++ libavutil/version.h | 2 +- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 6eefc7fc33..be707314f3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-08-09 - xxxxxxxxxx - lavu 57.4.100 - log.h + Add new defines: AV_LOG_PRINT_TIME and AV_LOG_PRINT_DATETIME + 2021-08-02 - xxxxxxxxxx - lavc 59.4.100 - packet.h Add AVPacket.opaque, AVPacket.opaque_ref, AVPacket.time_base. diff --git a/libavutil/log.c b/libavutil/log.c index 66defa9c42..f29533a91f 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -40,6 +40,8 @@ #include "internal.h" #include "log.h" #include "thread.h" +#include "time.h" +#include "time_internal.h" static AVMutex mutex = AV_MUTEX_INITIALIZER; @@ -289,14 +291,32 @@ static const char *get_level_str(int level) } } +static void format_date_now(AVBPrint* timeBuf, int include_date) +{ + struct tm *ptm, tmbuf; + int64_t time_us = av_gettime(); + int64_t time_ms = time_us / 1000; + const time_t time_s = time_ms / 1000; + int millisec = time_ms - (time_s * 1000); + ptm = localtime_r(&time_s, &tmbuf); + if (ptm) { + if (include_date) + av_bprint_strftime(timeBuf, "%Y-%m-%d ", ptm); + + av_bprint_strftime(timeBuf, "%H:%M:%S", ptm); + av_bprintf(timeBuf, ".%03d ", millisec); + } +} + static void format_line(void *avcl, int level, const char *fmt, va_list vl, - AVBPrint part[4], int *print_prefix, int type[2]) + AVBPrint part[5], int *print_prefix, int type[2]) { AVClass* avc = avcl ? *(AVClass **) avcl : NULL; av_bprint_init(part+0, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(part+1, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(part+2, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(part+3, 0, 65536); + av_bprint_init(part+4, 0, AV_BPRINT_SIZE_AUTOMATIC); if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16; if (*print_prefix && avc) { @@ -314,6 +334,10 @@ static void format_line(void *avcl, int level, const char *fmt, va_list vl, if(type) type[1] = get_category(avcl); } + if (*print_prefix + && ((flags & AV_LOG_PRINT_TIME) || (flags & AV_LOG_PRINT_DATETIME))) + format_date_now(&part[4], flags & AV_LOG_PRINT_DATETIME); + if (*print_prefix && (level > AV_LOG_QUIET) && (flags & AV_LOG_PRINT_LEVEL)) av_bprintf(part+2, "[%s] ", get_level_str(level)); @@ -334,7 +358,7 @@ void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl, int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl, char *line, int line_size, int *print_prefix) { - AVBPrint part[4]; + AVBPrint part[5]; int ret; format_line(ptr, level, fmt, vl, part, print_prefix, NULL); @@ -348,7 +372,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) static int print_prefix = 1; static int count; static char prev[LINE_SZ]; - AVBPrint part[4]; + AVBPrint part[5]; char line[LINE_SZ]; static int is_atty; int type[2]; @@ -383,6 +407,9 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) count = 0; } strcpy(prev, line); + + sanitize(part[4].str); + colored_fputs(7, 0, part[4].str); sanitize(part[0].str); colored_fputs(type[0], 0, part[0].str); sanitize(part[1].str); diff --git a/libavutil/log.h b/libavutil/log.h index 8727c38afc..27eb071884 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -377,6 +377,16 @@ int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl, */ #define AV_LOG_PRINT_LEVEL 2 +/** + * Include system time in log output. + */ +#define AV_LOG_PRINT_TIME 4 + +/** + * Include system date and time in log output. + */ +#define AV_LOG_PRINT_DATETIME 8 + void av_log_set_flags(int arg); int av_log_get_flags(void); diff --git a/libavutil/version.h b/libavutil/version.h index 6b4a265457..201b012596 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 3 +#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \