X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=RtAudio.cpp;h=82622adf7d05e788e76b6fa6e233a001b176baba;hb=HEAD;hp=06bc8d8db2daa77c6a8bb753929bc6b32f9bc726;hpb=6fd444c67c16842c71a7fa27b735e4b5310d1cef;p=rtaudio.git

diff --git a/RtAudio.cpp b/RtAudio.cpp
index 06bc8d8..82622ad 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -4084,15 +4084,14 @@ public:
       return;
     }
 
-    unsigned int outputBufferSize = ( unsigned int ) ceilf( inputBufferSize * _sampleRatio ) + ( _bytesPerSample * _channelCount );
-
+    unsigned int outputBufferSize = 0;
     if ( maxOutSampleCount != -1 )
     {
-      unsigned int maxOutputBufferSize = _bytesPerSample * _channelCount * maxOutSampleCount;
-      if ( outputBufferSize > maxOutputBufferSize )
-      {
-        outputBufferSize = maxOutputBufferSize;
-      }
+      outputBufferSize = _bytesPerSample * _channelCount * maxOutSampleCount;
+    }
+    else
+    {
+      outputBufferSize = ( unsigned int ) ceilf( inputBufferSize * _sampleRatio ) + ( _bytesPerSample * _channelCount );
     }
 
     IMFMediaBuffer* rInBuffer;
@@ -5206,11 +5205,6 @@ void RtApiWasapi::wasapiThread()
       if ( captureAudioClient )
       {
         int samplesToPull = ( unsigned int ) floorf( stream_.bufferSize * captureSrRatio );
-        if ( captureSrRatio != 1 )
-        {
-          // account for remainders
-          samplesToPull--;
-        }
 
         convBufferSize = 0;
         while ( convBufferSize < stream_.bufferSize )
@@ -5233,7 +5227,7 @@ void RtApiWasapi::wasapiThread()
                                      convBuffer,
                                      samplesToPull,
                                      convSamples,
-                                     stream_.bufferSize - convBufferSize );
+                                     convBufferSize == 0 ? -1 : stream_.bufferSize - convBufferSize );
 
           convBufferSize += convSamples;
           samplesToPull = 1; // now pull one sample at a time until we have stream_.bufferSize samples