From 5f6a055ac7495432548fc2dd332aa286a74a8286 Mon Sep 17 00:00:00 2001 From: Kyle Swanson Date: Sun, 12 Jun 2016 15:34:54 -0500 Subject: [PATCH 2/3] avfilter/af_loudnorm: use internal ebur128 api --- configure | 5 ----- libavfilter/Makefile | 2 +- libavfilter/af_loudnorm.c | 56 +++++++++++++++++++++++------------------------ 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/configure b/configure index a220fa1..171cefe 100755 --- a/configure +++ b/configure @@ -227,8 +227,6 @@ External library support: --enable-libcdio enable audio CD grabbing with libcdio [no] --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [no] - --enable-libebur128 enable libebur128 for EBU R128 measurement, - needed for loudnorm filter [no] --enable-libfaac enable AAC encoding via libfaac [no] --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] --enable-libflite enable flite (voice synthesis) support via libflite [no] @@ -1475,7 +1473,6 @@ EXTERNAL_LIBRARY_LIST=" libcdio libcelt libdc1394 - libebur128 libfaac libfdk_aac libflite @@ -3010,7 +3007,6 @@ hqdn3d_filter_deps="gpl" interlace_filter_deps="gpl" kerndeint_filter_deps="gpl" ladspa_filter_deps="ladspa dlopen" -loudnorm_filter_deps="libebur128" mcdeint_filter_deps="avcodec gpl" movie_filter_deps="avcodec avformat" mpdecimate_filter_deps="gpl" @@ -5633,7 +5629,6 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config caca caca.h caca_create_canvas -enabled libebur128 && require ebur128 ebur128.h ebur128_relative_threshold -lebur128 enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac enabled libfdk_aac && { use_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 65a831e..cd535cb 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -89,7 +89,7 @@ OBJS-$(CONFIG_FLANGER_FILTER) += af_flanger.o generate_wave_table OBJS-$(CONFIG_HIGHPASS_FILTER) += af_biquads.o OBJS-$(CONFIG_JOIN_FILTER) += af_join.o OBJS-$(CONFIG_LADSPA_FILTER) += af_ladspa.o -OBJS-$(CONFIG_LOUDNORM_FILTER) += af_loudnorm.o +OBJS-$(CONFIG_LOUDNORM_FILTER) += af_loudnorm.o ebur128.o OBJS-$(CONFIG_LOWPASS_FILTER) += af_biquads.o OBJS-$(CONFIG_PAN_FILTER) += af_pan.o OBJS-$(CONFIG_REPLAYGAIN_FILTER) += af_replaygain.o diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c index 604697e..6c3fe27 100644 --- a/libavfilter/af_loudnorm.c +++ b/libavfilter/af_loudnorm.c @@ -24,7 +24,7 @@ #include "avfilter.h" #include "internal.h" #include "audio.h" -#include +#include "ebur128.h" enum FrameType { FIRST_FRAME, @@ -437,15 +437,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) buf = s->buf; limiter_buf = s->limiter_buf; - ebur128_add_frames_double(s->r128_in, src, in->nb_samples); + ff_ebur128_add_frames_double(s->r128_in, src, in->nb_samples); if (s->frame_type == FIRST_FRAME && in->nb_samples < frame_size(inlink->sample_rate, 3000)) { double offset, offset_tp, true_peak; - ebur128_loudness_global(s->r128_in, &global); + ff_ebur128_loudness_global(s->r128_in, &global); for (c = 0; c < inlink->channels; c++) { double tmp; - ebur128_sample_peak(s->r128_in, c, &tmp); + ff_ebur128_sample_peak(s->r128_in, c, &tmp); if (c == 0 || tmp > true_peak) true_peak = tmp; } @@ -467,7 +467,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) s->buf_index += inlink->channels; } - ebur128_loudness_shortterm(s->r128_in, &shortterm); + ff_ebur128_loudness_shortterm(s->r128_in, &shortterm); if (shortterm < s->measured_thresh) { s->above_threshold = 0; @@ -497,7 +497,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) subframe_length = frame_size(inlink->sample_rate, 100); true_peak_limiter(s, dst, subframe_length, inlink->channels); - ebur128_add_frames_double(s->r128_out, dst, subframe_length); + ff_ebur128_add_frames_double(s->r128_out, dst, subframe_length); s->pts += out->nb_samples = @@ -536,12 +536,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) s->limiter_buf_index = s->limiter_buf_index + subframe_length < s->limiter_buf_size ? s->limiter_buf_index + subframe_length : s->limiter_buf_index + subframe_length - s->limiter_buf_size; true_peak_limiter(s, dst, in->nb_samples, inlink->channels); - ebur128_add_frames_double(s->r128_out, dst, in->nb_samples); + ff_ebur128_add_frames_double(s->r128_out, dst, in->nb_samples); - ebur128_loudness_range(s->r128_in, &lra); - ebur128_loudness_global(s->r128_in, &global); - ebur128_loudness_shortterm(s->r128_in, &shortterm); - ebur128_relative_threshold(s->r128_in, &relative_threshold); + ff_ebur128_loudness_range(s->r128_in, &lra); + ff_ebur128_loudness_global(s->r128_in, &global); + ff_ebur128_loudness_shortterm(s->r128_in, &shortterm); + ff_ebur128_relative_threshold(s->r128_in, &relative_threshold); if (s->above_threshold == 0) { double shortterm_out; @@ -549,7 +549,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (shortterm > s->measured_thresh) s->prev_delta *= 1.0058; - ebur128_loudness_shortterm(s->r128_out, &shortterm_out); + ff_ebur128_loudness_shortterm(s->r128_out, &shortterm_out); if (shortterm_out >= s->target_i) s->above_threshold = 1; } @@ -611,7 +611,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } dst = (double *)out->data[0]; - ebur128_add_frames_double(s->r128_out, dst, in->nb_samples); + ff_ebur128_add_frames_double(s->r128_out, dst, in->nb_samples); break; case LINEAR_MODE: @@ -624,7 +624,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } dst = (double *)out->data[0]; - ebur128_add_frames_double(s->r128_out, dst, in->nb_samples); + ff_ebur128_add_frames_double(s->r128_out, dst, in->nb_samples); s->pts += in->nb_samples; break; } @@ -725,17 +725,17 @@ static int config_input(AVFilterLink *inlink) AVFilterContext *ctx = inlink->dst; LoudNormContext *s = ctx->priv; - s->r128_in = ebur128_init(inlink->channels, inlink->sample_rate, EBUR128_MODE_I | EBUR128_MODE_S | EBUR128_MODE_LRA | EBUR128_MODE_SAMPLE_PEAK); + s->r128_in = ff_ebur128_init(inlink->channels, inlink->sample_rate, EBUR128_MODE_I | EBUR128_MODE_S | EBUR128_MODE_LRA | EBUR128_MODE_SAMPLE_PEAK); if (!s->r128_in) return AVERROR(ENOMEM); - s->r128_out = ebur128_init(inlink->channels, inlink->sample_rate, EBUR128_MODE_I | EBUR128_MODE_S | EBUR128_MODE_LRA | EBUR128_MODE_SAMPLE_PEAK); + s->r128_out = ff_ebur128_init(inlink->channels, inlink->sample_rate, EBUR128_MODE_I | EBUR128_MODE_S | EBUR128_MODE_LRA | EBUR128_MODE_SAMPLE_PEAK); if (!s->r128_out) return AVERROR(ENOMEM); if (inlink->channels == 1 && s->dual_mono) { - ebur128_set_channel(s->r128_in, 0, EBUR128_DUAL_MONO); - ebur128_set_channel(s->r128_out, 0, EBUR128_DUAL_MONO); + ff_ebur128_set_channel(s->r128_in, 0, EBUR128_DUAL_MONO); + ff_ebur128_set_channel(s->r128_out, 0, EBUR128_DUAL_MONO); } s->buf_size = frame_size(inlink->sample_rate, 3000) * inlink->channels; @@ -799,22 +799,22 @@ static av_cold void uninit(AVFilterContext *ctx) if (!s->r128_in || !s->r128_out) goto end; - ebur128_loudness_range(s->r128_in, &lra_in); - ebur128_loudness_global(s->r128_in, &i_in); - ebur128_relative_threshold(s->r128_in, &thresh_in); + ff_ebur128_loudness_range(s->r128_in, &lra_in); + ff_ebur128_loudness_global(s->r128_in, &i_in); + ff_ebur128_relative_threshold(s->r128_in, &thresh_in); for (c = 0; c < s->channels; c++) { double tmp; - ebur128_sample_peak(s->r128_in, c, &tmp); + ff_ebur128_sample_peak(s->r128_in, c, &tmp); if ((c == 0) || (tmp > tp_in)) tp_in = tmp; } - ebur128_loudness_range(s->r128_out, &lra_out); - ebur128_loudness_global(s->r128_out, &i_out); - ebur128_relative_threshold(s->r128_out, &thresh_out); + ff_ebur128_loudness_range(s->r128_out, &lra_out); + ff_ebur128_loudness_global(s->r128_out, &i_out); + ff_ebur128_relative_threshold(s->r128_out, &thresh_out); for (c = 0; c < s->channels; c++) { double tmp; - ebur128_sample_peak(s->r128_out, c, &tmp); + ff_ebur128_sample_peak(s->r128_out, c, &tmp); if ((c == 0) || (tmp > tp_out)) tp_out = tmp; } @@ -881,9 +881,9 @@ static av_cold void uninit(AVFilterContext *ctx) end: if (s->r128_in) - ebur128_destroy(&s->r128_in); + ff_ebur128_destroy(&s->r128_in); if (s->r128_out) - ebur128_destroy(&s->r128_out); + ff_ebur128_destroy(&s->r128_out); av_freep(&s->limiter_buf); av_freep(&s->prev_smp); av_freep(&s->buf); -- 2.5.4 (Apple Git-61)