mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-13 03:37:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed slow waterfall with low sample rates

Browse Source
This commit is contained in:
Ryzerth 2020-07-21 01:58:47 +02:00
parent ed49ad6f7f
commit f5d6e609d7
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dsp/resampling.h
View File

@ -148,9 +148,6 @@ namespace dsp {
if (running) { if (running) {
return; return;
} }
if (blockSize < 1 ) {
return;
}
_blockSize = blockSize; _blockSize = blockSize;
output.setMaxLatency(blockSize * 2); output.setMaxLatency(blockSize * 2);
} }
@ -159,9 +156,6 @@ namespace dsp {
if (running) { if (running) {
return; return;
} }
if (skip < 0 ) {
skip = 0;
}
_skip = skip; _skip = skip;
} }
@ -170,9 +164,20 @@ namespace dsp {
private: private:
static void _worker(BlockDecimator* _this) { static void _worker(BlockDecimator* _this) {
complex_t* buf = new complex_t[_this->_blockSize]; complex_t* buf = new complex_t[_this->_blockSize];
bool delay = _this->_skip < 0;
int readCount = std::min<int>(_this->_blockSize + _this->_skip, _this->_blockSize);
int skip = std::max<int>(_this->_skip, 0);
int delaySize = (-_this->_skip) * sizeof(complex_t);
complex_t* start = &buf[std::max<int>(-_this->_skip, 0)];
complex_t* delayStart = &buf[_this->_blockSize + _this->_skip];
while (true) { while (true) {
int read = _this->_input->readAndSkip(buf, _this->_blockSize, _this->_skip); if (delay) {
if (read < 0) { break; }; memmove(buf, delayStart, delaySize);
}
if (_this->_input->readAndSkip(start, readCount, skip) < 0) { break; };
if (_this->output.write(buf, _this->_blockSize) < 0) { break; }; if (_this->output.write(buf, _this->_blockSize) < 0) { break; };
} }
delete[] buf; delete[] buf;

3
src/signal_path.cpp
View File

@ -46,7 +46,8 @@ void SignalPath::setSampleRate(float sampleRate) {
dcBiasRemover.setBlockSize(inputBlockSize); dcBiasRemover.setBlockSize(inputBlockSize);
split.setBlockSize(inputBlockSize); split.setBlockSize(inputBlockSize);
fftBlockDec.setSkip((sampleRate / fftRate) - fftSize); int skip = (sampleRate / fftRate) - fftSize;
fftBlockDec.setSkip(skip);
mainVFO.setInputSampleRate(sampleRate, inputBlockSize); mainVFO.setInputSampleRate(sampleRate, inputBlockSize);
// // Reset the modulator and audio systems // // Reset the modulator and audio systems