From patchwork Wed Aug 24 19:37:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 37455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2704839pzh; Wed, 24 Aug 2022 12:38:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR5W4zG74mVao4ofFAw0uX7dBwtexqvdOjnwNn5qccrcgxwYabaYJSnwgXUWlWwjb8C98TAR X-Received: by 2002:a17:907:da0:b0:730:d0ba:7b13 with SMTP id go32-20020a1709070da000b00730d0ba7b13mr321272ejc.332.1661369906895; Wed, 24 Aug 2022 12:38:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661369906; cv=none; d=google.com; s=arc-20160816; b=cDcjpsg70qyetsf9Tf3aLg9Cm2wSAbr9uas/WE29N4JcfheilsPrltEawbcW2zqze1 toLkixIRtkB1ChpQV5rJnYIPCoi75nbVMjhl75OyCqdM5PGnRQLsmUm8F8cG/f47z756 HJsqp7dgmjnIFlfd2b3Lhg9axeD99ApHBUM5n3HroykBQtnDpwd5kh9NUB1PvpquyaVr HPm0Q66vsnwnmcYPbX41S5EJH0pcqFeu0ESQ/LD151wlt3UWNskgd4JdDpBCewNbFlMN ZHyghFhyio02j3xjPV+8AXmKmGg8Bu7MhNc7hgtxGeqWckjALwP5OKxWh2o33iCciRvZ Fozw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=Ss3vY/guj6CG4Fiuakraq63uh1ftUDOIRBeRQT3uMYs=; b=urLWXe7fWx9QW3i6DShJmrGIdxiSDT9e3M8r84a8Ckft/53s7fNknm53eDeQ3INGCU neAHFWEXAG7MtmSuInMJj9+N2j/3RWUh1cNbscf7wa2kwYV5nhSWG/lDisMXxnctXnhz SDhP9RwwRLyvTX44+asvLqnDnKYz/si3Oc2YlrH/hF6gQEaBCB176DSqkkOccghU078x sC8PbbaYzYYYENqp3NvKp4KOLFe29C40Nu+l8YBqayZxzhiVX7K0tGrBHFhHo3RzmO1k 6snSxdnWqJFRnhUkpWfBSSEzyfq36HlK1Ahma8e/lCDFF/dqBNCFT3xLxJKne6O1asz7 ebLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=f8rPcN1X; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ej24-20020a056402369800b004464ae6552dsi1783999edb.236.2022.08.24.12.38.11; Wed, 24 Aug 2022 12:38: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=@gmail.com header.s=20210112 header.b=f8rPcN1X; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79C6368B815; Wed, 24 Aug 2022 22:38:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A3DD68B993 for ; Wed, 24 Aug 2022 22:37:53 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id 2so16582466pll.0 for ; Wed, 24 Aug 2022 12:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc; bh=hbGPba1AgsjNqn7sKZLEahOt6xoCtJ9Tc1CDIBPAwdE=; b=f8rPcN1XWsAWUbG5vg7LizZza+6nMX9FiW0DqHTZ9E7NTrIfgbsZ2zOLtSEHXsBCZM 8UNlApImGoPYbQQHL8fKoWGP0apt4aU/KX44vuQ+/rgybNCFiZXz0CVsRghgnWxiHduK dC8qDguxqJx7RFn/S094H510VjbVlOVqizRTAFDgWlktUT6biR58KrPnJx6fy/5NDvLL c3fg/FitI7h/1FLwYlFnqeTJim5BQSEgNsDn43uLSxEdeU8aYJ3oBxsF7msopdnveWZj jT276nlvox/tyql3EuYg8PCbSwW+2jf60Z8bpXCGp+Dt1rKfpctAE6WrZsNTUm8a46z8 hxBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=hbGPba1AgsjNqn7sKZLEahOt6xoCtJ9Tc1CDIBPAwdE=; b=c0DTaCyeqhVQfGoWsiM4t+xzwc0Xs4uBSurl7xs6mr9NOVu0VRZrUNI6azErIyG+f3 eJRjD6LUDrBTiJ2JKY0iFWKlhF1xixieTEHT5A+tQnpC7b+if11QPaZpXr07ebqD3H5K f4rE99LTB0Dip5WqEPDka0r+Ua30vg0VtN//9W09Z6Mv+h3/OReXtFEbkg+4mpEO2BAF g+g9GVcwUPI5H8Nuwk1xRvBXvjQHOGN7C9GGAPn6NwK1ech7+2FBE4qP7+1F7JjH4Vw0 hzkV31I9GPIzY3csuhl5mCa8SEWvgLqUNBrDSvLTOEmjWkZGYSCyIL3/qGznlmn1FMsi RegA== X-Gm-Message-State: ACgBeo2815rWGtzyYW9zLlPlFjCE5+5ro8I0iSkHBULURlC7DFb32JnY E5BSsV+qJhU96qGkLpoXqz6TYVuBGrg= X-Received: by 2002:a17:90b:4b0c:b0:1f4:ffac:699a with SMTP id lx12-20020a17090b4b0c00b001f4ffac699amr9694761pjb.145.1661369871274; Wed, 24 Aug 2022 12:37:51 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id l4-20020a17090a850400b001eff36b1f2asm1842935pjn.0.2022.08.24.12.37.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2022 12:37:50 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <5dc718cfd5f8a3a9b9df0bee3fc8a5050b9a62e9.1661369869.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 24 Aug 2022 19:37:47 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gkmTdbAjf2Fj From: softworkz Signed-off-by: softworkz --- doc/APIchanges | 3 +++ libavutil/log.c | 32 +++++++++++++++++++++++++++++--- libavutil/log.h | 10 ++++++++++ libavutil/version.h | 4 ++-- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 4c0c9db628..eae5ba0525 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-08-xx - xxxxxxxxxx - lavu 57.34.100 - log.h + Add flags AV_LOG_PRINT_TIME and AV_LOG_PRINT_DATETIME. + 2022-08-xx - xxxxxxxxxx - lavf 59 - avformat.h Deprecate av_stream_get_end_pts() without replacement. diff --git a/libavutil/log.c b/libavutil/log.c index 5948e50467..15a43c1631 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; @@ -291,14 +293,32 @@ 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_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) { @@ -316,6 +336,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)); @@ -336,7 +359,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); @@ -350,7 +373,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]; @@ -385,6 +408,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 ab7ceabe22..8336f65b16 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 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 05661922b3..5d0df781cc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 33 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 34 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ From patchwork Wed Aug 24 19:37:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 37454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2704786pzh; Wed, 24 Aug 2022 12:38:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR7IW8ITNHRggm+lIwQY30v2rP2zJC+AnCZIznQar7emz87jaJiDIfQo+HJMeYigxxgCoLS0 X-Received: by 2002:a50:9fc2:0:b0:447:8c73:299e with SMTP id c60-20020a509fc2000000b004478c73299emr445913edf.112.1661369901085; Wed, 24 Aug 2022 12:38:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661369901; cv=none; d=google.com; s=arc-20160816; b=toypF8iC8MDV+nGnC9O98lIMjxbNUztxr6putY2bGUNh1qu0DuhTXrxTzBO27FJtLX MgyytZsT3PsWnNMIIr9eJL617Y/2vfY6vPHw+JxxT/vHuBzx+F3is0z6TTg3TFteFjWf SJod42JVh99iwE4C9e4c2g9SOX0jURl0iYQJfLRG/j6/4R9x1I+X908Kx2txA8dqcN6I fYu0+oug1WXdq2/fa2KgEPgkwT9j6VI0VqRjtWz53u9hDzhQM5agta4Xx/8hwpSgIKWF 7aD6LEr+Cq8cHnms/SgfDEuDxDWXJDZBJI4t2+/bV+FMIK1NbOmCkZEt0LZaBgEPrxFh rpWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=c9NgZZXCf1yI7OmZ16jS0zwQ6oArOnxhXKHrgzRmGYE=; b=yVFTLyNiFOh2ajAq7lGRrd5VgEcHqXvWJaqWhYkTHpYimiiDN/4LM467ZT3w1C+M70 4/FMn01GXMAXNxk2thmc+rBDoeG4ezDbzkXUuVLzW9vhaYtfEjkVy19pYVpjkLbLI44j i0ln6RdL2rouAVn1hE1LyCUAlMHlmgnuQ2t5DJUFLECaV7C7tjtxC+UVJ+C+ppgd90w9 cHMlPbxnv8kWUGGkIeJ9PiKlPBHOfPfcIIMblaCldXVQh+xbZ+lwUscKY3dnrujkwmMV 41aXZ9Lw08hdqk5jxLvhBhqCsFVYJKI3DLQ29pZPNgBASxkpUQ+hnzFYk6/1syJTj8jq 7KlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UZU0MaRZ; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k2-20020a508ac2000000b0043c2919cfd3si5055050edk.602.2022.08.24.12.38.20; Wed, 24 Aug 2022 12:38:21 -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=@gmail.com header.s=20210112 header.b=UZU0MaRZ; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D66B68BA58; Wed, 24 Aug 2022 22:38:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 7B1E568B993 for ; Wed, 24 Aug 2022 22:37:53 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id c13-20020a17090a4d0d00b001fb6921b42aso2539777pjg.2 for ; Wed, 24 Aug 2022 12:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc; bh=ESewLheJFpX35+O/NuWih0Im0nSEwjx+ulaUOVseQIs=; b=UZU0MaRZchPYEU39aOeIrl8LagXPRzl+FeViOqUOa7akV5UDLsmETA4U/BY8J1+Skc AfeFbJEUnlIK9QBYgh3Q0QCzdRWbza1HSJ+OAKpVZXKoGL5T/jqHGLNvEI1K8KgTBx2l juqEHhDwPIoQd3mieS+3p5oWWPlcmN8sbGZ7Zobu4LjqIG9ZSzkFb6S9Q2n3KZj88ps4 awc7PUdmIprpVd/Mtm2AQEkgtx3P3NkHle13M6MkLxuOJ81g/i4Q8t8F9ha+q/18k8+t +Os3R/izR/yn1AaOx6ouG+dtiaNRwdTP5XwbCVsrISL5HxuaPSIUStLGyJJKcE4Vc96a i7ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=ESewLheJFpX35+O/NuWih0Im0nSEwjx+ulaUOVseQIs=; b=7RJb0mY9cT5q9vGb0QO27IWiVvfOgcJ+TIayNb/pHv2tWKR+rPAsc4oxmeQUbVeHxL PWQ9F8KeaMdRDf7xFUZgw1Fs2a+ChtmZS+Ja7mgO/RUOA/lw05ReRA0CRWN/quNGdqKM DBs8NieoVDV+dyQfGmDW+uBjcTjeM0eDj4iDi7Ak9p/PNjiJQ8sln+BV8eXNe1bJ1Egy boVheNjCCJ0aitf33zW5uu58pZU0zL5nBY1oSHrgVY++UoIPAKpV2ew/QuaUGDmRHWcf yKVGe9sl51ZNZC5D+O9oTSObk6o9Nf8/ehUCEhQigplX7n4paUzc+/BP6weEUEcRcku9 XnmQ== X-Gm-Message-State: ACgBeo1jJeGq/lQ00Zjacdvs1ezeUSZY+gH0mQgVNbdjS0B6wOW6pUi/ RBpulUBGSd6tSFf93Rb9dBaOd0IO3XA= X-Received: by 2002:a17:903:124f:b0:172:5744:a97a with SMTP id u15-20020a170903124f00b001725744a97amr533607plh.68.1661369871913; Wed, 24 Aug 2022 12:37:51 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id p37-20020a634f65000000b0041d6cda2d60sm11204481pgl.66.2022.08.24.12.37.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2022 12:37:51 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <23f6cad25ef40ab6808440c0e0e17143b8b4ccbb.1661369869.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 24 Aug 2022 19:37:48 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/3] fftools/opt_common: add timing and datetiming log flags 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9MbLGHW3MKgr From: softworkz This commit adds two logging flags: 'timing' and 'datetiming'. Usage: ffmpeg -loglevel +timing or ffmpeg -loglevel +datetiming Signed-off-by: softworkz --- fftools/opt_common.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fftools/opt_common.c b/fftools/opt_common.c index ae5e28a5af..bd8430751c 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -1268,6 +1268,18 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg) } else { flags |= AV_LOG_PRINT_LEVEL; } + } else if (av_strstart(token, "timing", &arg)) { + if (cmd == '-') { + flags &= ~AV_LOG_PRINT_TIME; + } else { + flags |= AV_LOG_PRINT_TIME; + } + } else if (av_strstart(token, "datetiming", &arg)) { + if (cmd == '-') { + flags &= ~AV_LOG_PRINT_DATETIME; + } else { + flags |= AV_LOG_PRINT_DATETIME; + } } else { break; } From patchwork Wed Aug 24 19:37:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 37456 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2704934pzh; Wed, 24 Aug 2022 12:38:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR4PGU/77c7jUSNsrkZzC1ybvFFJDefDGS2KLuISVVkazIzQeslJZCPQVLGBjdBahaaubh6L X-Received: by 2002:a05:6402:2029:b0:447:aae3:4fa3 with SMTP id ay9-20020a056402202900b00447aae34fa3mr307453edb.104.1661369923408; Wed, 24 Aug 2022 12:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661369923; cv=none; d=google.com; s=arc-20160816; b=xbN2utc/QcFkioi9oeqfxsXHgw3Vbvxlwq/dX+2qiXH+C5OzaHKSZTHFreFU4E77Wa M8JoPexE8LvcBBwlJ1DZzI7qqqIATxNm3lMNQQisJBchjOrMUHXLhxbiY240FMtSTqtY KR52sBMi5/dB2NKGRLjXcm8c9RFfzrtGXg64af0UWkqRPlqtwzGY8nnYHg59FogwFeI6 1+V5+jBzzr1WcrsFq69QgyAUXhEbGy7IdwTqSnkzXXtAdHMHQCT+Ejh6mOzl0O7hhDas 8uG6mpTJ2N4OU6I3LVn8URFYo7Kr6pSjaWIVkNq+qzcvCLxWQfMy0lmjIPK9ZH5iMtJi F90g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=RDJLbruXqpYTY6PFJ7Ea8e6XfeebwRMO83sC3ZI9tH4=; b=ayc0KUunJXnIS9bXDjAQ4vKZEMHuUcVrcl9Sk4yQ/jzxloRc19/+f5WvsZHWQ1a7/h Kjm2JalzkYf5D/Sc74dAWWXGHMP2pDhdg6E37PqwSdF/NnowXVQLgnNQnnSK9vbOYlN7 OP5s8Izp6u40xtCYAxToc/o5/ZpDC8lndvb0Fm7GCKkCkFqObG9n/KwSAEupZcqCHrkC lqfJSKfa2JM9ImsiTOVIQc/OtxlT8EEPedemM5EXv2iR6HMwIo43y3NLomokCTtc8VYb i4QC2IW+7yGy1BMZr++t8+PPXdRfcnHMC9e54SZP82DXFTW+LFQx2fHzO/UnpZth8/pW uK+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ODVSJ1aN; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o11-20020a1709062e8b00b0073083c63edcsi1838522eji.306.2022.08.24.12.38.29; Wed, 24 Aug 2022 12:38:43 -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=@gmail.com header.s=20210112 header.b=ODVSJ1aN; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0EEB68BA52; Wed, 24 Aug 2022 22:38:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3540F68BA48 for ; Wed, 24 Aug 2022 22:37:54 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id 20so16541780plo.10 for ; Wed, 24 Aug 2022 12:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc; bh=jcTEYz6Dm3by6eJ1CjscIp9NzG+AlmUgx79OYSGLW5w=; b=ODVSJ1aN+IPtjtCwrfjYb5pNNWoIKMwzZwbJnY286RjO+q3/16zLwrwajyyyVdYMwq z81pIeM8BGhrupZKODHTWCz3p+UdyJoc619gEetiLz1pbCVMO4VV792xcj2XQE//uLyV CFt5qi6WxXuaVI3kbTK2MRY7SDkx0b1I1SsVaB+6PtbLg7S0LnGsBh4A73G0jAYtGwgN ZBTeMjBi1f5KQDDGH4NLJHlFXptMm3zrqAgF8WLf0TWFFFVIaI45IOX14pTA0dh9OK8v 3DFYzcX8i71fmkrLTeooshqLaxt+7PV9FZVBGUgjo5VMBeqTwPxWE124dNNZB2KQ6eQM 6Nfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=jcTEYz6Dm3by6eJ1CjscIp9NzG+AlmUgx79OYSGLW5w=; b=AaJ15daQ49NZIhFQyVFD1U+xzvg8ZnVy6/pZSfs5weuxsio+Ra49TL+MqYIgRW2LGD MOtx8IAJSH8ipuYlWrSFCJZCzPkd0hjicddy0Ti38hJNYg8g77oLA6IoKeIkYHilhRTE BeqKiQ6NjIf1Z85i8b7m1H40RsWF1Dx0WVHzxAJFFEDPQQAgCWkYeRU1gKvCMe+/bigY MynUmrxpGEe5gg9AEsJRHJOVGSIGqrzbiHeo+TVHuJM0sPMXoW+yRO9OTuVXO4wFzp8s 7r1Dxedc5bWg2FC6FDe+JLAGL9fHwu3GipIMvLAmHpIqOZMUTpKdu9b/m5fqmWxHZwHr fc0g== X-Gm-Message-State: ACgBeo1CPVxU/PTr/4XMzfMG9x4g4OrQ+9PUFDnc25yy9ExfNqpCSXKv LM5Q6dML1a/8zHFUkZl3wQJxHSCZtP8= X-Received: by 2002:a17:902:ce0e:b0:172:69cc:60aa with SMTP id k14-20020a170902ce0e00b0017269cc60aamr331584plg.31.1661369872541; Wed, 24 Aug 2022 12:37:52 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id a2-20020a170902ee8200b00172c5dffc8fsm10542048pld.233.2022.08.24.12.37.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2022 12:37:52 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <595d03037f73eef81747a3a5fab2df2e6149093e.1661369869.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 24 Aug 2022 19:37:49 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/3] doc/fftools-common-opts: document log timing flags 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hN2Kc0fW1+Hv From: softworkz Signed-off-by: softworkz --- doc/fftools-common-opts.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d9145704d6..eee3b6ead0 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -201,6 +201,10 @@ and the "Last message repeated n times" line will be omitted. Indicates that log output should add a @code{[level]} prefix to each message line. This can be used as an alternative to log coloring, e.g. when dumping the log to file. +@item timing +Indicates that log lines should be prefixed with timing information. +@item datetiming +Indicates that log lines should be prefixed with date and timing information. @end table Flags can also be used alone by adding a '+'/'-' prefix to set/reset a single flag without affecting other @var{flags} or changing @var{loglevel}. When