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 35C614C5B4 for ; Fri, 7 Feb 2025 14:35:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B158D68BD1B; Fri, 7 Feb 2025 16:34:48 +0200 (EET) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51F6B68B6EF for ; Fri, 7 Feb 2025 16:34:34 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fa1e25e337so1900939a91.1; Fri, 07 Feb 2025 06:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738938872; x=1739543672; 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=qwzzU8Q7OuZ0UXlS5K3jFAhsA5UDzIBjlu/GZz2JJo0=; b=eCIS2G5TJ50/HPjoIwv/m4YyNRgWtXmdFq3g5ZMlqyvi+SU0pYm12B16E3435HJelo 6oW2yWT/+uCuhtwKOIJLCo/1MXwqS+KFBbIkPzBXoN1SLqYDWnVbacJ15IblPLW8CHCB 7aZ1bj2oNz0k3c2fZ3LkZT5f3vUmuT66aotGfqL0SKkvtoc1+727zr8Vmc0YZBMw9gHr 1PdIuG473yLEwKsyK2bSfqpGaPmbES/LwxEx2QzgHeXrNgV13bQ57J7U+gWFjAPJBUIE p6cM4+4EFWY82wAlcEXXhv5Jikuhv6s6c6ncdFS2ODJtEyySQHp8/3pzCd80rtnGs12J 59Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738938872; x=1739543672; 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=qwzzU8Q7OuZ0UXlS5K3jFAhsA5UDzIBjlu/GZz2JJo0=; b=X9TfHgrof6+CNprdA2FMhk0+7pJRxQl+8RcbmHo/7nu9F4YrLInIGdisq4V5BTzDco oACWpD4BHhouTHaI8/SxcwFDzgJaf3QuRWrTpYafWkjaS+4i+hYDRxzGPgWMR6fFtkzq 2gOno/oSMIgNNONUSyQzjIj9sjJQEz/n7qod++j0xRxO2wJS87cjOUrrSl4/hysvTs/L HqiJRb8VUhhW6kmc51qLs+kfzvP2zs2XLLy/tTrIErXrohgirhEK8wFQYK/3e/ivAVGK V8Tk5Fmi7+3XFcth7dPIZm/0pWn/OsS0cibAltNyFsHkICWi4p92qVD/KVlK/5hngrH4 8EkA== X-Forwarded-Encrypted: i=1; AJvYcCWmYbauiS75clzBbFLmX/R0sftqTrukxBVBWxAA6vAqZ5FLMjBfyurj7NpnvrtpKVR4e3UZsiyuvs0FHhA+nP3z+f79H6GXkSI=@ffmpeg.org X-Gm-Message-State: AOJu0YyhG2EDrAz/6L08Lqs90Go/lP/0G2m/jaJ374+4JAFBKJAPnhl+ bSG6mevoVpTkIS3j4FQjhKASXly3Jd8bk5Im/v5XrSsmGWGdUObB9CkGXw== X-Gm-Gg: ASbGncuvMH2TFtmkDAEFp8e6fyMAdtjmaMy8zGWa5lkTTKWm23F7CFI9496Fe78mtDf 1Yoomdvn6MeIc6KZMjnxD7gd+IqYISnoYWW0KJx62UteQ+0VVB5F5L95fku/JTRSeLx4DeLONI7 XpqwR3SDVQ8mT3Njp0MQqgOv4WBXNQT4zj63ESmI158dnO1naNfCpmV+O3xMkUDM1XBdbuQDFuZ KZ4l+KWtj238yUKJQjf/N6bYDGCRsttqY9RIywHyVRYztw+s11M19u85YxWFB/WjPBThzsh4buV bSJAr4jUh++mhyVlwPc6PcP+u/3vBEGILg== X-Google-Smtp-Source: AGHT+IH1DxLv84ZfYSOwZZRQy5kpf7kERvLb675yCCCS6dh8eWMca1rKpkgWmVjpch1dinijnIXk6Q== X-Received: by 2002:a17:90b:278c:b0:2fa:200e:acd8 with SMTP id 98e67ed59e1d1-2fa242e5db1mr4645717a91.26.1738938871306; Fri, 07 Feb 2025 06:34:31 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f9e1e2352asm5669904a91.34.2025.02.07.06.34.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Feb 2025 06:34:31 -0800 (PST) From: softworkz X-Google-Original-From: softworkz Message-Id: <4c5bf1c03b22b69c4d85ba26b967c8bafaa580c7.1738938869.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 07 Feb 2025 14:34:27 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v6 1/3] avutil/log: support logging of date and time 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 , Marth64 , Tobias Rapp 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..c5ee876a88 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* bp_time, 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(bp_time, "%Y-%m-%d ", ptm); + + av_bprint_strftime(bp_time, "%H:%M:%S", ptm); + av_bprintf(bp_time, ".%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 && (level > AV_LOG_QUIET) && (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".