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 4FC2E4BDD4 for ; Wed, 5 Mar 2025 18:20:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FA2B68EFC7; Wed, 5 Mar 2025 20:20:03 +0200 (EET) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62D4668EF97 for ; Wed, 5 Mar 2025 20:19:51 +0200 (EET) Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2fef5c978ccso6435213a91.1; Wed, 05 Mar 2025 10:19:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741198789; x=1741803589; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=uuN9VEWqtXtvJHxDD258KcvcjH5Dz3w5R1El+9zhJl4=; b=Qp1LkGoVVSF5Z2/x7C5j/HBiSqyZOS8IrYLDXhfaJBynBR7bC1REmqmf5VxklSMha4 2J6laTUV7Cuw7hszGakG/d4HCu2tGAyiyzERzp0PQ3e3QGHQPMctTq8s0xCM9ZH1SdKz qpsqkSHqlZ8d95XY9m5jZH+ZlAjXpSZfistiZ/S+XajrZOXkbw+6KEA70DPYck/MF7rz l6ovzloGT5j/SlkbT8KZpHY62MU6i36XBNLsUpu/cus6AkJ+RVRRZCSv5n15uV9k2VZ6 pvVIjRuAWVjk32Y0zejI3FcVO0qpat6vymRWawocZWTNfnZzqFvUMH4RGyTLg4G+hFe+ zB5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741198789; x=1741803589; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uuN9VEWqtXtvJHxDD258KcvcjH5Dz3w5R1El+9zhJl4=; b=ozfdchYn3TP7h+Y1Pla76ktqjPCCb5xHm1nlXT1fnO54UjmsK8brpOPx9/x2NwlRKb C7QXhtTqTGXSL6H3YnF5+w9usHNchenVq17MhYmKOKqgmc8bxSiRfJthWxrSwaeUEHE+ yNLVbhid0uJC6QlmzBuEdazOgfpkyIMbbiFMT1Jrz7GTAR0l/rpia+K9IEGyJ9+rBqV8 UzNnbUHi2MVKd7kwcspSoYeLg8MlGjghft6z/B2z+oxfUN0e3w+UJrUJKJlQ4WRGNqZy XtlZonYuxJRbTpdNbRoKhnFZ1mXBxMnFC3DG8uGUSkfqL4es9MjbmM0j6zFzGc+/EqxN 8Wwg== X-Forwarded-Encrypted: i=1; AJvYcCWjLGRhS2QZHRTEQnP57gLkTiYY5KvxBTidqBIlfkk9OAxAvyrMjGAWWd0RYJ58p19EiqvFrlja2cs+wfN1qmpr4TvojG3PHgw=@ffmpeg.org X-Gm-Message-State: AOJu0YywT3X5Brl7KBuggNTXQPm/nsFAYRbrnwqLL3Sq//xab2oUpWUk V2Utlsf5XC25V1gHhWW1ZyqboajjF5vLNp1CC2LFXJIERt8iACi2SSbnmE5a X-Gm-Gg: ASbGncs0mJueRFDpkpfNy4v/L24MY98WO6DanQzOJIeIjnE5QMTEOJU+T0iAS2PzX54 qeky19/5J7f7OwffYlq1iki2CmH62nNaNQZttyp+Xijy/ocKHbDVKorWHJJX3MYzM8Reg8OT8K1 E4wAyGk9aIGnsDVVgYlcKFfdLQoZXqRT2OQ0tnLn8mSA+wD6JJvmTp+bOIpC0li1kVh67m0GuTj qc6187LMlG6Urv+AKRgJajs2SvIddcYfy4SU5buEjanMlC/J1WmCnEMGbvvqkdoYWQBczTVyJBv jb8KNOn+kpfQIsgW/A2d6SsDxyHbtv1xUDNVRU1uRKot+gIlE/OXxEIZ+qVYmzw= X-Google-Smtp-Source: AGHT+IFzf3lRCBbBRNw9FnYrrggYT9SYL99z5soxRAj0okCQMSwLTdAbHVng1LShRByeC9bN3bhz9Q== X-Received: by 2002:a17:90b:17d1:b0:2ee:ed1c:e451 with SMTP id 98e67ed59e1d1-2ff497cd4b3mr6822938a91.15.1741198789005; Wed, 05 Mar 2025 10:19:49 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e7ffa1bsm1662874a91.38.2025.03.05.10.19.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Mar 2025 10:19:48 -0800 (PST) Message-Id: In-Reply-To: References: From: ffmpegagent Date: Wed, 05 Mar 2025 18:19:40 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 0/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , Soft Works , Nicolas George , Gyan Doshi 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: ..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 Before ====== [hevc @ 0000018e72a89cc0] nal_unit_type: [hevc @ 0000018e72a89cc0] Decoding PPS [hevc @ 0000018e72a89cc0] nal_unit_type: 39(SEI_P.. [hevc @ 0000018e72a89cc0] Decoding SEI [mp4 @ 0000018e72a8e240] All [mp4 @ 0000018e72a8e240] Afte [hevc @ 0000018e742f6b40] Decoded frame with POC .. detected 16 logical cores [Parsed_scale_0 @ 0000018e74382f40] Setting 'w' t.. [Parsed_scale_0 @ 0000018e74382f40] Setting 'h' t.. [Parsed_scale_1 @ 0000018e74382440] Setting 'w' t.. [mjpeg @ 0000018e743210c0] Forcing thread count t.. [mjpeg @ 0000018e743210c0] intra_quant_bias = 96 After ===== [hevc #0] nal_unit_type: [hevc #0] Decoding PPS [hevc #0] nal_unit_type: 39(SEI_P.. [hevc #0] Decoding SEI [mp4 #0] All info found [mp4 #0] After avformat_find_ [hevc #1] Decoded frame with POC 2. [Parsed_scale_0 #0] Setting 'w' t.. [Parsed_scale_0 #0] Setting 'h' t.. [Parsed_scale_1 #1] Setting 'w' t.. [mjpeg #2] Forcing thread count t.. [mjpeg #2] intra_quant_bias = 96 Versions ======== V2 == * Added log flag for optionally restoring the previous behavior (as requested by Gyan) softworkz (3): avutil/log: Replace addresses in log output with simple ids fftools/opt_common: add memaddresses log flag doc/fftools-common-opts: document memaddresses log flag doc/APIchanges | 3 ++ doc/fftools-common-opts.texi | 2 ++ fftools/opt_common.c | 6 ++++ libavutil/log.c | 68 ++++++++++++++++++++++++++++++++---- libavutil/log.h | 5 +++ libavutil/version.h | 2 +- 6 files changed, 79 insertions(+), 7 deletions(-) base-commit: 5c5be37daff4f4ecbe0c20d6a9f0fdad6eadc9c8 Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-59%2Fsoftworkz%2Fsubmit_logaddresses-v2 Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-59/softworkz/submit_logaddresses-v2 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/59 Range-diff vs v1: 1: e686825b2a ! 1: 3a289533a7 avutil/log: Replace addresses in log output with simple ids @@ Commit message Signed-off-by: softworkz + ## doc/APIchanges ## +@@ + 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 + ## libavutil/log.c ## @@ libavutil/log.c: static AVMutex mutex = AV_MUTEX_INITIALIZER; @@ libavutil/log.c: static AVMutex mutex = AV_MUTEX_INITIALIZER; #define NB_LEVELS 8 #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE @@ libavutil/log.c: static void format_line(void *avcl, int level, const char *fmt, va_list vl, - AVClass** parent = *(AVClass ***) (((uint8_t *) avcl) + - avc->parent_log_context_offset); + + 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); -+ av_bprintf(part+0, "[%s #%u] ", -+ item_name(parent, *parent), get_class_id(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); -+ av_bprintf(part+1, "[%s #%u] ", -+ item_name(avcl, avc), get_class_id(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); } + + ## libavutil/log.h ## +@@ libavutil/log.h: 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); + + + ## libavutil/version.h ## +@@ + */ + + #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, \ -: ---------- > 2: 858e2cca9c fftools/opt_common: add memaddresses log flag -: ---------- > 3: 411c77bdeb doc/fftools-common-opts: document memaddresses log flag -- 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".