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 20F6E4C703 for <ffmpegdev@gitmailbox.com>; Wed, 9 Apr 2025 05:55:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C835687F49; Wed, 9 Apr 2025 08:55:22 +0300 (EEST) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD666687DEF for <ffmpeg-devel@ffmpeg.org>; Wed, 9 Apr 2025 08:55:15 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-af9a7717163so6302797a12.2 for <ffmpeg-devel@ffmpeg.org>; Tue, 08 Apr 2025 22:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744178114; x=1744782914; 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=b1BI0mU3634THLdjUhZWYkjbiLx+n7K9EA/LKHlE6z0=; b=FxVu/qm3KkKOT9jy99qUih+VzpwRX8HnKtEE6FmHcyhbJBeoC9NB0hzhGurKQOmHM6 ieG7+mkVIyYuG/IEaIp+1k4JnZ0ykKe0ifS9uU0yf7CpEY21/jKlCxApLiCIMCMeSDmB IjFSopJmjs2CduTGbS9ScoJiIrLeFW2gdb/IoZw97/jlhcHHasflLiIS5jvWwj+9RI2g sEYceHYKIBQ6Ahb7apPq37WAIwcAgRs1lwaH64dv7js/JeweKSvAU8KDAc4I1il8aFLG vggSQGCnnikDqg015O2sJxBIrShzEtvnlhqh1uw1JNPtAwZGV7tUPFpX6qp7FE5AHtgg Vlow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744178114; x=1744782914; 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=b1BI0mU3634THLdjUhZWYkjbiLx+n7K9EA/LKHlE6z0=; b=dLFpuGuIAr/FloxU4Tj+0grXBfE9keI20o9tPFpCeNa5OOmH9grzc2VNAfSNUluzMO nDBGlcFGefI3zOR6zGYSgfSjaV1xfoxVyF1jWordVR9RCUEkFVoORh4FFZHWRElivbyt SZcZ7olL+veNMvVXG3FsiSws8x/KInc7UwIJ6Uh1d3uCxuoQQhdnGJIHw3gnZf1Woe6k kbMCUCM8CXO8uNlbpki+J8C/p1+uZaip/I0DDi+LfRfqLFvSrpXq/ueTeimoKMwrlmmw vVzKyCQhTqcJs33xW71eLg25sUUzNB0AM7/dogB1QzKF0U9DtQ4M6kY1b9PtwJujEPR/ nzMA== X-Gm-Message-State: AOJu0YzFmcsREzJC6HVy/8pXBidxNXLxQC7ydAsU1VY94N6CS3R/C9Rq Tq+hyLoea3lJblQfdGkTMIKnZxk4STsXzMZpYKQ5Exr1jsKWJZ8Edyl7pQ== X-Gm-Gg: ASbGncsqjBM1AZmPGkgVYoobjY7Xjzk7+0w336j0eRqKJXWHt5imqw53LBwWgwTZZIv 7ipYXqmIPMZc4N7SuIUnGX3orCSgZm/q0NaWTCjcXPherLfPXp4H2UcC8zroU2yP4SyoiNfnXpJ DpLI7QFTupRbaB0jSW5JuHym/TrmYISZGNhu0xpW+T1/3ACQ+LHe7FAgDtjZEIs10ohPU+/lhfV E97Hi9zEKhPtxTX1QgeMBoX72VPUJur9N0wNsZHYF0ZuNseil0o80k4WnePyFt0g3Sk2wVlslGD 18p+dh5eNbgNALxIMagLtyPOCM8RRPnSP0BN/ywWpXnuEmMxdc2S+Yij9H4= X-Google-Smtp-Source: AGHT+IGP4KxxU+iqPB/8xniDYa1IjDGR9REmmF59qMr9t/LHo3Iuy/9si9Mt/ITclnGQi/loNNHU3A== X-Received: by 2002:a05:6a20:ce48:b0:1f5:7007:9ea5 with SMTP id adf61e73a8af0-201591555d5mr3254023637.2.1744178113863; Tue, 08 Apr 2025 22:55:13 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bb1e51f1csm426182b3a.145.2025.04.08.22.55.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Apr 2025 22:55:13 -0700 (PDT) From: softworkz <ffmpegagent@gmail.com> X-Google-Original-From: softworkz <softworkz@hotmail.com> Message-Id: <6c2d6f1e97d4809275afc9c82486f7b9f9807156.1744178102.git.ffmpegagent@gmail.com> In-Reply-To: <pull.59.v7.ffstaging.FFmpeg.1744178102.ffmpegagent@gmail.com> References: <pull.59.v6.ffstaging.FFmpeg.1741858241.ffmpegagent@gmail.com> <pull.59.v7.ffstaging.FFmpeg.1744178102.ffmpegagent@gmail.com> Date: Wed, 09 Apr 2025 05:55:00 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v7 1/3] avutil/log: Add log flag AV_LOG_PRINT_MEMADDRESSES 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> 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/6c2d6f1e97d4809275afc9c82486f7b9f9807156.1744178102.git.ffmpegagent@gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> From: softworkz <softworkz@hotmail.com> which is controls prefix formatting. With this flag set, the prefix is printed including the memory address, otherwise it is omitted. In libavutil, the flag is set by default, retaining the previous behavior. fftools remove the flag as default. Signed-off-by: softworkz <softworkz@hotmail.com> --- doc/APIchanges | 3 +++ libavutil/log.c | 8 +++++--- libavutil/log.h | 5 +++++ libavutil/version.h | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 65bf5a9419..27afa5ba81 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -1,5 +1,8 @@ The last version increases of all libraries were on 2025-03-28 +2025-03-xx - xxxxxxxxxx - lavu 60.2.100 - log.h + Add flag AV_LOG_PRINT_MEMADDRESSES + API changes, most recent first: 2025-04-07 - 19e9a203b7 - lavu 60.01.100 - dict.h diff --git a/libavutil/log.c b/libavutil/log.c index c5ee876a88..7ce23cc31f 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -56,7 +56,7 @@ static AVMutex mutex = AV_MUTEX_INITIALIZER; #endif static int av_log_level = AV_LOG_INFO; -static int flags; +static int flags = AV_LOG_PRINT_MEMADDRESSES; #define NB_LEVELS 8 #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE @@ -327,16 +327,18 @@ 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 char *p_fmt = flags & AV_LOG_PRINT_MEMADDRESSES ? "[%s @ %p] " : "[%s] "; + if (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] ", + av_bprintf(part+0, p_fmt, item_name(parent, *parent), parent); if(type) type[0] = get_category(parent); } } - av_bprintf(part+1, "[%s @ %p] ", + av_bprintf(part+1, p_fmt, item_name(avcl, avc), 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 5139883569..4717cd562b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 60 -#define LIBAVUTIL_VERSION_MINOR 1 +#define LIBAVUTIL_VERSION_MINOR 2 #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".