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 B63AD4DF07 for ; Wed, 5 Mar 2025 16:23:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D86F68EEC8; Wed, 5 Mar 2025 18:23:14 +0200 (EET) Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0768268E53C for ; Wed, 5 Mar 2025 18:23:08 +0200 (EET) Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Z7HsP1G76z9stT for ; Wed, 5 Mar 2025 17:23:05 +0100 (CET) Message-ID: <4fcc5d8c-c5ce-4791-8fbd-1cbe3030d7a1@gyani.pro> Date: Wed, 5 Mar 2025 21:53:01 +0530 MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Gyan Doshi In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2025-03-05 09:08 pm, softworkz wrote: > From: softworkz > > ..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 I like being able to get rid of the addresses, but it should be user-selectable via a flag. Regards, Gyan > > Signed-off-by: softworkz > --- > avutil/log: Replace addresses in log output with simple ids > > ..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: 34(PPS), nuh_layer_id: 0, > tempora.. [hevc @ 0000018e72a89cc0] Decoding PPS [hevc @ > 0000018e72a89cc0] nal_unit_type: 39(SEI_PREFIX), nuh_layer_id: 0, [hevc > @ 0000018e72a89cc0] Decoding SEI [mov,mp4,m4a,3gp,3g2,mj2 @ > 0000018e72a8e240] All info found [mov,mp4,m4a,3gp,3g2,mj2 @ > 0000018e72a8e240] After avformat_find_stream_in.. [hevc @ > 0000018e742f6b40] Decoded frame with POC 2. detected 16 logical cores > [Parsed_scale_0 @ 0000018e74382f40] Setting 'w' to value '320' > [Parsed_scale_0 @ 0000018e74382f40] Setting 'h' to value '180' > [Parsed_scale_1 @ 0000018e74382440] Setting 'w' to value '320' [mjpeg @ > 0000018e743210c0] Forcing thread count to 1 for MJPEG encoding, u.. > [mjpeg @ 0000018e743210c0] intra_quant_bias = 96 inter_quant_bias = 0 > > > After > ===== > > [hevc #0] nal_unit_type: 34(PPS), nuh_layer_id: 0, temporal_id: 0 [hevc > #0] Decoding PPS [hevc #0] nal_unit_type: 39(SEI_PREFIX), nuh_layer_id: > 0, temporal_id: 0 [hevc #0] Decoding SEI [mov,mp4,m4a,3gp,3g2,mj2 #0] > All info found [mov,mp4,m4a,3gp,3g2,mj2 #0] After > avformat_find_stream_info() pos: 310096.. [hevc #1] Decoded frame with > POC 2. [Parsed_scale_0 #0] Setting 'w' to value '320' [Parsed_scale_0 > #0] Setting 'h' to value '180' [Parsed_scale_2 #2] w:320 h:180 > fmt:yuv420p10le sar:0/1 -> w:320 h:180 fmt.. [mjpeg #2] Forcing thread > count to 1 for MJPEG encoding, use -thread_type [mjpeg #2] > intra_quant_bias = 96 inter_quant_bias = 0 > > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-59%2Fsoftworkz%2Fsubmit_logaddresses-v1 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-59/softworkz/submit_logaddresses-v1 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/59 > > libavutil/log.c | 57 +++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 53 insertions(+), 4 deletions(-) > > diff --git a/libavutil/log.c b/libavutil/log.c > index c5ee876a88..50c8c41ef8 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 > @@ -331,13 +380,13 @@ 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 (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(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(type) type[1] = get_category(avcl); > } > > > base-commit: 5c5be37daff4f4ecbe0c20d6a9f0fdad6eadc9c8 _______________________________________________ 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".