From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E0C104B33B for ; Thu, 30 Jan 2025 03:53:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 242D668BDF9; Thu, 30 Jan 2025 05:53:37 +0200 (EET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BE7F68BD47 for ; Thu, 30 Jan 2025 05:53:30 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-219f8263ae0so5806525ad.0 for ; Wed, 29 Jan 2025 19:53:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738209209; x=1738814009; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=kO+Tyx/q0dXF6lQhy3V1fq1SuILv2vnAXY/9jlI6Hk0=; b=JxuQDWERpVoIEoGYkuO4HpaG0PjzAj9SDyeBWabECQYQH3ck43t4Rt5ei8iUeWvylz 8mPx0gYTKzwQ2jowYtYVD4LtQ5G1r3ot0DffdBtIC7I8aad0N1nrZ1VHt89QfJfKg2x9 NTLnCdYA0shzzvvdFvKMWrgq6tYtV7cAOeD0rwifKfq+PAvlKrxhPgLiQeJt3k2Zn8XW ccKmXPqL+FWOpTQciUZiZGTsx68hQbqru+Dy4dPciPbAixJ91X+YlV52JB5e9B04tEW2 nZ5YwckpOwQzyVtdcTGMihnSE/e5rx9S5ftZ2k8EEvBVzWTYW+029qJCNQHoLt1Ee8w7 Fflg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738209209; x=1738814009; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kO+Tyx/q0dXF6lQhy3V1fq1SuILv2vnAXY/9jlI6Hk0=; b=h6Cr6RZ5S3lKu9eGSQMhkwDx6idhOgBEAjFDHBkEsuooFVuX3riDuwZSksgQ7AWrDT FKJGq7k79pn3RDPgOLRoK7+7fcDsv1C65IfvDncI/4LTwWDp6VjCovVIYOs7cYvQHqJQ 4bbZjfwIlQQluDAEMNpUTLvY8WC91xgCus9DqbflmjizJUB6EblO3ya4EZLoyn7+TsBf 9s8/2Amq6U9iiiZkskBId2JC86CT9Ha3S+woL6EMDLlit/BaFKqRarl0XBLzulitB10r kbwASNEaexIVdzh4Lo709WeFBvUq9vLgRvAtzxB7X0lKjupAK5abKspl77h7JBWElgrP qmhg== X-Gm-Message-State: AOJu0YzDyMnn4GVsdbuE7cuRYY9cInQ2wyjeMkQoIV2x7Hu3rrNRJk7r NV2RnMZM39mIQmdnPDTdIqyUH9FuRSQ7d6GBFMybdEz96PI9qkozkbHI/w== X-Gm-Gg: ASbGncucp4hVTu/HvXm86w6wZt1LpThUvIbECkjTVk64DazBAV56j91ca7uHSY7NGyJ mGsECpiY7RK0PRXfHbzNfwtlqiLs2mtRYvT+/I+QlW+uKIr/PMQ/Huw1sx8g6S/XMHDnyZGccbF Vyy6ZvjoA4LRCve6bskI95dQ3D4p+OeFxPbv1lsudtil79jWiEPrkFj9yHozykzT5apv/iCKmJp 6ZspcsmUBawuzIVrxmf2/pWlJsNLmWaqwaZdUoGQLUwIQZX3tBRrvssu0UYp7oMuB4pY44JgzmX GeIEarX91dwIO1JLamAP7c3opXCK1i39XA== X-Google-Smtp-Source: AGHT+IG0ZpT2gO+Ak+a7rlOnvgKMJniO14zPa9APScy6IofM6y1iG6IwjbPujc/uG/TOoCjWE56OKw== X-Received: by 2002:a17:902:dacd:b0:210:fce4:11ec with SMTP id d9443c01a7336-21dd7c499e8mr84558625ad.1.1738209208553; Wed, 29 Jan 2025 19:53:28 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de3300253sm3858845ad.162.2025.01.29.19.53.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2025 19:53:28 -0800 (PST) From: softworkz X-Google-Original-From: softworkz Message-Id: <13a7dc164bd64e9d534c6d84053a059bfdd0d06a.1738209206.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Thu, 30 Jan 2025 03:53:24 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 1/3] avutil/log: support logging of date and timing information 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 Cc: softworkz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz Signed-off-by: softworkz --- doc/APIchanges | 3 +++ libavutil/log.c | 32 +++++++++++++++++++++++++++++--- libavutil/log.h | 10 ++++++++++ libavutil/version.h | 2 +- 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 0f2b640601..83d57ae314 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2025-01-xx - xxxxxxxxxx - lavu 59.57.100 - log.h + Add flags AV_LOG_PRINT_TIME and AV_LOG_PRINT_DATETIME. + 2025-01-25 - xxxxxxxxxx - lavu 59.56.100 - frame.h Add AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT. diff --git a/libavutil/log.c b/libavutil/log.c index 46662f3db0..3ea6cb671e 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -42,6 +42,8 @@ #include "internal.h" #include "log.h" #include "thread.h" +#include "time.h" +#include "time_internal.h" static AVMutex mutex = AV_MUTEX_INITIALIZER; @@ -296,14 +298,32 @@ static const char *item_name(void *obj, const AVClass *cls) return (cls->item_name ? cls->item_name : av_default_item_name)(obj); } +static void format_date_now(AVBPrint* timeBuf, int include_date) +{ + struct tm *ptm, tmbuf; + const int64_t time_us = av_gettime(); + const int64_t time_ms = time_us / 1000; + const time_t time_s = time_ms / 1000; + const 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) { @@ -321,6 +341,9 @@ 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)); @@ -341,7 +364,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); @@ -355,7 +378,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]; @@ -390,6 +413,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 4c8c92266f..dd094307ce 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -406,6 +406,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 83b7822125..ee4a36cb17 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 56 +#define LIBAVUTIL_VERSION_MINOR 57 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".