Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 16:40:07 +02:00
Code Issues Releases Wiki Activity

Re-order clauses per suggestion from Rob Sykes.

Browse Source
This commit is contained in:
v.audacity 2012-12-21 01:00:15 +00:00
parent 55be06c9e4
commit b57fcea193
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/Resample.cpp
View File

@ -125,42 +125,7 @@
// variable-rate resampler(s) // variable-rate resampler(s)
#if USE_LIBSOXR #if USE_LIBRESAMPLE
#include <soxr.h>
VarRateResample::VarRateResample(const bool useBestMethod, const double dMinFactor, const double dMaxFactor)
: Resample(useBestMethod)
{
soxr_quality_spec_t q_spec = soxr_quality_spec(SOXR_HQ, SOXR_VR);
mHandle = (void *)soxr_create(1, dMinFactor, 1, 0, 0, &q_spec, 0);
}
VarRateResample::~VarRateResample()
{
soxr_delete((soxr_t)mHandle);
}
int VarRateResample::Process(double factor,
float *inBuffer,
int inBufferLen,
bool lastFlag,
int *inBufferUsed,
float *outBuffer,
int outBufferLen)
{
soxr_set_io_ratio((soxr_t)mHandle, 1/factor, 0);
size_t idone , odone;
inBufferLen = lastFlag? ~inBufferLen : inBufferLen;
soxr_process((soxr_t)mHandle,
inBuffer , (size_t)inBufferLen , &idone,
outBuffer, (size_t)outBufferLen, &odone);
*inBufferUsed = (int)idone;
return (int)odone;
}
#elif USE_LIBRESAMPLE
#include "libresample.h" #include "libresample.h"
@ -340,6 +305,45 @@
*inBufferUsed = (int)data.input_frames_used; *inBufferUsed = (int)data.input_frames_used;
return (int)data.output_frames_gen; return (int)data.output_frames_gen;
} }
#elif USE_LIBSOXR
// Note that as we currently do not distinguish USE_* flags for var-rate vs const-rate,
// we need to have USE_LIBSOXR last in the var-rate #if/#elif implementations, because
// it's always #defined in standard configuration, for use as the sole const-rate resampler.
#include <soxr.h>
VarRateResample::VarRateResample(const bool useBestMethod, const double dMinFactor, const double dMaxFactor)
: Resample(useBestMethod)
{
soxr_quality_spec_t q_spec = soxr_quality_spec(SOXR_HQ, SOXR_VR);
mHandle = (void *)soxr_create(1, dMinFactor, 1, 0, 0, &q_spec, 0);
}
VarRateResample::~VarRateResample()
{
soxr_delete((soxr_t)mHandle);
}
int VarRateResample::Process(double factor,
float *inBuffer,
int inBufferLen,
bool lastFlag,
int *inBufferUsed,
float *outBuffer,
int outBufferLen)
{
soxr_set_io_ratio((soxr_t)mHandle, 1/factor, 0);
size_t idone , odone;
inBufferLen = lastFlag? ~inBufferLen : inBufferLen;
soxr_process((soxr_t)mHandle,
inBuffer , (size_t)inBufferLen , &idone,
outBuffer, (size_t)outBufferLen, &odone);
*inBufferUsed = (int)idone;
return (int)odone;
}
#else // no var-rate resampler #else // no var-rate resampler
VarRateResample::VarRateResample(const bool useBestMethod, const double dMinFactor, const double dMaxFactor) VarRateResample::VarRateResample(const bool useBestMethod, const double dMinFactor, const double dMaxFactor)
: Resample(useBestMethod) : Resample(useBestMethod)