Optimise audio filters; tweak order of the LPFs in the upmixers.

[dcpomatic.git] / src / lib / audio_filter.h

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index 9fc69daadb23574158e6b298d7b0140a23071716..912e8c210d3ad9b9129df6f308108ba6b2069a56 100644 (file)
--- a/src/lib/audio_filter.h
+++ b/src/lib/audio_filter.h
@@ -17,17 +17,19 @@
 
 */
 
-#include <vector>
+#ifndef DCPOMATIC_AUDIO_FILTER_H
+#define DCPOMATIC_AUDIO_FILTER_H
+
 #include <boost/shared_ptr.hpp>
 
 class AudioBuffers;
-class audio_filter_impulse_kernel_test;
 struct audio_filter_impulse_input_test;
 
 class AudioFilter
 {
 public:
        AudioFilter (float transition_bandwidth)
+               : _ir (0)
        {
                _M = 4 / transition_bandwidth;
                if (_M % 2) {
@@ -35,7 +37,9 @@ public:
                }
        }
 
-       boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<AudioBuffers> in);
+       virtual ~AudioFilter ();
+
+       boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers> in);
 
        void flush ();
 
@@ -43,9 +47,9 @@ protected:
        friend struct audio_filter_impulse_kernel_test;
        friend struct audio_filter_impulse_input_test;
 
-       std::vector<float> sinc_blackman (float cutoff, bool invert) const;
+       float* sinc_blackman (float cutoff, bool invert) const;
 
-       std::vector<float> _ir;
+       float* _ir;
        int _M;
        boost::shared_ptr<AudioBuffers> _tail;
 };
@@ -80,3 +84,5 @@ public:
         */
        BandPassAudioFilter (float transition_bandwidth, float lower, float higher);
 };
+
+#endif