projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
audio_filter.h
diff --git
a/src/lib/audio_filter.h
b/src/lib/audio_filter.h
index fb7b7b92ccb64283d7bc01235b35d486f0c5422b..86fdce590cf0a5dc6eddba42ad8566779c332c73 100644
(file)
--- a/
src/lib/audio_filter.h
+++ b/
src/lib/audio_filter.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-21,11
+21,15
@@
#ifndef DCPOMATIC_AUDIO_FILTER_H
#define DCPOMATIC_AUDIO_FILTER_H
#ifndef DCPOMATIC_AUDIO_FILTER_H
#define DCPOMATIC_AUDIO_FILTER_H
-#include <boost/shared_ptr.hpp>
+
+#include <memory>
+#include <vector>
+
class AudioBuffers;
struct audio_filter_impulse_input_test;
class AudioBuffers;
struct audio_filter_impulse_input_test;
+
/** An audio filter which can take AudioBuffers and apply some filtering operation,
* returning filtered samples
*/
/** An audio filter which can take AudioBuffers and apply some filtering operation,
* returning filtered samples
*/
@@
-33,7
+37,6
@@
class AudioFilter
{
public:
explicit AudioFilter (float transition_bandwidth)
{
public:
explicit AudioFilter (float transition_bandwidth)
- : _ir (0)
{
_M = 4 / transition_bandwidth;
if (_M % 2) {
{
_M = 4 / transition_bandwidth;
if (_M % 2) {
@@
-41,9
+44,9
@@
public:
}
}
}
}
- virtual ~AudioFilter ()
;
+ virtual ~AudioFilter ()
{}
-
boost::shared_ptr<AudioBuffers> run (boost
::shared_ptr<const AudioBuffers> in);
+
std::shared_ptr<AudioBuffers> run (std
::shared_ptr<const AudioBuffers> in);
void flush ();
void flush ();
@@
-51,13
+54,14
@@
protected:
friend struct audio_filter_impulse_kernel_test;
friend struct audio_filter_impulse_input_test;
friend struct audio_filter_impulse_kernel_test;
friend struct audio_filter_impulse_input_test;
-
float*
sinc_blackman (float cutoff, bool invert) const;
+
std::vector<float>
sinc_blackman (float cutoff, bool invert) const;
-
float*
_ir;
+
std::vector<float>
_ir;
int _M;
int _M;
-
boost
::shared_ptr<AudioBuffers> _tail;
+
std
::shared_ptr<AudioBuffers> _tail;
};
};
+
class LowPassAudioFilter : public AudioFilter
{
public:
class LowPassAudioFilter : public AudioFilter
{
public:
@@
-68,6
+72,7
@@
public:
LowPassAudioFilter (float transition_bandwidth, float cutoff);
};
LowPassAudioFilter (float transition_bandwidth, float cutoff);
};
+
class HighPassAudioFilter : public AudioFilter
{
public:
class HighPassAudioFilter : public AudioFilter
{
public:
@@
-78,6
+83,7
@@
public:
HighPassAudioFilter (float transition_bandwidth, float cutoff);
};
HighPassAudioFilter (float transition_bandwidth, float cutoff);
};
+
class BandPassAudioFilter : public AudioFilter
{
public:
class BandPassAudioFilter : public AudioFilter
{
public:
@@
-89,4
+95,5
@@
public:
BandPassAudioFilter (float transition_bandwidth, float lower, float higher);
};
BandPassAudioFilter (float transition_bandwidth, float lower, float higher);
};
+
#endif
#endif