From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 26F704DF29
for <ffmpegdev@gitmailbox.com>; Wed, 5 Mar 2025 18:20:19 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C831F68EFD1;
Wed, 5 Mar 2025 20:20:09 +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 CEE5668EF27
for <ffmpeg-devel@ffmpeg.org>; Wed, 5 Mar 2025 20:19:57 +0200 (EET)
Received: by mail-pl1-f180.google.com with SMTP id
d9443c01a7336-223fd89d036so16083245ad.1;
Wed, 05 Mar 2025 10:19:57 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741198796; x=1741803596; 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=dw4OlvR44f367CFEsJ5Oenu+FW9YIFj0yGm/IRXoiqg=;
b=TvVJG7JsNAECvNCDfbhDu4yT29Sli24Ist34Sy2qDIapKnjMnq8NWUwCgEAbJTittw
FsuxqAoD7JEvKiB2E0dEVVW222xEbEChc2umzvqRViY/VmRe1ZEd0MiWLyi1Z+ezEPty
qPq4+nqLJuXwD1K1lwfsB3tskWnvlOrw/4DJBOwcdJDlofB/gw21BLw0hXkkJ+vQxG1x
sfPw34YIfNGp0uKbssYbJu7DWt1uCzziX4y+ogTGI/tFpFLfzjXl3JBObOxsiOqMsjdi
KdTY6aWE2hEuPZ1strrf+u8NaU2VEitJ5JQ4/BneQDajz7iKDPeRf2yjJGyH9g5WcchZ
4rdg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741198796; x=1741803596;
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=dw4OlvR44f367CFEsJ5Oenu+FW9YIFj0yGm/IRXoiqg=;
b=SpKLvn5Avb5c4lG7toJ0G/9fGJkKOc0atOoX2SLnNrQgs6jEFVb//aLpLgXUaXmCs7
smxwCY8ViaaJtJGzM+HsEkc+SMvKquBlf/gPtvMicAxsr8aPED3HzctK6Dp1mwFOs+TJ
+BfWo80Wt0rnGd7oQg8uiB4ryJeKQZIn83WQHFDXn+PSM5Nu7PSgbH3EdHaZ0KUfppga
wSeU6DzXfX01Z5Ob6dRqdUQoJFxmjmWD7VqET8bAJSsGjzVayQl6tPlcK6mLN6a0LH+T
jU1sO2AWOIaaLzQ5J52aq5T/XB0zSw7VRnl1cZAqGAO4+52gHNHnHesd+i39xZgH+gmZ
FS6g==
X-Forwarded-Encrypted: i=1;
AJvYcCVF1E1Xp2kgx2pqyhnHzTlL2/FGSGU2mTFhrPpddmHKTOHDGiyHfFY52K4Ziml2NTqXkfoS8g16nqrfmHfUJkMf85OBXZnBdkk=@ffmpeg.org
X-Gm-Message-State: AOJu0Yxm5ojlXmqTyUWAFK727DZ+2UZHfvODLZE32FSjj7ZX3NPGJ/Jk
f9dIYvtKarWX3QDMrGdf/FwkpwdM1UBe2LvrO0Njq0gNEW+kiWPgiAQKz83x
X-Gm-Gg: ASbGncu1K6bWKpeVb/w87K8VZL1tLkm6Tz4i44UBoLeriqrniuiOF/uBM0voYRf942B
mVNa/gcxXONXZvrVupMKS8WfIVlfx/Meni+AaKQEKuXX163sQJJS/7Xl5fgpFelAfw/WlJXxW80
9Hi9ogmyJsv0aEXEcMEggxJNphX9yjAwmHRsw4veT9RR0pm+7MiWiS5dCeTOC6sq61P/4zxhFka
MIhFjS12iX9dqTyF2Q9EdjbTERDlXgPQlpk7mK9LhDP+PKmGvy3Mrpz0X64Uvn4L39Iljflk0AD
ydeBOoF0/UvLbQWd8+WbQ9w0r8HKPauqYJEzneWsHYPnKCLBp/5FuU73oHT/xa0=
X-Google-Smtp-Source: AGHT+IGx62p2cEuXryBUIAOunEPQrSD2I1tnjHJskEI/tQwUfsgDsViPf+YfYcqFoe2QfsRqUdGmsg==
X-Received: by 2002:a17:902:ce06:b0:220:c94f:eb5f with SMTP id
d9443c01a7336-223f1c6af9bmr63248675ad.6.1741198794481;
Wed, 05 Mar 2025 10:19:54 -0800 (PST)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-223501fbdecsm116511515ad.101.2025.03.05.10.19.54
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 05 Mar 2025 10:19:54 -0800 (PST)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <3a289533a7c787303da38faf64a6603327467490.1741198783.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.59.v2.ffstaging.FFmpeg.1741198783.ffmpegagent@gmail.com>
References: <pull.59.ffstaging.FFmpeg.1741189106311.ffmpegagent@gmail.com>
<pull.59.v2.ffstaging.FFmpeg.1741198783.ffmpegagent@gmail.com>
Date: Wed, 05 Mar 2025 18:19:41 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v2 1/3] avutil/log: Replace addresses in log
output with simple ids
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: softworkz <softworkz@hotmail.com>,
Soft Works <softworkz-at-hotmail.com@ffmpeg.org>,
Nicolas George <george@nsup.org>, Gyan Doshi <ffmpeg@gyani.pro>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/3a289533a7c787303da38faf64a6603327467490.1741198783.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
..and individual numbering. The benefits are:
- Smaller log file sizes
- The disambiguation is much easier to recognize and to follow
- It eventually allows comparing and viewing log file diffs
without almost every line being different due to those addresses
Signed-off-by: softworkz <softworkz@hotmail.com>
---
doc/APIchanges | 3 ++
libavutil/log.c | 68 +++++++++++++++++++++++++++++++++++++++++----
libavutil/log.h | 5 ++++
libavutil/version.h | 2 +-
4 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 5a64836e25..76d9b4f71b 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -1,5 +1,8 @@
The last version increases of all libraries were on 2024-03-07
+2025-03-xx - xxxxxxxxxx - lavu 59.59.100 - log.h
+ Add flag AV_LOG_PRINT_MEMADDRESSES.
+
API changes, most recent first:
2025-03-01 - xxxxxxxxxx - lavu 59.58.100 - pixfmt.h
diff --git a/libavutil/log.c b/libavutil/log.c
index c5ee876a88..6f18943fdd 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -57,6 +57,55 @@ static AVMutex mutex = AV_MUTEX_INITIALIZER;
static int av_log_level = AV_LOG_INFO;
static int flags;
+static int nb_class_ids;
+
+#define NB_CLASS_IDS 1000
+static struct class_ids {
+ void *avcl;
+ uint64_t class_hash;
+ unsigned id;
+} class_ids[NB_CLASS_IDS];
+
+static uint64_t fnv_hash(const char *str)
+{
+ // FNV-1a 64-bit hash algorithm
+ uint64_t hash = 0xcbf29ce484222325ULL;
+ while (*str) {
+ hash ^= (unsigned char)*str++;
+ hash *= 0x100000001b3ULL;
+ }
+ return hash;
+}
+
+static unsigned get_class_id(void* avcl)
+{
+ AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
+ const char* class_name = avc->item_name(avcl);
+ unsigned i, nb_ids = 0;
+ uint64_t class_hash;
+
+ for (i = 0; i < NB_CLASS_IDS && class_ids[i].avcl; i++) {
+ if (class_ids[i].avcl == avcl)
+ return class_ids[i].id;
+ }
+
+ class_hash = fnv_hash(avc->class_name);
+
+ for (i = 0; i < NB_CLASS_IDS; i++) {
+ if (class_ids[i].class_hash == class_hash)
+ nb_ids++;
+
+ if (!class_ids[i].avcl) {
+ class_ids[i].avcl = avcl;
+ class_ids[i].class_hash = class_hash;
+ class_ids[i].id = nb_ids;
+ return class_ids[i].id;
+ }
+ }
+
+ // exceeded NB_CLASS_IDS entries in class_ids[]
+ return 0;
+}
#define NB_LEVELS 8
#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE
@@ -327,17 +376,24 @@ static void format_line(void *avcl, int level, const char *fmt, va_list vl,
if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16;
if (*print_prefix && avc) {
+ const int print_mem = flags & AV_LOG_PRINT_MEMADDRESSES;
+
if (avc->parent_log_context_offset) {
- AVClass** parent = *(AVClass ***) (((uint8_t *) avcl) +
- avc->parent_log_context_offset);
+ AVClass** parent = *(AVClass ***) ((uint8_t *)avcl + avc->parent_log_context_offset);
if (parent && *parent) {
- av_bprintf(part+0, "[%s @ %p] ",
- item_name(parent, *parent), parent);
+ if (print_mem)
+ av_bprintf(part+0, "[%s @ %p] ", item_name(parent, *parent), parent);
+ else
+ av_bprintf(part+0, "[%s #%u] ", item_name(parent, *parent), get_class_id(parent));
+
if(type) type[0] = get_category(parent);
}
}
- av_bprintf(part+1, "[%s @ %p] ",
- item_name(avcl, avc), avcl);
+ if (print_mem)
+ av_bprintf(part+1, "[%s @ %p] ", item_name(avcl, avc), avcl);
+ else
+ av_bprintf(part+1, "[%s #%u] ", item_name(avcl, avc), get_class_id(avcl));
+
if(type) type[1] = get_category(avcl);
}
diff --git a/libavutil/log.h b/libavutil/log.h
index dd094307ce..450b4544b9 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -416,6 +416,11 @@ int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
*/
#define AV_LOG_PRINT_DATETIME 8
+/**
+ * Print memory addresses instead of logical ids in the AVClass prefix.
+ */
+#define AV_LOG_PRINT_MEMADDRESSES 16
+
void av_log_set_flags(int arg);
int av_log_get_flags(void);
diff --git a/libavutil/version.h b/libavutil/version.h
index 4b584fd569..b6467e2a6d 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 59
-#define LIBAVUTIL_VERSION_MINOR 58
+#define LIBAVUTIL_VERSION_MINOR 59
#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".