log: Introduce a more verbose debug level

And deprecate av_dlog macro.

Vittorio Giovara committed 11 years ago

Commit c2533401 parent b8d7f316 files · +24 −4Browse files

Unified · Split

6 files

@@ -724,6 +724,7 @@ int opt_loglevel(void optctx, const char opt, const char *arg) · 723 unmodified lines
724	{ "info" , AV_LOG_INFO },	724	{ "info" , AV_LOG_INFO },
725	{ "verbose", AV_LOG_VERBOSE },	725	{ "verbose", AV_LOG_VERBOSE },
726	{ "debug" , AV_LOG_DEBUG },	726	{ "debug" , AV_LOG_DEBUG },
		727	{ "trace" , AV_LOG_TRACE },
727	};	728	};
728	char *tail;	729	char *tail;
729	int level;	730	int level;

@@ -13,6 +13,9 @@ libavutil: 2014-08-09 · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2015-xx-xx - xxxxxxx - lavu 54.12.0
		17	Add AV_LOG_TRACE for extremely verbose debugging.
		18
16	2015-xx-xx - xxxxxxx - lavu 54.11.0	19	2015-xx-xx - xxxxxxx - lavu 54.11.0
17	Add av_small_strptime().	20	Add av_small_strptime().
18		21

@@ -145,6 +145,7 @@ Set the logging level used by the library. · 144 unmodified lines
145	@item info	145	@item info
146	@item verbose	146	@item verbose
147	@item debug	147	@item debug
		148	@item trace
148	@end table	149	@end table
149		150
150	By default the program logs to stderr, if coloring is supported by the	151	By default the program logs to stderr, if coloring is supported by the

 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")
         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);
 }

 #include <stdarg.h>
 #include "avutil.h"
 #include "attributes.h"
+#include "version.h"
 /**
  * Describe the class of an AVClass context structure. That is an
  */
 #define AV_LOG_DEBUG    48
+/**
+ * Extremely verbose debugging, useful for libav* development.
+ */
+#define AV_LOG_TRACE    56
 /**
  * @}
  */
  */
 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.
  */
 #else
 #    define av_dlog(pctx, ...)
 #endif
+#endif /* FF_API_DLOG */
 /**
  * Skip repeated messages, this requires the user app to use av_log() instead of

  */
 #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, \
 #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
 /**

Keyboard shortcuts