From: Marcus Tomlinson Date: Fri, 27 Sep 2019 13:56:01 +0000 (+0100) Subject: Add maxOutSampleCount to WasapiResampler::Convert() X-Git-Url: https://git.carlh.net/gitweb/?p=rtaudio.git;a=commitdiff_plain;h=6fd444c67c16842c71a7fa27b735e4b5310d1cef Add maxOutSampleCount to WasapiResampler::Convert() --- diff --git a/RtAudio.cpp b/RtAudio.cpp index dce61fe..06bc8d8 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -4073,7 +4073,7 @@ public: #endif } - void Convert( char* outBuffer, const char* inBuffer, unsigned int inSampleCount, unsigned int& outSampleCount ) + void Convert( char* outBuffer, const char* inBuffer, unsigned int inSampleCount, unsigned int& outSampleCount, int maxOutSampleCount = -1 ) { unsigned int inputBufferSize = _bytesPerSample * _channelCount * inSampleCount; if ( _sampleRatio == 1 ) @@ -4086,6 +4086,15 @@ public: unsigned int outputBufferSize = ( unsigned int ) ceilf( inputBufferSize * _sampleRatio ) + ( _bytesPerSample * _channelCount ); + if ( maxOutSampleCount != -1 ) + { + unsigned int maxOutputBufferSize = _bytesPerSample * _channelCount * maxOutSampleCount; + if ( outputBufferSize > maxOutputBufferSize ) + { + outputBufferSize = maxOutputBufferSize; + } + } + IMFMediaBuffer* rInBuffer; IMFSample* rInSample; BYTE* rInByteBuffer = NULL; @@ -5223,7 +5232,8 @@ void RtApiWasapi::wasapiThread() captureResampler->Convert( stream_.deviceBuffer + deviceBufferOffset, convBuffer, samplesToPull, - convSamples ); + convSamples, + stream_.bufferSize - convBufferSize ); convBufferSize += convSamples; samplesToPull = 1; // now pull one sample at a time until we have stream_.bufferSize samples