From 99fd1c7106d5509a8709b93195a6c0d1d6e05eee Mon Sep 17 00:00:00 2001 From: wangyix Date: Tue, 1 Jul 2014 10:44:07 -0700 Subject: [PATCH] changed numSamplesNeedToStartPlayback calculation in Audio.cpp --- interface/src/Audio.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index cda7e2b230..f5f148969c 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -878,7 +878,8 @@ void Audio::processReceivedAudio(const QByteArray& audioByteArray) { QByteArray outputBuffer; outputBuffer.resize(numDeviceOutputSamples * sizeof(int16_t)); - int numSamplesNeededToStartPlayback = (_jitterBufferSamples * 2);// + NETWORK_BUFFER_LENGTH_SAMPLES_STEREO; + int numSamplesNeededToStartPlayback = std::min(NETWORK_BUFFER_LENGTH_SAMPLES_STEREO + (_jitterBufferSamples * 2), + _ringBuffer.getSampleCapacity()); if (!_ringBuffer.isNotStarvedOrHasMinimumSamples(numSamplesNeededToStartPlayback)) { // We are still waiting for enough samples to begin playback