fix more cut-n-paste coding errors

[ardour.git] / libs / ardour / dsp_filter.cc

diff --git a/libs/ardour/dsp_filter.cc b/libs/ardour/dsp_filter.cc
index 3b93c9c6f3e71cba0fd227d20b8f06f8e519e90b..5e2cff6799cf5ad185547c55a9454b0754cd466c 100644 (file)
--- a/libs/ardour/dsp_filter.cc
+++ b/libs/ardour/dsp_filter.cc
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <cmath>
 #include "ardour/dB.h"
+#include "ardour/buffer.h"
 #include "ardour/dsp_filter.h"
 
 #ifdef COMPILER_MSVC
@@ -52,7 +53,7 @@ ARDOUR::DSP::mmult (float *data, float *mult, const uint32_t n_samples) {
 
 float
 ARDOUR::DSP::log_meter (float power) {
-       // compare to gtk2_ardour/logmeter.h
+       // compare to libs/ardour/log_meter.h
        static const float lower_db = -192.f;
        static const float upper_db = 0.f;
        static const float non_linearity = 8.0;
@@ -66,13 +67,42 @@ ARDOUR::DSP::log_meter_coeff (float coeff) {
 }
 
 void
-ARDOUR::DSP::peaks (float *data, float &min, float &max, uint32_t n_samples) {
+ARDOUR::DSP::peaks (const float *data, float &min, float &max, uint32_t n_samples) {
        for (uint32_t i = 0; i < n_samples; ++i) {
                if (data[i] < min) min = data[i];
                if (data[i] > max) max = data[i];
        }
 }
 
+void
+ARDOUR::DSP::process_map (BufferSet* bufs, const ChanMapping& in, const ChanMapping& out, pframes_t nframes, samplecnt_t offset, const DataType& dt)
+{
+       const ChanMapping::Mappings& im (in.mappings());
+       const ChanMapping::Mappings& om (out.mappings());
+
+       for (ChanMapping::Mappings::const_iterator tm = im.begin(); tm != im.end(); ++tm) {
+               if (tm->first != dt) { continue; }
+               for (ChanMapping::TypeMapping::const_iterator i = tm->second.begin(); i != tm->second.end(); ++i) {
+                       bool valid;
+                       const uint32_t idx = out.get (dt, i->second, &valid);
+                       if (valid && idx != i->first) {
+                               bufs->get (dt, idx).read_from (bufs->get (dt, i->first), nframes, offset, offset);
+                       }
+               }
+       }
+       for (ChanMapping::Mappings::const_iterator tm = im.begin(); tm != im.end(); ++tm) {
+               if (tm->first != dt) { continue; }
+               for (ChanMapping::TypeMapping::const_iterator i = tm->second.begin(); i != tm->second.end(); ++i) {
+                       bool valid;
+                       in.get_src (dt, i->first, &valid);
+                       if (!valid) {
+                               bufs->get (dt, i->second).silence (nframes, offset);
+                       }
+               }
+       }
+
+}
+
 LowPass::LowPass (double samplerate, float freq)
        : _rate (samplerate)
        , _z (0)
@@ -167,9 +197,9 @@ Biquad::configure (double a1, double a2, double b0, double b1, double b2)
 void
 Biquad::compute (Type type, double freq, double Q, double gain)
 {
-       if (Q <= .001)     { Q = 0.001; }
-       if (freq <= 1.)    { freq = 1.; }
-       if (freq >= _rate) { freq = _rate; }
+       if (Q <= .001)  { Q = 0.001; }
+       if (freq <= 1.) { freq = 1.; }
+       if (freq >= 0.4998 * _rate) { freq = 0.4998 * _rate; }
 
        /* Compute biquad filter settings.
         * Based on 'Cookbook formulae for audio EQ biquad filter coefficents'
@@ -324,6 +354,7 @@ FFTSpectrum::~FFTSpectrum ()
 void
 FFTSpectrum::init (uint32_t window_size, double rate)
 {
+       assert (window_size > 0);
        Glib::Threads::Mutex::Lock lk (fft_planner_lock);
 
        _fft_window_size = window_size;
@@ -390,7 +421,89 @@ FFTSpectrum::execute ()
 
 float
 FFTSpectrum::power_at_bin (const uint32_t b, const float norm) const {
-       assert (b >= 0 && b < _fft_data_size);
+       assert (b < _fft_data_size);
        const float a = _fft_power[b] * norm;
        return a > 1e-12 ? 10.0 * fast_log10 (a) : -INFINITY;
 }
+
+Generator::Generator ()
+       : _type (UniformWhiteNoise)
+       , _rseed (1)
+{
+       set_type (UniformWhiteNoise);
+}
+
+void
+Generator::set_type (Generator::Type t) {
+       _type = t;
+       _b0 = _b1 = _b2 = _b3 = _b4 = _b5 = _b6 = 0;
+       _pass = false;
+       _rn = 0;
+}
+
+void
+Generator::run (float *data, const uint32_t n_samples)
+{
+       switch (_type) {
+               default:
+               case UniformWhiteNoise:
+                       for (uint32_t i = 0; i < n_samples; ++i) {
+                               data[i] = randf();
+                       }
+                       break;
+               case GaussianWhiteNoise:
+                       for (uint32_t i = 0 ; i < n_samples; ++i) {
+                               data[i] = 0.7079f * grandf();
+                       }
+                       break;
+               case PinkNoise:
+                       for (uint32_t i = 0 ; i < n_samples; ++i) {
+                               const float white = .39572f * randf ();
+                               _b0 = .99886f * _b0 + white * .0555179f;
+                               _b1 = .99332f * _b1 + white * .0750759f;
+                               _b2 = .96900f * _b2 + white * .1538520f;
+                               _b3 = .86650f * _b3 + white * .3104856f;
+                               _b4 = .55000f * _b4 + white * .5329522f;
+                               _b5 = -.7616f * _b5 - white * .0168980f;
+                               data[i] = _b0 + _b1 + _b2 + _b3 + _b4 + _b5 + _b6 + white * 0.5362f;
+                               _b6 = white * 0.115926f;
+                       }
+                       break;
+       }
+}
+
+inline uint32_t
+Generator::randi ()
+{
+       // 31bit Park-Miller-Carta Pseudo-Random Number Generator
+       uint32_t hi, lo;
+       lo = 16807 * (_rseed & 0xffff);
+       hi = 16807 * (_rseed >> 16);
+       lo += (hi & 0x7fff) << 16;
+       lo += hi >> 15;
+       lo = (lo & 0x7fffffff) + (lo >> 31);
+       return (_rseed = lo);
+}
+
+inline float
+Generator::grandf ()
+{
+       float x1, x2, r;
+
+       if (_pass) {
+               _pass = false;
+               return _rn;
+       }
+
+       do {
+               x1 = randf ();
+               x2 = randf ();
+               r = x1 * x1 + x2 * x2;
+       } while ((r >= 1.0f) || (r < 1e-22f));
+
+       r = sqrtf (-2.f * logf (r) / r);
+
+       _pass = true;
+       _rn = r * x2;
+       return r * x1;
+}