Rewrite Resample::Process to take and return size_t values

src/AudacityHeaders.h

@@ -58,7 +58,6 @@
 #include "NoteTrack.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "Resample.h"
 #include "SampleFormat.h"
 #include "Sequence.h"
 #include "TimeTrack.h"

src/AudioIO.cpp

@@ -3657,7 +3657,7 @@ void AudioIO::FillBuffers()
             }
             else
             {
-               int size = lrint(avail * mFactor);
+               size_t size = lrint(avail * mFactor);
                SampleBuffer temp1(avail, floatSample);
                SampleBuffer temp2(size, floatSample);
                mCaptureBuffers[i]->Get(temp1.ptr(), floatSample, avail);
@@ -3665,8 +3665,10 @@ void AudioIO::FillBuffers()
                 * must flush any samples left in the rate conversion buffer
                 * so that they get recorded
                 */
-               size = mResample[i]->Process(mFactor, (float *)temp1.ptr(), avail, !IsStreamActive(),
+               const auto results =
-                                            &size, (float *)temp2.ptr(), size);
+                  mResample[i]->Process(mFactor, (float *)temp1.ptr(), avail,
+                     !IsStreamActive(), (float *)temp2.ptr(), size);
+               size = results.second;
                mCaptureTracks[i]-> Append(temp2.ptr(), floatSample, size, 1,
                                           &appendLog);
             }

src/CrossFade.cpp

@@ -15,7 +15,6 @@ been abandoned.
 #include "CrossFade.h"
 
 #include "SampleFormat.h"
-#include "Resample.h"
 #include "WaveClip.h"
 
 #include <iostream>

src/CrossFade.h

@@ -16,7 +16,6 @@
 /// to produce the desired crossfading
 
 #include "SampleFormat.h"
-#include "Resample.h"
 #include "WaveClip.h"
 
 

src/Menus.cpp

@@ -91,7 +91,6 @@ simplifies construction of menu items.
 #include "Screenshot.h"
 #include "ondemand/ODManager.h"
 
-#include "Resample.h"
 #include "BatchProcessDialog.h"
 #include "BatchCommands.h"
 #include "prefs/BatchPrefs.h"

src/Mix.cpp

@@ -508,23 +508,18 @@ sampleCount Mixer::MixVariableRates(int *channelFlags, WaveTrackCache &cache,
                (t, t + (double)thisProcessLen / trackRate);
       }
 
-      int input_used;
+      auto results = pResample->Process(factor,
-      int outgen = pResample->Process(factor,
                                       &queue[*queueStart],
                                       thisProcessLen,
                                       last,
-                                      &input_used,
                                       &mFloatBuffer[out],
                                       mMaxOut - out);
 
-      if (outgen < 0) {
+      const auto input_used = results.first;
-         return 0;
-      }
-
       *queueStart += input_used;
       *queueLen -= input_used;
-      out += outgen;
+      out += results.second;
-      t += ((backwards ? -input_used : input_used) / trackRate);
+      t += (input_used / trackRate) * (backwards ? -1 : 1);
 
       if (last) {
          break;

src/Resample.cpp

@@ -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,
+            inBuffer , (lastFlag? ~inBufferLen : inBufferLen), &idone,
-            outBuffer, (size_t)                          outBufferLen, &odone);
+            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,
+            inBuffer , inBufferLen , &idone,
-            outBuffer, (size_t)outBufferLen, &odone);
+            outBuffer, outBufferLen, &odone);
    }
-   *inBufferUsed = (int)idone;
+   return { idone, odone };
-   return (int)odone;
 }
 
 void Resample::SetMethod(const bool useBestMethod)

src/Resample.h

@@ -58,20 +58,20 @@ class Resample final
     @param inBufferLen Length of the input buffer, in samples.
     @param lastFlag Flag to indicate this is the last lot of input samples and
     the buffer needs to be emptied out into the rate converter.
-    @param inBufferUsed Number of samples from inBuffer that have been used
     (unless lastFlag is true, we don't garuntee to process all the samples in
     the input this time, we may leave some for next time)
     @param outBuffer Buffer to write output (converted) samples to.
     @param outBufferLen How big outBuffer is.
-    @return Number of output samples created by this call
+    @return Number of input samples consumed, and number of output samples
+    created by this call
    */
-   int Process(double   factor,
+   std::pair<size_t, size_t>
+                Process(double  factor,
                         float  *inBuffer,
-                        int     inBufferLen,
+                        size_t  inBufferLen,
                         bool    lastFlag,
-                        int    *inBufferUsed,
                         float  *outBuffer,
-                        int     outBufferLen);
+                        size_t  outBufferLen);
 
  protected:
    void SetMethod(const bool useBestMethod);

src/TimeTrack.cpp

@@ -22,7 +22,6 @@
 #include "Envelope.h"
 #include "Prefs.h"
 #include "Internat.h"
-#include "Resample.h"
 #include "ViewInfo.h"
 
 //TODO-MB: are these sensible values?

src/WaveClip.cpp

@@ -1793,11 +1793,11 @@ bool WaveClip::Resample(int rate, ProgressDialog *progress)
          break;
       }
 
-      int inBufferUsed = 0;
+      const auto results = resample.Process(factor, inBuffer, inLen, isLast,
-      outGenerated = resample.Process(factor, inBuffer, inLen, isLast,
+                                            outBuffer, bufsize);
-                                           &inBufferUsed, outBuffer, bufsize);
+      outGenerated = results.second;
 
-      pos += inBufferUsed;
+      pos += results.first;
 
       if (outGenerated < 0)
       {

src/effects/ChangeSpeed.cpp

@@ -510,25 +510,20 @@ bool EffectChangeSpeed::ProcessOne(WaveTrack * track,
       //Get the samples from the track and put them in the buffer
       track->Get((samplePtr) inBuffer, floatSample, samplePos, blockSize);
 
-      int inUsed;
+      const auto results = resample.Process(mFactor,
-      int outgen = resample.Process(mFactor,
                                     inBuffer,
                                     blockSize,
                                     ((samplePos + blockSize) >= end),
-                                    &inUsed,
                                     outBuffer,
                                     outBufferSize);
-      if (outgen < 0) {
+      const auto outgen = results.second;
-         bResult = false;
-         break;
-      }
 
       if (outgen > 0)
          outputTrack->Append((samplePtr)outBuffer, floatSample,
                              outgen);
 
       // Increment samplePos
-      samplePos += inUsed;
+      samplePos += results.first;
 
       // Update the Progress meter
       if (TrackProgress(mCurTrackNum, (samplePos - start) / len)) {