comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-09-27 15:56:48 -04:00
Code Issues Projects Releases Wiki Activity

FFT data buffering tweaks, remove logging

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-10-01 22:21:44 -04:00
parent 9d06fa77c7
commit 942a511fea
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/process/FFTDataDistributor.cpp
View File

@ -26,7 +26,7 @@ void FFTDataDistributor::process() {
if (inp) { if (inp) {
if (inputBuffer.sampleRate != inp->sampleRate || inputBuffer.frequency != inp->frequency) { if (inputBuffer.sampleRate != inp->sampleRate || inputBuffer.frequency != inp->frequency) {
bufferMax = inp->sampleRate / 2; bufferMax = inp->sampleRate;
// std::cout << "Buffer Max: " << bufferMax << std::endl; // std::cout << "Buffer Max: " << bufferMax << std::endl;
bufferOffset = 0; bufferOffset = 0;
@ -35,8 +35,6 @@ void FFTDataDistributor::process() {
inputBuffer.data.resize(bufferMax); inputBuffer.data.resize(bufferMax);
} }
if ((bufferOffset + bufferedItems + inp->data.size()) > 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)); memmove(&inputBuffer.data[0], &inputBuffer.data[bufferOffset], bufferedItems*sizeof(liquid_float_complex));
bufferOffset = 0; bufferOffset = 0;
} else { } else {
@ -92,10 +90,6 @@ void FFTDataDistributor::process() {
if (bufferedItems <= 0) { if (bufferedItems <= 0) {
bufferedItems = 0; bufferedItems = 0;
bufferOffset = 0; bufferOffset = 0;
}
if ((bufferMax-(bufferOffset+bufferedItems)) < (fftSize * linesPerSecond / 8)) {
memmove(&inputBuffer.data[0], &inputBuffer.data[bufferOffset], bufferedItems*sizeof(liquid_float_complex));
bufferOffset = 0;
} }
} }
} }