Remove a few if (p) av_freep(&p) forms

[ffmpeg] / libavutil / log.c

diff --git a/libavutil/log.c b/libavutil/log.c
index ce0dc4aa5253057fec151f545dea85ccd7311a4a..6c9e76aa24bf9f63d3e42cc1ad7d4889f22e03c1 100644 (file)
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -33,25 +33,48 @@
 static
 #endif
 int av_log_level = AV_LOG_INFO;
-
-static int use_ansi_color=-1;
+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 color, const char *str){
-    if(use_ansi_color<0){
-#if HAVE_ISATTY && !defined(_WIN32)
-        use_ansi_color= getenv("TERM") && !getenv("NO_COLOR") && isatty(2);
+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_ansi_color= 0;
+        use_color= getenv("FFMPEG_FORCE_COLOR") && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR");
 #endif
     }
 
-    if(use_ansi_color){
-        fprintf(stderr, "\033[%d;3%dm", color>>4, color&15);
+    if(use_color){
+        set_color(level);
     }
     fputs(str, stderr);
-    if(use_ansi_color){
-        fprintf(stderr, "\033[0m");
+    if(use_color){
+        reset_color();
     }
 }
 
@@ -64,7 +87,7 @@ 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};
+    static int is_atty;
     AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
     if(level>av_log_level)
         return;
@@ -74,24 +97,31 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
         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, sizeof(line), "[%s @ %p] ", (*parent)->item_name(parent), parent);
             }
         }
-        snprintf(line + strlen(line), sizeof(line) - strlen(line), "[%s @ %p]", avc->item_name(ptr), ptr);
+        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);
 
     print_prefix= line[strlen(line)-1] == '\n';
-    if(print_prefix && !strcmp(line, prev)){
+
+#if HAVE_ISATTY
+    if(!is_atty) is_atty= isatty(2) ? 1 : -1;
+#endif
+
+    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(color[av_clip(level>>3, 0, 6)], line);
+    colored_fputs(av_clip(level>>3, 0, 6), line);
     strcpy(prev, line);
 }
 
@@ -123,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;