har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/ebur128: add framelog option.

Browse Source
This commit is contained in:
Clément Bœsch 2013-03-15 02:32:25 +01:00
parent 1f68bac50b
commit db670e5366
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/filters.texi
View File

@ -6531,6 +6531,19 @@ Set the EBU scale meter. Default is @code{9}. Common values are @code{9} and
@code{18}, respectively for EBU scale meter +9 and EBU scale meter +18. Any @code{18}, respectively for EBU scale meter +9 and EBU scale meter +18. Any
other integer value between this range is allowed. other integer value between this range is allowed.
@item framelog
Force the frame logging level.
Available values are:
@table @samp
@item info
information logging level
@item verbose
verbose logging level
@end table
By default, the logging level is set to @var{info}. If the @option{video}
option is set, it switches to @var{verbose}.
@end table @end table
@subsection Examples @subsection Examples

18
libavfilter/f_ebur128.c
View File

@ -123,6 +123,9 @@ typedef struct {
double integrated_loudness; ///< integrated loudness in LUFS (I) double integrated_loudness; ///< integrated loudness in LUFS (I)
double loudness_range; ///< loudness range in LU (LRA) double loudness_range; ///< loudness range in LU (LRA)
double lra_low, lra_high; ///< low and high LRA values double lra_low, lra_high; ///< low and high LRA values
/* misc */
int loglevel; ///< log level for frame logging
} EBUR128Context; } EBUR128Context;
#define OFFSET(x) offsetof(EBUR128Context, x) #define OFFSET(x) offsetof(EBUR128Context, x)
@ -133,6 +136,9 @@ static const AVOption ebur128_options[] = {
{ "video", "set video output", OFFSET(do_video), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, V|F }, { "video", "set video output", OFFSET(do_video), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, V|F },
{ "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, V|F }, { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, V|F },
{ "meter", "set scale meter (+9 to +18)", OFFSET(meter), AV_OPT_TYPE_INT, {.i64 = 9}, 9, 18, V|F }, { "meter", "set scale meter (+9 to +18)", OFFSET(meter), AV_OPT_TYPE_INT, {.i64 = 9}, 9, 18, V|F },
{ "framelog", "force frame logging level", OFFSET(loglevel), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, A|V|F, "level" },
{ "info", "information logging level", 0, AV_OPT_TYPE_CONST, {.i64 = AV_LOG_INFO}, INT_MIN, INT_MAX, A|V|F, "level" },
{ "verbose", "verbose logging level", 0, AV_OPT_TYPE_CONST, {.i64 = AV_LOG_VERBOSE}, INT_MIN, INT_MAX, A|V|F, "level" },
{ NULL }, { NULL },
}; };
@ -386,6 +392,14 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if ((ret = av_set_options_string(ebur128, args, "=", ":")) < 0) if ((ret = av_set_options_string(ebur128, args, "=", ":")) < 0)
return ret; return ret;
if (ebur128->loglevel != AV_LOG_INFO &&
ebur128->loglevel != AV_LOG_VERBOSE) {
if (ebur128->do_video)
ebur128->loglevel = AV_LOG_VERBOSE;
else
ebur128->loglevel = AV_LOG_INFO;
}
// if meter is +9 scale, scale range is from -18 LU to +9 LU (or 3*9) // if meter is +9 scale, scale range is from -18 LU to +9 LU (or 3*9)
// if meter is +18 scale, scale range is from -36 LU to +18 LU (or 3*18) // if meter is +18 scale, scale range is from -36 LU to +18 LU (or 3*18)
ebur128->scale_range = 3 * ebur128->meter; ebur128->scale_range = 3 * ebur128->meter;
@ -643,8 +657,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
return ret; return ret;
} }
av_log(ctx, ebur128->do_video ? AV_LOG_VERBOSE : AV_LOG_INFO, av_log(ctx, ebur128->loglevel, "t: %-10s " LOG_FMT "\n",
"t: %-10s " LOG_FMT "\n", av_ts2timestr(pts, &outlink->time_base), av_ts2timestr(pts, &outlink->time_base),
loudness_400, loudness_3000, loudness_400, loudness_3000,
ebur128->integrated_loudness, ebur128->loudness_range); ebur128->integrated_loudness, ebur128->loudness_range);
} }

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 45 #define LIBAVFILTER_VERSION_MINOR 45
#define LIBAVFILTER_VERSION_MICRO 103 #define LIBAVFILTER_VERSION_MICRO 104
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \