use a note tracker to resolve notes cut off during render by the end of the region

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

diff --git a/libs/ardour/iec1ppmdsp.cc b/libs/ardour/iec1ppmdsp.cc
index bed825048f01fd3cd0582c98e72f8b37dbf5b86d..5b32289e6ceb590c776992ffb2ffdd78082913d9 100644 (file)
--- a/libs/ardour/iec1ppmdsp.cc
+++ b/libs/ardour/iec1ppmdsp.cc
@@ -1,100 +1,93 @@
 /*
-    Copyright (C) 2012 Fons Adriaensen <fons@linuxaudio.org>
-    Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Copyright (C) 2012 Fons Adriaensen <fons@linuxaudio.org>
+ * Copyright (C) 2013-2019 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <math.h>
 #include "ardour/iec1ppmdsp.h"
 
-
 float Iec1ppmdsp::_w1;
 float Iec1ppmdsp::_w2;
 float Iec1ppmdsp::_w3;
 float Iec1ppmdsp::_g;
 
+Iec1ppmdsp::Iec1ppmdsp (void)
+       : _z1 (0)
+       , _z2 (0)
+       , _m (0)
+       , _res (true)
+{}
 
-Iec1ppmdsp::Iec1ppmdsp (void) :
-    _z1 (0),
-    _z2 (0),
-    _m (0),
-    _res (true)
-{
-}
-
-
-Iec1ppmdsp::~Iec1ppmdsp (void)
-{
-}
+Iec1ppmdsp::~Iec1ppmdsp (void) {}
 
-
-void Iec1ppmdsp::process (float *p, int n)
+void
+Iec1ppmdsp::process (float const* p, int n)
 {
-    float z1, z2, m, t;
-
-    z1 = _z1;
-    z2 = _z2;
-    m = _res ? 0: _m;
-    _res = false;
-
-    n /= 4;
-    while (n--)
-    {
-       z1 *= _w3;
-       z2 *= _w3;
-       t = fabsf (*p++);
-       if (t > z1) z1 += _w1 * (t - z1);
-       if (t > z2) z2 += _w2 * (t - z2);
-       t = fabsf (*p++);
-       if (t > z1) z1 += _w1 * (t - z1);
-       if (t > z2) z2 += _w2 * (t - z2);
-       t = fabsf (*p++);
-       if (t > z1) z1 += _w1 * (t - z1);
-       if (t > z2) z2 += _w2 * (t - z2);
-       t = fabsf (*p++);
-       if (t > z1) z1 += _w1 * (t - z1);
-       if (t > z2) z2 += _w2 * (t - z2);
-       t = z1 + z2;
-       if (t > m) m = t;
-    }
-
-    _z1 = z1 + 1e-10f;
-    _z2 = z2 + 1e-10f;
-    _m = m;
+       float z1, z2, m, t;
+
+       z1 = _z1 > 20 ? 20 : (_z1 < 0 ? 0 : _z1);
+       z2 = _z2 > 20 ? 20 : (_z2 < 0 ? 0 : _z2);
+       m = _res ? 0: _m;
+       _res = false;
+
+       n /= 4;
+       while (n--) {
+               z1 *= _w3;
+               z2 *= _w3;
+               t = fabsf (*p++);
+               if (t > z1) z1 += _w1 * (t - z1);
+               if (t > z2) z2 += _w2 * (t - z2);
+               t = fabsf (*p++);
+               if (t > z1) z1 += _w1 * (t - z1);
+               if (t > z2) z2 += _w2 * (t - z2);
+               t = fabsf (*p++);
+               if (t > z1) z1 += _w1 * (t - z1);
+               if (t > z2) z2 += _w2 * (t - z2);
+               t = fabsf (*p++);
+               if (t > z1) z1 += _w1 * (t - z1);
+               if (t > z2) z2 += _w2 * (t - z2);
+               t = z1 + z2;
+               if (t > m) m = t;
+       }
+
+       _z1 = z1 + 1e-10f;
+       _z2 = z2 + 1e-10f;
+       _m = m;
 }
 
-
-float Iec1ppmdsp::read (void)
+float
+Iec1ppmdsp::read (void)
 {
-    _res = true;
-    return _g * _m;
+       _res = true;
+       return _g * _m;
 }
 
-void Iec1ppmdsp::reset ()
+void
+Iec1ppmdsp::reset ()
 {
-    _z1 = _z2 = _m = .0f;
-    _res = true;
+       _z1 = _z2 = _m = .0f;
+       _res = true;
 }
 
-void Iec1ppmdsp::init (float fsamp)
+void
+Iec1ppmdsp::init (float fsamp)
 {
-    _w1 =  450.0f / fsamp;
-    _w2 = 1300.0f / fsamp;
-    _w3 = 1.0f - 5.4f / fsamp;
-    _g  = 0.5108f;
+       _w1 =  450.0f / fsamp;
+       _w2 = 1300.0f / fsamp;
+       _w3 = 1.0f - 5.4f / fsamp;
+       _g  = 0.5108f;
 }
-
-/* vi:set ts=8 sts=8 sw=4: */