From 942a511feac1b47bc40dd5aa6541dc98673d834d Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 1 Oct 2015 22:21:44 -0400 Subject: [PATCH] FFT data buffering tweaks, remove logging --- src/process/FFTDataDistributor.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/process/FFTDataDistributor.cpp b/src/process/FFTDataDistributor.cpp index d724e22..113506a 100644 --- a/src/process/FFTDataDistributor.cpp +++ b/src/process/FFTDataDistributor.cpp @@ -26,7 +26,7 @@ void FFTDataDistributor::process() { if (inp) { if (inputBuffer.sampleRate != inp->sampleRate || inputBuffer.frequency != inp->frequency) { - bufferMax = inp->sampleRate / 2; + bufferMax = inp->sampleRate; // std::cout << "Buffer Max: " << bufferMax << std::endl; bufferOffset = 0; @@ -35,8 +35,6 @@ void FFTDataDistributor::process() { inputBuffer.data.resize(bufferMax); } if ((bufferOffset + bufferedItems + inp->data.size()) > bufferMax) { - std::cout << "Buffer max failed: " << bufferMax << ", ofs: " << bufferOffset - << ", input size: " << inp->data.size() << ", items: " << bufferedItems << std::endl; memmove(&inputBuffer.data[0], &inputBuffer.data[bufferOffset], bufferedItems*sizeof(liquid_float_complex)); bufferOffset = 0; } else { @@ -92,10 +90,6 @@ void FFTDataDistributor::process() { if (bufferedItems <= 0) { bufferedItems = 0; bufferOffset = 0; - } - if ((bufferMax-(bufferOffset+bufferedItems)) < (fftSize * linesPerSecond / 8)) { - memmove(&inputBuffer.data[0], &inputBuffer.data[bufferOffset], bufferedItems*sizeof(liquid_float_complex)); - bufferOffset = 0; } } }