X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Flog.c;h=6c9e76aa24bf9f63d3e42cc1ad7d4889f22e03c1;hb=b9004bd50c2fa5d4c0ef71ec09c9e70ec83f2e87;hp=9248752a555a5d2bf50389dcff5787afd0d10bc2;hpb=c3b9f5fbce8affa618577932eceea37af7f544c5;p=ffmpeg

diff --git a/libavutil/log.c b/libavutil/log.c
index 9248752a555..6c9e76aa24b 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -20,36 +20,120 @@
  */
 
 /**
- * @file log.c
- * log.
+ * @file
+ * logging functions
  */
 
+#include <unistd.h>
+#include <stdlib.h>
 #include "avutil.h"
+#include "log.h"
 
+#if LIBAVUTIL_VERSION_MAJOR > 50
+static
+#endif
 int av_log_level = AV_LOG_INFO;
+static int flags;
+
+#if defined(_WIN32) && !defined(__MINGW32CE__)
+#include <windows.h>
+static const uint8_t color[] = {12,12,12,14,7,7,7};
+static int16_t background, attr_orig;
+static HANDLE con;
+#define set_color(x)  SetConsoleTextAttribute(con, background | color[x])
+#define reset_color() SetConsoleTextAttribute(con, attr_orig)
+#else
+static const uint8_t color[]={0x41,0x41,0x11,0x03,9,9,9};
+#define set_color(x)  fprintf(stderr, "\033[%d;3%dm", color[x]>>4, color[x]&15)
+#define reset_color() fprintf(stderr, "\033[0m")
+#endif
+static int use_color=-1;
+
+#undef fprintf
+static void colored_fputs(int level, const char *str){
+    if(use_color<0){
+#if defined(_WIN32) && !defined(__MINGW32CE__)
+        CONSOLE_SCREEN_BUFFER_INFO con_info;
+        con = GetStdHandle(STD_ERROR_HANDLE);
+        use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR");
+        if (use_color) {
+            GetConsoleScreenBufferInfo(con, &con_info);
+            attr_orig  = con_info.wAttributes;
+            background = attr_orig & 0xF0;
+        }
+#elif HAVE_ISATTY
+        use_color= !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR") &&
+            (getenv("TERM") && isatty(2) || getenv("FFMPEG_FORCE_COLOR"));
+#else
+        use_color= getenv("FFMPEG_FORCE_COLOR") && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR");
+#endif
+    }
+
+    if(use_color){
+        set_color(level);
+    }
+    fputs(str, stderr);
+    if(use_color){
+        reset_color();
+    }
+}
+
+const char* av_default_item_name(void* ptr){
+    return (*(AVClass**)ptr)->class_name;
+}
 
 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];
+    static int is_atty;
     AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
     if(level>av_log_level)
         return;
+    line[0]=0;
 #undef fprintf
     if(print_prefix && avc) {
-        fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), ptr);
+        if(avc->version >= (50<<16 | 15<<8 | 3) && avc->parent_log_context_offset){
+            AVClass** parent= *(AVClass***)(((uint8_t*)ptr) + avc->parent_log_context_offset);
+            if(parent && *parent){
+                snprintf(line, sizeof(line), "[%s @ %p] ", (*parent)->item_name(parent), parent);
+            }
+        }
+        snprintf(line + strlen(line), sizeof(line) - strlen(line), "[%s @ %p] ", avc->item_name(ptr), ptr);
     }
 
-    print_prefix= strstr(fmt, "\n") != NULL;
+    vsnprintf(line + strlen(line), sizeof(line) - strlen(line), fmt, vl);
+
+    print_prefix= line[strlen(line)-1] == '\n';
+
+#if HAVE_ISATTY
+    if(!is_atty) is_atty= isatty(2) ? 1 : -1;
+#endif
 
-    vfprintf(stderr, fmt, vl);
+    if(print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev)){
+        count++;
+        if(is_atty==1)
+            fprintf(stderr, "    Last message repeated %d times\r", count);
+        return;
+    }
+    if(count>0){
+        fprintf(stderr, "    Last message repeated %d times\n", count);
+        count=0;
+    }
+    colored_fputs(av_clip(level>>3, 0, 6), line);
+    strcpy(prev, line);
 }
 
 static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_default_callback;
 
 void av_log(void* avcl, int level, const char *fmt, ...)
 {
+    AVClass* avc= avcl ? *(AVClass**)avcl : NULL;
     va_list vl;
     va_start(vl, fmt);
+    if(avc && avc->version >= (50<<16 | 15<<8 | 2) && avc->log_level_offset_offset && level>=AV_LOG_FATAL)
+        level += *(int*)(((uint8_t*)avcl) + avc->log_level_offset_offset);
     av_vlog(avcl, level, fmt, vl);
     va_end(vl);
 }
@@ -69,6 +153,11 @@ void av_log_set_level(int level)
     av_log_level = level;
 }
 
+void av_log_set_flags(int arg)
+{
+    flags= arg;
+}
+
 void av_log_set_callback(void (*callback)(void*, int, const char*, va_list))
 {
     av_log_callback = callback;