ardour/livetrax
13
0
Fork 0
Code

protect meters against weird float values

Browse Source
This commit is contained in:
Robin Gareus 2013-08-29 17:36:52 +02:00
parent 03c26762e6
commit 2172700144
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/iec1ppmdsp.cc
View File

@ -45,8 +45,8 @@ void Iec1ppmdsp::process (float *p, int n)
{
float z1, z2, m, t;
z1 = _z1;
z2 = _z2;
z1 = _z1 > 20 ? 20 : (_z1 < 0 ? 0 : _z1);
z1 = _z2 > 20 ? 20 : (_z2 < 0 ? 0 : _z2);
m = _res ? 0: _m;
_res = false;

4
libs/ardour/iec2ppmdsp.cc
View File

@ -45,8 +45,8 @@ void Iec2ppmdsp::process (float *p, int n)
{
float z1, z2, m, t;
z1 = _z1;
z2 = _z2;
z1 = _z1 > 20 ? 20 : (_z1 < 0 ? 0 : _z1);
z1 = _z2 > 20 ? 20 : (_z2 < 0 ? 0 : _z2);
m = _res ? 0: _m;
_res = false;

6
libs/ardour/kmeterdsp.cc
View File

@ -52,8 +52,8 @@ void Kmeterdsp::process (float *p, int n)
float s, z1, z2;
// Get filter state.
z1 = _z1;
z2 = _z2;
z1 = _z1 > 50 ? 50 : (_z1 < 0 ? 0 : _z1);
z2 = _z2 > 50 ? 50 : (_z2 < 0 ? 0 : _z2);
// Perform filtering. The second filter is evaluated
// only every 4th sample - this is just an optimisation.
@ -75,6 +75,8 @@ void Kmeterdsp::process (float *p, int n)
z2 += 4 * _omega * (z1 - z2); // Update second filter.
}
if (isnan(z1)) z1 = 0;
if (isnan(z2)) z2 = 0;
// Save filter state. The added constants avoid denormals.
_z1 = z1 + 1e-20f;
_z2 = z2 + 1e-20f;

6
libs/ardour/vumeterdsp.cc
View File

@ -43,8 +43,8 @@ void Vumeterdsp::process (float *p, int n)
{
float z1, z2, m, t1, t2;
z1 = _z1;
z2 = _z2;
z1 = _z1 > 20 ? 20 : (_z1 < -20 ? -20 : _z1);
z2 = _z2 > 20 ? 20 : (_z2 < -20 ? -20 : _z2);
m = _res ? 0: _m;
_res = false;
@ -64,6 +64,8 @@ void Vumeterdsp::process (float *p, int n)
if (z2 > m) m = z2;
}
if (isnan(z1)) z1 = 0;
if (isnan(z2)) z2 = 0;
_z1 = z1;
_z2 = z2 + 1e-10f;
_m = m;