From patchwork Tue Aug 10 10:19: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: 29391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp303632iod; Tue, 10 Aug 2021 03:19:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxysTvRunCAIm68ujExeghg6zNORKhMZdJR4cyVsYTOJnF09tMEPXovH0yffJOSZnJllXss X-Received: by 2002:a17:906:7246:: with SMTP id n6mr70541ejk.94.1628590766862; Tue, 10 Aug 2021 03:19:26 -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 i14si6613855ejc.361.2021.08.10.03.19.26; Tue, 10 Aug 2021 03:19:26 -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=uvSFRnGC; 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 4026568A3B0; Tue, 10 Aug 2021 13:19:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2055.outbound.protection.outlook.com [40.92.18.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BA3968A242 for ; Tue, 10 Aug 2021 13:19:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLXkLGq7r/g4RkoXWb9TTiTuAEejthhiSh15pzpCbxH3bxqbZRlLwJk0CAFli3t0vMvjULxiUQpSQcZSKdSuilfqfNVNQHqXx9OGyD/ujw+2ucTE9oxWTB4bj1RHobsHq6udDKA/WakyGLTF01hVFTzIC0B8LL/fFWF4QsryL6OpbuGsIqD3b8Y1QY882q0ZjRtP9/gDQ+VjoYhKnhpGabpCIYKIBtwHHEnXhU3Bkyg21qkzAkcCXsBGE0hq1IlbMzblTw0IVJnuFht6ezOS9/BihGIkYofQ+AB/0OTpGtk3eGw8QM+2q519JenSZC/DpkRi8b0BHESHZ+AcuENPiw== 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=v8H98r5Frz1+2C2CYCeMA4msSe6PXIoCQEnR06zfJW8=; b=YJF2Oa3RMZb9lobppReyW6cg0Dgqd/nLnhNHOveGAbY/vXpS+ZM5xbeCBeVaBW5O474Jb5G+L31BL9N/1YbLa2qRq4XsGPnbzKhCzvZKzmZ0sr07NR2fLf1+AmRMW5PC4E4+Zy9U1Qa6xj6Nqf/ctrzI6LozNjaW5b7Dq0skjQSlUPQR8ndh+U/3eLeUWWwCme/pCM08xQYcgB9R2J/oVkVMZn9vh+GSD6+YWeZ8tGzzCuj4DGh42gwRxCQ4YCkqkZunpzZOfsrpFGBZXuvKHyVSe8iwRozeI+TxvcNJNF/24RpaGRwoABBBuup9+19oHxtnztuipQdmwQuQjzBHtw== 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=v8H98r5Frz1+2C2CYCeMA4msSe6PXIoCQEnR06zfJW8=; b=uvSFRnGCI3S1wbn1aTj+pcCnGIDExe/3t4QHkYQcUQaC1wqbGAVaBR+Jpn3XW/SHOXv/5g6eg+UYiGoGSDNGkuyTTwdUWWRelP8I8zlubhHMDtfpNO48+3X408ZTtbAigQchm+ItVqzt3FWQlZmrHWqT1DteBNUXu+Vzy8vMoW5/9JFu6XIeh3oqJuiKvUo4HwRX/+xUBKWvjo/4FS+vu8AxmvZxDYSN187Lxj/RgAwSYPvUB8BQVidpc4VIwCNRO1MLiT47oH6aXWoh2gfZ9HkoxTSQDKPFD1kcwBl7dSLthh6iXirn2PDLov4jZqx38aURo5kbwBy55xPSsiFJ7A== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5550.namprd04.prod.outlook.com (2603:10b6:208:d8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Tue, 10 Aug 2021 10:19: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.023; Tue, 10 Aug 2021 10:19:12 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v5 1/2] libavutil/log: Add capability to prefix loglines with current time or current date+time Thread-Index: AdeNzeFkMstXekNUR0ytxiev9wuutA== Date: Tue, 10 Aug 2021 10:19: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: [XYp3bCyvaUe+MC6kPX7r1Zpfy8aLCJT1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5d2f6072-e3f2-45b6-13eb-08d95be84cbc x-ms-traffictypediagnostic: MN2PR04MB5550: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: BW2WkIXIFUY5patVCj4WqDLl+XxnZPzG+Z6kH16aA6B61okB+oUoshzTdaO1zK8H8qp4goozHdQhy5giYqxa/Jywqe1qDHuXO40Ob1Yay/jdocSjL9yorb3T6wWpkYUN6pT7dWGQqi53ORLgP3LX6ZZbR2toO12vPZ8Po9zSzp7amD3TxNEdi32DWF/c6qBMcwN3UVQovcNhcjyly+wnGn/0b6PH+E7GdeXwgkcea/FBXKuuSZaGGybgiitdw1+HpYPfm1q2pMt7ZBFiPxsbSwJdqeMSzZlk5VjahqzYP0DVLRe+bPQWWvNe8v77AMjQQsf8a4mzBzNab7kgH92ZXJC9+dav4+E8WtYPE6HX+9LGJaIUAglCMQJAason4vHdBN2YGZPT1rAk2PT+80UAV5l57U9X35BAWgVSGOC/n1LSZBU1Qjtp52DGvmGJ6wQL x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: bXK6esQxZcz0mC/ZVK/8ekowSv8kU/NyoR2PA0kP1vV2qrRmUoX1WH/gLg9Mshot6+R7vL9Vz1HIL5Ln9AyvwbCgt+kmCVDEuTzetbCLF2SMCLMQSN5cNP/evKtLOVB2u8zeOlwSZM+bqkKOEkA2LQ== 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: 5d2f6072-e3f2-45b6-13eb-08d95be84cbc X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2021 10:19:12.6560 (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: MN2PR04MB5550 Subject: [FFmpeg-devel] [PATCH v5 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: S1jPqM2MjqiF Signed-off-by: softworkz --- doc/APIchanges | 3 +++ libavutil/log.c | 35 ++++++++++++++++++++++++++++++----- libavutil/log.h | 10 ++++++++++ libavutil/version.h | 2 +- 4 files changed, 44 insertions(+), 6 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..34af1da60c 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,19 +291,36 @@ static const char *get_level_str(int level) } } +static void format_date_now(AVBPrint *timeBuf, int include_date) +{ + struct tm *ptm, tmbuf; + const int64_t time_ms = av_gettime() / 1000; + const time_t time_s = time_ms / 1000; + const int millisec = time_ms % 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; + 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) { if (avc->parent_log_context_offset) { - AVClass** parent = *(AVClass ***) (((uint8_t *) avcl) + + AVClass **parent = *(AVClass ***) (((uint8_t *) avcl) + avc->parent_log_context_offset); if (parent && *parent) { av_bprintf(part+0, "[%s @ %p] ", @@ -314,6 +333,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 | 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 +357,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 +371,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 +406,8 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) count = 0; } strcpy(prev, line); + + 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..b071f0f1eb 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 local time in log output. + */ +#define AV_LOG_PRINT_TIME 4 + +/** + * Include local 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, \