Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c253340a
Commit
c253340a
authored
Mar 16, 2015
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log: Introduce a more verbose debug level
And deprecate av_dlog macro.
parent
b8d7f318
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
4 deletions
+24
-4
cmdutils.c
cmdutils.c
+1
-0
APIchanges
doc/APIchanges
+3
-0
avtools-common-opts.texi
doc/avtools-common-opts.texi
+1
-0
log.c
libavutil/log.c
+6
-3
log.h
libavutil/log.h
+9
-0
version.h
libavutil/version.h
+4
-1
No files found.
cmdutils.c
View file @
c253340a
...
@@ -724,6 +724,7 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg)
...
@@ -724,6 +724,7 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg)
{
"info"
,
AV_LOG_INFO
},
{
"info"
,
AV_LOG_INFO
},
{
"verbose"
,
AV_LOG_VERBOSE
},
{
"verbose"
,
AV_LOG_VERBOSE
},
{
"debug"
,
AV_LOG_DEBUG
},
{
"debug"
,
AV_LOG_DEBUG
},
{
"trace"
,
AV_LOG_TRACE
},
};
};
char
*
tail
;
char
*
tail
;
int
level
;
int
level
;
...
...
doc/APIchanges
View file @
c253340a
...
@@ -13,6 +13,9 @@ libavutil: 2014-08-09
...
@@ -13,6 +13,9 @@ libavutil: 2014-08-09
API changes, most recent first:
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
2015-xx-xx - xxxxxxx - lavu 54.11.0
Add av_small_strptime().
Add av_small_strptime().
...
...
doc/avtools-common-opts.texi
View file @
c253340a
...
@@ -145,6 +145,7 @@ Set the logging level used by the library.
...
@@ -145,6 +145,7 @@ Set the logging level used by the library.
@item info
@item info
@item verbose
@item verbose
@item debug
@item debug
@item trace
@end table
@end table
By default the program logs to stderr, if coloring is supported by the
By default the program logs to stderr, if coloring is supported by the
...
...
libavutil/log.c
View file @
c253340a
...
@@ -43,16 +43,19 @@
...
@@ -43,16 +43,19 @@
static
int
av_log_level
=
AV_LOG_INFO
;
static
int
av_log_level
=
AV_LOG_INFO
;
static
int
flags
;
static
int
flags
;
#define NB_LEVELS 8
#if HAVE_SETCONSOLETEXTATTRIBUTE
#if HAVE_SETCONSOLETEXTATTRIBUTE
#include <windows.h>
#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
int16_t
background
,
attr_orig
;
static
HANDLE
con
;
static
HANDLE
con
;
#define set_color(x) SetConsoleTextAttribute(con, background | color[x])
#define set_color(x) SetConsoleTextAttribute(con, background | color[x])
#define reset_color() SetConsoleTextAttribute(con, attr_orig)
#define reset_color() SetConsoleTextAttribute(con, attr_orig)
#define print_256color(x)
#define print_256color(x)
#else
#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 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 print_256color(x) fprintf(stderr, "\033[38;5;%dm", x)
#define reset_color() fprintf(stderr, "\033[0m")
#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)
...
@@ -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
);
fprintf
(
stderr
,
" Last message repeated %d times
\n
"
,
count
);
count
=
0
;
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
);
av_strlcpy
(
prev
,
line
,
sizeof
line
);
}
}
...
...
libavutil/log.h
View file @
c253340a
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
#include <stdarg.h>
#include <stdarg.h>
#include "avutil.h"
#include "avutil.h"
#include "attributes.h"
#include "attributes.h"
#include "version.h"
/**
/**
* Describe the class of an AVClass context structure. That is an
* Describe the class of an AVClass context structure. That is an
...
@@ -143,6 +144,11 @@ typedef struct AVClass {
...
@@ -143,6 +144,11 @@ typedef struct AVClass {
*/
*/
#define AV_LOG_DEBUG 48
#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,
...
@@ -243,8 +249,10 @@ void av_log_default_callback(void *avcl, int level, const char *fmt,
*/
*/
const
char
*
av_default_item_name
(
void
*
ctx
);
const
char
*
av_default_item_name
(
void
*
ctx
);
#if FF_API_DLOG
/**
/**
* av_dlog macros
* av_dlog macros
* @deprecated unused
* Useful to print debug messages that shouldn't get compiled in normally.
* Useful to print debug messages that shouldn't get compiled in normally.
*/
*/
...
@@ -253,6 +261,7 @@ const char* av_default_item_name(void* ctx);
...
@@ -253,6 +261,7 @@ const char* av_default_item_name(void* ctx);
#else
#else
# define av_dlog(pctx, ...)
# define av_dlog(pctx, ...)
#endif
#endif
#endif
/* FF_API_DLOG */
/**
/**
* Skip repeated messages, this requires the user app to use av_log() instead of
* Skip repeated messages, this requires the user app to use av_log() instead of
...
...
libavutil/version.h
View file @
c253340a
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
*/
*/
#define LIBAVUTIL_VERSION_MAJOR 54
#define LIBAVUTIL_VERSION_MAJOR 54
#define LIBAVUTIL_VERSION_MINOR 1
1
#define LIBAVUTIL_VERSION_MINOR 1
2
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
...
@@ -111,6 +111,9 @@
...
@@ -111,6 +111,9 @@
#ifndef FF_API_OPT_TYPE_METADATA
#ifndef FF_API_OPT_TYPE_METADATA
#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55)
#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#endif
#ifndef FF_API_DLOG
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment