1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 16:37:12 +01:00

Rewrite Resample::Process to take and return size_t values

This commit is contained in:
Paul Licameli
2016-09-05 13:44:23 -04:00
parent b093a8e406
commit c8e7372886
11 changed files with 31 additions and 45 deletions

View File

@@ -74,20 +74,20 @@ const wxString Resample::GetBestMethodKey()
int Resample::GetFastMethodDefault() {return 1;}
int Resample::GetBestMethodDefault() {return 3;}
int Resample::Process(double factor,
std::pair<size_t, size_t>
Resample::Process(double factor,
float *inBuffer,
int inBufferLen,
size_t inBufferLen,
bool lastFlag,
int *inBufferUsed,
float *outBuffer,
int outBufferLen)
size_t outBufferLen)
{
size_t idone, odone;
if (mbWantConstRateResampling)
{
soxr_process((soxr_t)mHandle,
inBuffer , (size_t)(lastFlag? ~inBufferLen : inBufferLen), &idone,
outBuffer, (size_t) outBufferLen, &odone);
inBuffer , (lastFlag? ~inBufferLen : inBufferLen), &idone,
outBuffer, outBufferLen, &odone);
}
else
{
@@ -95,11 +95,10 @@ int Resample::Process(double factor,
inBufferLen = lastFlag? ~inBufferLen : inBufferLen;
soxr_process((soxr_t)mHandle,
inBuffer , (size_t)inBufferLen , &idone,
outBuffer, (size_t)outBufferLen, &odone);
inBuffer , inBufferLen , &idone,
outBuffer, outBufferLen, &odone);
}
*inBufferUsed = (int)idone;
return (int)odone;
return { idone, odone };
}
void Resample::SetMethod(const bool useBestMethod)