falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

audiofile: Bail out if resample fails, whitespace cleanup

tags/v2.3.0-RC1
falkTX 3 years ago
parent
4b3059caa1
commit
d10dd1673d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 106 additions and 98 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +90
    -94
      source/modules/zita-resampler/resampler.cc
  2. +2
    -2
      source/modules/zita-resampler/resampler.h
  3. +13
    -1
      source/native-plugins/audio-base.hpp
  4. +1
    -1
      source/native-plugins/audio-file.cpp

+ 90
- 94
source/modules/zita-resampler/resampler.cc View File

@@ -87,35 +87,35 @@ int Resampler::setup (unsigned int fs_inp,
k = s = 0; k = s = 0;
if (fs_inp && fs_out && nchan) if (fs_inp && fs_out && nchan)
{ {
r = (double) fs_out / (double) fs_inp;
r = (double) fs_out / (double) fs_inp;
g = gcd (fs_out, fs_inp); g = gcd (fs_out, fs_inp);
n = fs_out / g; n = fs_out / g;
s = fs_inp / g;
s = fs_inp / g;
if ((16 * r >= 1) && (n <= 1000)) if ((16 * r >= 1) && (n <= 1000))
{
h = hlen;
k = 250;
if (r < 1)
{
frel *= r;
h = (unsigned int)(ceil (h / r));
k = (unsigned int)(ceil (k / r));
}
{
h = hlen;
k = 250;
if (r < 1)
{
frel *= r;
h = (unsigned int)(ceil (h / r));
k = (unsigned int)(ceil (k / r));
}
T = Resampler_table::create (frel, h, n); T = Resampler_table::create (frel, h, n);
B = new float [nchan * (2 * h - 1 + k)];
}
B = new float [nchan * (2 * h - 1 + k)];
}
} }
clear (); clear ();
if (T) if (T)
{ {
_table = T;
_buff = B;
_nchan = nchan;
_inmax = k;
_pstep = s;
return reset ();
_table = T;
_buff = B;
_nchan = nchan;
_inmax = k;
_pstep = s;
return reset ();
} }
else return 1;
return 1;
} }




@@ -146,33 +146,29 @@ unsigned int Resampler::inpsize (void) const noexcept
} }




int Resampler::reset (void) noexcept
bool Resampler::reset (void) noexcept
{ {
if (!_table) return 1;
if (!_table) return false;


inp_count = 0; inp_count = 0;
out_count = 0; out_count = 0;
inp_data = 0;
out_data = 0;
inp_data = nullptr;
out_data = nullptr;
_index = 0; _index = 0;
_nread = 0; _nread = 0;
_nzero = 0; _nzero = 0;
_phase = 0; _phase = 0;
if (_table)
{
_nread = 2 * _table->_hl;
return 0;
}
return 1;
_nread = 2 * _table->_hl;
return true;
} }




int Resampler::process (void)
bool Resampler::process (void)
{ {
unsigned int hl, ph, np, dp, in, nr, nz, i, n, c; unsigned int hl, ph, np, dp, in, nr, nz, i, n, c;
float *p1, *p2; float *p1, *p2;


if (!_table) return 1;
if (!_table) return false;


hl = _table->_hl; hl = _table->_hl;
np = _table->_np; np = _table->_np;
@@ -187,77 +183,77 @@ int Resampler::process (void)


while (out_count) while (out_count)
{ {
if (nr)
{
if (inp_count == 0) break;
if (inp_data)
{
if (nr)
{
if (inp_count == 0) break;
if (inp_data)
{
for (c = 0; c < _nchan; c++) p2 [c] = inp_data [c]; for (c = 0; c < _nchan; c++) p2 [c] = inp_data [c];
inp_data += _nchan;
nz = 0;
}
else
{
inp_data += _nchan;
nz = 0;
}
else
{
for (c = 0; c < _nchan; c++) p2 [c] = 0; for (c = 0; c < _nchan; c++) p2 [c] = 0;
if (nz < 2 * hl) nz++;
}
nr--;
p2 += _nchan;
inp_count--;
}
else
{
if (out_data)
{
if (nz < 2 * hl)
{
float *c1 = _table->_ctab + hl * ph;
float *c2 = _table->_ctab + hl * (np - ph);
for (c = 0; c < _nchan; c++)
{
float *q1 = p1 + c;
float *q2 = p2 + c;
float s = 1e-20f;
for (i = 0; i < hl; i++)
{
q2 -= _nchan;
s += *q1 * c1 [i] + *q2 * c2 [i];
q1 += _nchan;
}
*out_data++ = s - 1e-20f;
}
}
else
{
for (c = 0; c < _nchan; c++) *out_data++ = 0;
}
}
out_count--;
if (nz < 2 * hl) nz++;
}
nr--;
p2 += _nchan;
inp_count--;
}
else
{
if (out_data)
{
if (nz < 2 * hl)
{
float *c1 = _table->_ctab + hl * ph;
float *c2 = _table->_ctab + hl * (np - ph);
for (c = 0; c < _nchan; c++)
{
float *q1 = p1 + c;
float *q2 = p2 + c;
float s = 1e-20f;
for (i = 0; i < hl; i++)
{
q2 -= _nchan;
s += *q1 * c1 [i] + *q2 * c2 [i];
q1 += _nchan;
}
*out_data++ = s - 1e-20f;
}
}
else
{
for (c = 0; c < _nchan; c++) *out_data++ = 0;
}
}
out_count--;


ph += dp;
if (ph >= np)
{
nr = ph / np;
ph -= nr * np;
in += nr;
p1 += nr * _nchan;;
if (in >= _inmax)
{
n = (2 * hl - nr) * _nchan;
memcpy (_buff, p1, n * sizeof (float));
in = 0;
p1 = _buff;
p2 = p1 + n;
}
}
}
ph += dp;
if (ph >= np)
{
nr = ph / np;
ph -= nr * np;
in += nr;
p1 += nr * _nchan;;
if (in >= _inmax)
{
n = (2 * hl - nr) * _nchan;
memcpy (_buff, p1, n * sizeof (float));
in = 0;
p1 = _buff;
p2 = p1 + n;
}
}
}
} }
_index = in; _index = in;
_nread = nr; _nread = nr;
_phase = ph; _phase = ph;
_nzero = nz; _nzero = nz;


return 0;
return true;
} }





+ 2
- 2
source/modules/zita-resampler/resampler.h View File

@@ -44,12 +44,12 @@ public:
double frel); double frel);


void clear (void); void clear (void);
int reset (void) noexcept;
bool reset (void) noexcept;
unsigned int nchan (void) const noexcept { return _nchan; } unsigned int nchan (void) const noexcept { return _nchan; }
unsigned int filtlen (void) const noexcept { return inpsize (); } // Deprecated unsigned int filtlen (void) const noexcept { return inpsize (); } // Deprecated
unsigned int inpsize (void) const noexcept; unsigned int inpsize (void) const noexcept;
double inpdist (void) const noexcept; double inpdist (void) const noexcept;
int process (void);
bool process (void);


unsigned int inp_count; unsigned int inp_count;
unsigned int out_count; unsigned int out_count;


+ 13
- 1
source/native-plugins/audio-base.hpp View File

@@ -287,7 +287,15 @@ public:


if (fFileNfo.sample_rate != sampleRate) if (fFileNfo.sample_rate != sampleRate)
{ {
fResampler.setup(fFileNfo.sample_rate, sampleRate, fFileNfo.channels, 32);
if (! fResampler.setup(fFileNfo.sample_rate, sampleRate, fFileNfo.channels, 32))
{
ad_clear_nfo(&fFileNfo);
ad_close(fFilePtr);
fFilePtr = nullptr;
carla_stderr2("loadFilename error, resampler setup failed");
return false;
}

fResampleRatio = static_cast<double>(sampleRate) / static_cast<double>(fFileNfo.sample_rate); fResampleRatio = static_cast<double>(sampleRate) / static_cast<double>(fFileNfo.sample_rate);
resampleNumFrames = static_cast<uint32_t>( resampleNumFrames = static_cast<uint32_t>(
static_cast<double>(std::min(fileNumFrames, poolNumFrames)) * fResampleRatio + 0.5); static_cast<double>(std::min(fileNumFrames, poolNumFrames)) * fResampleRatio + 0.5);
@@ -318,8 +326,10 @@ public:
try { try {
fPollTempData = new float[pollTempSize]; fPollTempData = new float[pollTempSize];
} catch (...) { } catch (...) {
ad_clear_nfo(&fFileNfo);
ad_close(fFilePtr); ad_close(fFilePtr);
fFilePtr = nullptr; fFilePtr = nullptr;
carla_stderr2("loadFilename error, out of memory");
return false; return false;
} }


@@ -330,8 +340,10 @@ public:
} catch (...) { } catch (...) {
delete[] fPollTempData; delete[] fPollTempData;
fPollTempData = nullptr; fPollTempData = nullptr;
ad_clear_nfo(&fFileNfo);
ad_close(fFilePtr); ad_close(fFilePtr);
fFilePtr = nullptr; fFilePtr = nullptr;
carla_stderr2("loadFilename error, out of memory");
return false; return false;
} }
} }


+ 1
- 1
source/native-plugins/audio-file.cpp View File

@@ -137,7 +137,7 @@ protected:
NATIVE_PARAMETER_IS_OUTPUT); NATIVE_PARAMETER_IS_OUTPUT);
param.ranges.def = 0.0f; param.ranges.def = 0.0f;
param.ranges.min = 0.0f; param.ranges.min = 0.0f;
param.ranges.max = 384000.0f;
param.ranges.max = 384000.0f * 32.0f * 2.0f;
break; break;
case kParameterInfoBitDepth: case kParameterInfoBitDepth:
param.name = "Bit Depth"; param.name = "Bit Depth";


Write Preview
Loading…
Cancel
Save