log: Introduce a more verbose debug level

And deprecate av_dlog macro.

diff --git a/cmdutils.c b/cmdutils.c
index af8354aa197e767c81e20c3eeadb737e7dc0a09d..c4a78199f36ce5682a4fec5f0ba705a341dfa648 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -724,6 +724,7 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg)
         { "info"   , AV_LOG_INFO    },
         { "verbose", AV_LOG_VERBOSE },
         { "debug"  , AV_LOG_DEBUG   },
+        { "trace"  , AV_LOG_TRACE   },
     };
     char *tail;
     int level;

diff --git a/doc/APIchanges b/doc/APIchanges
index 35830f82789d29fb3181734ef73f3387dff5ab1d..5934f4517f7650569413b19ed146ba01630a4d08 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil:     2014-08-09
 
 API changes, most recent first:
 
+2015-xx-xx - xxxxxxx - lavu 54.12.0
+  Add AV_LOG_TRACE for extremely verbose debugging.
+
 2015-xx-xx - xxxxxxx - lavu 54.11.0
   Add av_small_strptime().
 

diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 852d3f8236c96b939af67ab17c4e7426d9b8ed85..79f764b58ccea00d1dfed18886fb5c54d1046de6 100644 (file)
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -145,6 +145,7 @@ Set the logging level used by the library.
 @item info
 @item verbose
 @item debug
+@item trace
 @end table
 
 By default the program logs to stderr, if coloring is supported by the

diff --git a/libavutil/log.c b/libavutil/log.c
index d38e40bfda5ee7818d94487d4c68a824a7881f16..7f2cb08597fbccca28204ebf0736c52ead66d93b 100644 (file)
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -43,16 +43,19 @@
 static int av_log_level = AV_LOG_INFO;
 static int flags;
 
+#define NB_LEVELS 8
 #if HAVE_SETCONSOLETEXTATTRIBUTE
 #include <windows.h>
-static const uint8_t color[] = { 12, 12, 12, 14, 7, 10, 11 };
+static const uint8_t color[NB_LEVELS] = { 12, 12, 12, 14, 7, 10, 11, 8};
 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)
 #define print_256color(x)
 #else
-static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06 };
+static const uint8_t color[NB_LEVELS] = {
+    0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06, 0x07
+};
 #define set_color(x)  fprintf(stderr, "\033[%d;3%dm", color[x] >> 4, color[x]&15)
 #define print_256color(x) fprintf(stderr, "\033[38;5;%dm", x)
 #define reset_color() fprintf(stderr, "\033[0m")
@@ -159,7 +162,7 @@ void av_log_default_callback(void *avcl, int level, const char *fmt, va_list vl)
         fprintf(stderr, "    Last message repeated %d times\n", count);
         count = 0;
     }
-    colored_fputs(av_clip(level >> 3, 0, 6), tint >> 8, line);
+    colored_fputs(av_clip(level >> 3, 0, NB_LEVELS - 1), tint >> 8, line);
     av_strlcpy(prev, line, sizeof line);
 }
 

diff --git a/libavutil/log.h b/libavutil/log.h
index 4e4424a5531d155b38f5c58ef77c923fce0c5e36..d4daea9c1a47b72f5e55727035d77bcec61cbed9 100644 (file)
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include "avutil.h"
 #include "attributes.h"
+#include "version.h"
 
 /**
  * Describe the class of an AVClass context structure. That is an
@@ -143,6 +144,11 @@ typedef struct AVClass {
  */
 #define AV_LOG_DEBUG    48
 
+/**
+ * Extremely verbose debugging, useful for libav* development.
+ */
+#define AV_LOG_TRACE    56
+
 /**
  * @}
  */
@@ -243,8 +249,10 @@ void av_log_default_callback(void *avcl, int level, const char *fmt,
  */
 const char* av_default_item_name(void* ctx);
 
+#if FF_API_DLOG
 /**
  * av_dlog macros
+ * @deprecated unused
  * Useful to print debug messages that shouldn't get compiled in normally.
  */
 
@@ -253,6 +261,7 @@ const char* av_default_item_name(void* ctx);
 #else
 #    define av_dlog(pctx, ...)
 #endif
+#endif /* FF_API_DLOG */
 
 /**
  * Skip repeated messages, this requires the user app to use av_log() instead of

diff --git a/libavutil/version.h b/libavutil/version.h
index 14a406e7da001d452ace07426e195c7eb849913e..eb2574ae813faf0cb942daf134d2a723881de7a6 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 54
-#define LIBAVUTIL_VERSION_MINOR 11
+#define LIBAVUTIL_VERSION_MINOR 12
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -111,6 +111,9 @@
 #ifndef FF_API_OPT_TYPE_METADATA
 #define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
+#ifndef FF_API_DLOG
+#define FF_API_DLOG                     (LIBAVUTIL_VERSION_MAJOR < 55)
+#endif
 
 
 /**