From 00909414743c6286137e5bf6bf07fe282feac1e0 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Mon, 9 Mar 2015 22:18:27 +0100 Subject: [PATCH] Start each log line, with filter name, in order to make parse by scripts much easier --- libavfilter/f_ebur128.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index c18ae79..016766c 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -859,18 +859,15 @@ static av_cold void uninit(AVFilterContext *ctx) int i; EBUR128Context *ebur128 = ctx->priv; - av_log(ctx, AV_LOG_INFO, "Summary:\n\n" - " Integrated loudness:\n" - " I: %5.1f LUFS\n" - " Threshold: %5.1f LUFS\n\n" - " Loudness range:\n" - " LRA: %5.1f LU\n" - " Threshold: %5.1f LUFS\n" - " LRA low: %5.1f LUFS\n" - " LRA high: %5.1f LUFS", - ebur128->integrated_loudness, ebur128->i400.rel_threshold, - ebur128->loudness_range, ebur128->i3000.rel_threshold, - ebur128->lra_low, ebur128->lra_high); + av_log(ctx, AV_LOG_INFO, "Summary:\n"); + av_log(ctx, AV_LOG_INFO, " Integrated loudness:\n"); + av_log(ctx, AV_LOG_INFO, " I: %5.1f LUFS\n",ebur128->integrated_loudness); + av_log(ctx, AV_LOG_INFO, " Threshold: %5.1f LUFS\n", ebur128->i400.rel_threshold); + av_log(ctx, AV_LOG_INFO, " Loudness range:\n"); + av_log(ctx, AV_LOG_INFO, " LRA: %5.1f LU\n", ebur128->loudness_range); + av_log(ctx, AV_LOG_INFO, " Threshold: %5.1f LUFS\n", ebur128->i3000.rel_threshold); + av_log(ctx, AV_LOG_INFO, " LRA low: %5.1f LUFS\n", ebur128->lra_low); + av_log(ctx, AV_LOG_INFO, " LRA high: %5.1f LUFS\n", ebur128->lra_high); #define PRINT_PEAK_SUMMARY(str, sp, ptype) do { \ int ch; \ @@ -879,15 +876,14 @@ static av_cold void uninit(AVFilterContext *ctx) if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) { \ for (ch = 0; ch < ebur128->nb_channels; ch++) \ maxpeak = FFMAX(maxpeak, sp[ch]); \ - av_log(ctx, AV_LOG_INFO, "\n\n " str " peak:\n" \ - " Peak: %5.1f dBFS", \ + av_log(ctx, AV_LOG_INFO, " " str " peak:\n"); \ + av_log(ctx, AV_LOG_INFO, " Peak: %5.1f dBFS\n", \ DBFS(maxpeak)); \ } \ } while (0) PRINT_PEAK_SUMMARY("Sample", ebur128->sample_peaks, SAMPLES); PRINT_PEAK_SUMMARY("True", ebur128->true_peaks, TRUE); - av_log(ctx, AV_LOG_INFO, "\n"); av_freep(&ebur128->y_line_ref); av_freep(&ebur128->ch_weighting); -- 1.9.3 (Apple Git-50)