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 20CD64C3C6 for ; Fri, 7 Feb 2025 01:27:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2037F68BA50; Fri, 7 Feb 2025 03:26:51 +0200 (EET) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3473B68B874 for ; Fri, 7 Feb 2025 03:26:39 +0200 (EET) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f2cfd821eso28455615ad.3; Thu, 06 Feb 2025 17:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738891597; x=1739496397; 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=C3iVV7eFlUksVgo/pXzFK2H/CfbwzJYqwLYRwaXAlhv/JpIRwvLnXcFz+pzCoCN6r1 aGndtbnBhEU4PgKX7l8m+kY+yuvajmXJ9ypyh75ckARWMLSN5Tdnb04s2F7CA+ZjUoPg nha8pBERnOWuNs7PcyjG6y5x2O3JXqSG6srmsDvzxlMfwpCjRqRMc/bV45FGAODVPYlJ NRmwlZuQYF0WaxKE6QQH5tiJ4af6aMjabtU0AgaVIVoBTr6OlVIcbflaVCxrM2Xs4U7H KOUB4HAbzWJa3pdPOzNun8zvo5m3pd1yG0shv64lqNfMeEPnPlOZASe4mC+ZYn3C18BC ms6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738891597; x=1739496397; 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=HN4ZgWJTbhGp7F1mn4BCJ4UWmdS8hN8fgyfEL2phx/wT464TtGT2HcqDmnIZuQShXK j6uiuCpop7dgjzn98Nzq12IAnSoaFGG2fllzP4xbeDh8eqQVMp2cUTT4CXQeuhJ3Yewj c9CYQBWqCmx7r6PSacGmGN9+eRa4vXc93uHlnWxwLzxrv/JhOrN+zcCUhwINW6B3QTVB KAtaiJCx/0UpKc36kh2dEjGXuQHfpqHGwh5faEg6j5+m+++HEs85y6DpV3CLrFcr+XxY QJnlaeeZoRYSdbPzGSKgD/KZ8T5jprvFNFckQbTJ1RJlt/BXjKkH5GOwN6ut7a+fNgOR zWrA== X-Forwarded-Encrypted: i=1; AJvYcCU+brMfFGY7HOp5p66k8qlIUi1eMpTF2XcrlDkU2Zex1BwpXbHJa7a3wcAi1BJP8XL2QmKEBKN8eY//hLDfyTIL0OrnaorTFrQ=@ffmpeg.org X-Gm-Message-State: AOJu0Yz36WopAH/19xP5Q0Q8fNnJx/ZiWr15/lVCn92QOkXNSlHeDbbE vyn3oYWGcDpvhDKbTEIORgc5RprmMCRWOGKXjPQRWvjwfW1Al3BcC2c6rQ== X-Gm-Gg: ASbGncshoCKAT+2yC0oHYTNs4vnNH/OfiYwthaedoU2ehomcx/Bkc9O9sgNoQSJiYM+ Dc8vHNaWCE3e38cDyLLQQ4ZdjJXmm1mDnlBIF9Qp2ZlwzRm6aUB04nEiTz1ozi45/uDTCPq9lFg k+TYoBuv1yUF51ulSLn6O98qZLwCfbjwsi5+nlDZUFdP5W1nzCZQd8tek0xOYYuCeT4NrzzWAt/ tXzZq2ZmM3walJIV5mU8fhaaqhsqA/RCwAIk/gvM8i5EAK4+RfsLDeqUe1+iz7fgzWyyRucu/j+ vAG7ulM8UAObpAexu294lnnHeq3iPJiWmw== X-Google-Smtp-Source: AGHT+IGvE8ljShwp/htq/5o/fzTGfWMmEF1b15WwS5EfQY9x63DnOQxv/PxzdQptX4J4Y099C7xtgA== X-Received: by 2002:a05:6a00:1d25:b0:728:e40d:c5fc with SMTP id d2e1a72fcca58-7305d57de05mr2512964b3a.22.1738891596931; Thu, 06 Feb 2025 17:26:36 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73048bf143dsm1900569b3a.118.2025.02.06.17.26.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Feb 2025 17:26:36 -0800 (PST) From: softworkz X-Google-Original-From: softworkz Message-Id: <13a7dc164bd64e9d534c6d84053a059bfdd0d06a.1738891595.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 07 Feb 2025 01:26:33 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 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: Michael Niedermayer , softworkz , Soft Works 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".