diff options
author | Clément Bœsch <ubitux@gmail.com> | 2013-03-15 05:32:25 +0400 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2013-03-15 05:35:26 +0400 |
commit | db670e536632b62578b5041a69e9f0accacb4529 (patch) | |
tree | fdb588b5d8ceb4aa82e094abf96146d7808a0eea /libavfilter | |
parent | 1f68bac50be01fb9a463b0d6ef953ee85fb61e9b (diff) |
lavfi/ebur128: add framelog option.
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/f_ebur128.c | 18 | ||||
-rw-r--r-- | libavfilter/version.h | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index 6431dfab84..33cea40d66 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -123,6 +123,9 @@ typedef struct { double integrated_loudness; ///< integrated loudness in LUFS (I) double loudness_range; ///< loudness range in LU (LRA) double lra_low, lra_high; ///< low and high LRA values + + /* misc */ + int loglevel; ///< log level for frame logging } EBUR128Context; #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 }, { "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 }, + { "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 }, }; @@ -386,6 +392,14 @@ static av_cold int init(AVFilterContext *ctx, const char *args) if ((ret = av_set_options_string(ebur128, args, "=", ":")) < 0) 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 +18 scale, scale range is from -36 LU to +18 LU (or 3*18) ebur128->scale_range = 3 * ebur128->meter; @@ -643,8 +657,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) return ret; } - av_log(ctx, ebur128->do_video ? AV_LOG_VERBOSE : AV_LOG_INFO, - "t: %-10s " LOG_FMT "\n", av_ts2timestr(pts, &outlink->time_base), + av_log(ctx, ebur128->loglevel, "t: %-10s " LOG_FMT "\n", + av_ts2timestr(pts, &outlink->time_base), loudness_400, loudness_3000, ebur128->integrated_loudness, ebur128->loudness_range); } diff --git a/libavfilter/version.h b/libavfilter/version.h index bcfb12a109..b3ef3a2416 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #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, \ LIBAVFILTER_VERSION_MINOR, \ |