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 478EB4C48E for ; Fri, 7 Feb 2025 06:28:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7541F68BD13; Fri, 7 Feb 2025 08:27:48 +0200 (EET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E07F68BCB0 for ; Fri, 7 Feb 2025 08:27:32 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21f48ebaadfso18885465ad.2; Thu, 06 Feb 2025 22:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738909650; x=1739514450; 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=ArwJbEuBRRmSZjXAvIqQejQTaFT1Nb11rpNEGkVOvI4=; b=VOD7eJKYXBpDfguNY5pRc71rRUZMVj5wuqg9fmnEiqLEjTH1Zx3/j7ZE4QhXO5cVOe Wvyy0vfEIwASKi0ugaus6u6MYSluwAe69rdneSJb3mqNN0VnjwZUPiVnUeV/6YDLaE/C poAIdSSQ4mtOCmxGotZSkfXkEmDtLezptBQXE22DPMkw4YC7LZU8tBh+Kppr00LZV8Tl v0JcHxqts4dvwlhO4Igy1HFX/8oaW14YdeyqS710nCgBHMAmzw73s6OOInpBswKJvgwu 4tFLSJ7McKNnsp63DJBlyr+BmgBIwtPTPVYGhucjbJarvSZHl0/kkjAbnCWXylDF1fA8 Xq/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738909650; x=1739514450; 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=ArwJbEuBRRmSZjXAvIqQejQTaFT1Nb11rpNEGkVOvI4=; b=D4hd+Ocq92w2NsDGwKB3qvku0EXPk4rNeCEPS8MEz13Nv7XTXI2fYz5JoHPA2dsgqZ mdaetzPPOPZXBDNPAO9O1DcolNkF2kVoi5FzBrKOi1le/C3Fc7TlDJvrOa/odGBDmnSX 69G7kCX4RC/HU1tp9ad3D8kEKpI+FGRrnY5Bpoe579daTHdR08E17d3PTDJrVZAscZfj SsGoQkHWdxd39B0N6zHGWym/vSM7UTD5k2ppeY4CxDnlt4pmbLIIwHJKfudw/XIv2x96 LwOkdEC2UiD62wHL4dXBvajw4wxOA4GdeSBwbAAp6IEPL8QMUYDbNWYscnsKXgwr1qEu h4dw== X-Forwarded-Encrypted: i=1; AJvYcCX0t+DsF2IKQQCR25KUs3JWeq5IRkRt3B2KfTx0SAq9/aOl163FFosIdQ27KO59vGoaz3Md/Ps+InyPW1JhTxMWwqnRidFJw/g=@ffmpeg.org X-Gm-Message-State: AOJu0YzkFAD72beBmzHFnJtKM52igD1aolC9RJIuaHnSwRAiarTbGztn WyM58z0SX2OE4DPsg5KjZKSEgCKonaol4eBjx+zNgViDQZg8p/xgU5xEWw== X-Gm-Gg: ASbGncurDopostRan0/buIjfJhd++XadkOexLcAuInzbU2YcbQ+wjCnZwYjdv/MnXSf 0cv2AdZzMiC1TZKL0YczaO3REB7bMvLeIwDA1bxMEBBQH3YE56zemkwpPBK98+2h87MR4MRjIHB 6j6v2unPzye7HYE/FTAfBiulpvJDRvbEFNBgopJukX77S4SDjTADnhLS0ribCEzdWsIL3O+8S8r Kh2wp1mvZcRlw9yPMaQDJPjruv6Cx27r3sjLLnF0Vc1OyxniWwVf8LJuxr16do1q1Wl41CI/EzW UAJ9dalLYqv+bEVttz4fpl2fAh9oswktYA== X-Google-Smtp-Source: AGHT+IGdkT0wdE49Q8hjDEdt+Iy1ZBf+0vlH5J+IFBZNPK61joKBwmKq3xZ+h2yVeL3105AJo5mHrA== X-Received: by 2002:a17:902:e552:b0:216:2259:a4bd with SMTP id d9443c01a7336-21f4e76cfc0mr33050615ad.52.1738909650308; Thu, 06 Feb 2025 22:27:30 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fa09a6fe28sm2535802a91.26.2025.02.06.22.27.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Feb 2025 22:27:30 -0800 (PST) From: softworkz X-Google-Original-From: softworkz Message-Id: <2871595d3be5e347f9ef942ec3cfe0d304654e44.1738909647.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 07 Feb 2025 06:27:24 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4 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 , Marth64 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..2fe21d4900 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 && (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".