X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_filter.cc;h=281ac966831c8e80de73609a96a12132a763d67a;hp=24aa244f2fe7bc2e18da7b5259f0a09e10b44d78;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=16e560c3815b52609de103b45c1d5d2cbf155b97 diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc index 24aa244f2..281ac9668 100644 --- a/src/lib/audio_filter.cc +++ b/src/lib/audio_filter.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,14 +18,18 @@ */ + #include "audio_filter.h" #include "audio_buffers.h" #include "util.h" #include + +using std::make_shared; using std::min; using std::shared_ptr; + /** @return array of floats which the caller must destroy with delete[] */ float * AudioFilter::sinc_blackman (float cutoff, bool invert) const @@ -68,15 +72,17 @@ AudioFilter::sinc_blackman (float cutoff, bool invert) const return ir; } + AudioFilter::~AudioFilter () { delete[] _ir; } + shared_ptr AudioFilter::run (shared_ptr in) { - shared_ptr out (new AudioBuffers (in->channels(), in->frames())); + auto out = make_shared(in->channels(), in->frames()); if (!_tail) { _tail.reset (new AudioBuffers (in->channels(), _M + 1)); @@ -87,9 +93,9 @@ AudioFilter::run (shared_ptr in) int const frames = in->frames (); for (int i = 0; i < channels; ++i) { - float* tail_p = _tail->data (i); - float* in_p = in->data (i); - float* out_p = out->data (i); + auto tail_p = _tail->data (i); + auto in_p = in->data (i); + auto out_p = out->data (i); for (int j = 0; j < frames; ++j) { float s = 0; for (int k = 0; k <= _M; ++k) { @@ -113,12 +119,14 @@ AudioFilter::run (shared_ptr in) return out; } + void AudioFilter::flush () { _tail.reset (); } + LowPassAudioFilter::LowPassAudioFilter (float transition_bandwidth, float cutoff) : AudioFilter (transition_bandwidth) { @@ -132,11 +140,12 @@ HighPassAudioFilter::HighPassAudioFilter (float transition_bandwidth, float cuto _ir = sinc_blackman (cutoff, true); } + BandPassAudioFilter::BandPassAudioFilter (float transition_bandwidth, float lower, float higher) : AudioFilter (transition_bandwidth) { - float* lpf = sinc_blackman (lower, false); - float* hpf = sinc_blackman (higher, true); + auto lpf = sinc_blackman (lower, false); + auto hpf = sinc_blackman (higher, true); delete[] _ir; _ir = new float[_M + 1];