log.c: Use parameter passed to macro instead of the equivalent local variable

[ffmpeg] / libavutil / log.c

diff --git a/libavutil/log.c b/libavutil/log.c
index 1a8f3069583780e1860589e8140bb1ae474c595e..9e09a10398376f8d2572381af2e4bc47ca9108c9 100644 (file)
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -25,6 +25,7 @@
  */
 
 #include <unistd.h>
+#include <stdlib.h>
 #include "avutil.h"
 #include "log.h"
 
@@ -33,35 +34,71 @@ static
 #endif
 int av_log_level = AV_LOG_INFO;
 
-#if !HAVE_ISATTY
-#define isatty(s) 0
+#ifdef _WIN32
+#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 color, const char *str){
-    if(isatty(2)){
-        fprintf(stderr, "\033[%dm\033[3%dm", color>>4, color&15);
+static void colored_fputs(int level, const char *str){
+    if(use_color<0){
+#ifdef _WIN32
+        CONSOLE_SCREEN_BUFFER_INFO con_info;
+        con = GetStdHandle(STD_ERROR_HANDLE);
+        use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR");
+        if (use_color) {
+            GetConsoleScreenBufferInfo(con, &con_info);
+            attr_orig  = con_info.wAttributes;
+            background = attr_orig & 0xF0;
+        }
+#elif HAVE_ISATTY
+        use_color= getenv("TERM") && !getenv("NO_COLOR") && isatty(2);
+#else
+        use_color= 0;
+#endif
+    }
+
+    if(use_color){
+        set_color(level);
     }
     fputs(str, stderr);
-    if(isatty(2)){
-        fprintf(stderr, "\033[0m");
+    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 const uint8_t color[]={0x41,0x41,0x11,0x03,9,9,9};
     AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
     if(level>av_log_level)
         return;
+    line[0]=0;
 #undef fprintf
     if(print_prefix && avc) {
-        snprintf(line, sizeof(line), "[%s @ %p]", avc->item_name(ptr), ptr);
-    }else
-        line[0]=0;
+        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);
+    }
 
     vsnprintf(line + strlen(line), sizeof(line) - strlen(line), fmt, vl);
 
@@ -74,7 +111,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
         fprintf(stderr, "    Last message repeated %d times\n", count);
         count=0;
     }
-    colored_fputs(color[av_clip(level>>3, 0, 6)], line);
+    colored_fputs(av_clip(level>>3, 0, 6), line);
     strcpy(prev, line);
 }
 
@@ -82,8 +119,11 @@ static void (*av_log_callback)(void*, int, const char*, va_list) = av_log_defaul
 
 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);
 }