From b9c353fff2f80b87199b52b13dc0ba9b406ac0b4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 22 Feb 2009 17:53:14 +0000 Subject: [PATCH] Compact repeated messages to "Last message repeated x times". Originally committed as revision 17531 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/log.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libavutil/log.c b/libavutil/log.c index 65328bb25f..4bb9652c2c 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -32,17 +32,30 @@ int av_log_level = AV_LOG_INFO; 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 line[1024], prev[1024]; AVClass* avc= ptr ? *(AVClass**)ptr : NULL; if(level>av_log_level) return; #undef fprintf if(print_prefix && avc) { - fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), ptr); - } + snprintf(line, sizeof(line), "[%s @ %p]", avc->item_name(ptr), ptr); + }else + line[0]=0; - print_prefix= strstr(fmt, "\n") != NULL; + vsnprintf(line + strlen(line), sizeof(line) - strlen(line), fmt, vl); - vfprintf(stderr, fmt, vl); + print_prefix= line[strlen(line)-1] == '\n'; + if(print_prefix && !strcmp(line, prev)){ + count++; + return; + } + if(count>0){ + fprintf(stderr, " Last message repeated %d times\n", count); + count=0; + } + fputs(line, stderr); + strcpy(prev, line); } static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback;