ericek111/baudmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit no. 5

Browse Source
This commit is contained in:
Erik Bročko
2026-03-25 19:47:37 +01:00
parent 0c7ff40638
commit 7503052079
8 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/dsp/SpectrumAnalyzer.cpp
View File

@@ -26,6 +26,9 @@ void SpectrumAnalyzer::configure(const AnalyzerSettings& settings) {
hopSize_ = static_cast<size_t>(settings_.fftSize * (1.0f - settings_.overlap));
if (hopSize_ < 1) hopSize_ = 1;
// Cache window gain correction (avoid recomputing per block).
windowCorrection_ = -20.0f * std::log10(windowGain_ > 0 ? windowGain_ : 1.0f);
if (sizeChanged) {
accumBuf_.assign(settings_.fftSize * inCh, 0.0f);
accumPos_ = 0;
@@ -37,6 +40,13 @@ void SpectrumAnalyzer::configure(const AnalyzerSettings& settings) {
channelComplex_.assign(nSpec, std::vector<std::complex<float>>(specSz, {0,0}));
channelWaterfalls_.assign(nSpec, {});
// Pre-allocate scratch buffers.
if (settings_.isIQ) {
windowedBuf_.resize(settings_.fftSize * 2);
} else {
chanBuf_.resize(settings_.fftSize);
}
newSpectrumReady_ = false;
}
}
@@ -74,38 +84,27 @@ void SpectrumAnalyzer::processBlock() {
int N = settings_.fftSize;
int inCh = settings_.inputChannels();
int nSpec = static_cast<int>(channelSpectra_.size());
int specSz = fft_.spectrumSize();
std::vector<std::vector<float>> tempDBs(nSpec);
std::vector<std::vector<std::complex<float>>> tempCplx(nSpec);
if (settings_.isIQ) {
std::vector<float> windowed(N * 2);
for (int i = 0; i < N; ++i) {
windowed[2 * i] = accumBuf_[2 * i] * window_[i];
windowed[2 * i + 1] = accumBuf_[2 * i + 1] * window_[i];
windowedBuf_[2 * i] = accumBuf_[2 * i] * window_[i];
windowedBuf_[2 * i + 1] = accumBuf_[2 * i + 1] * window_[i];
}
fft_.processComplex(windowed.data(), tempDBs[0], tempCplx[0]);
fft_.processComplex(windowedBuf_.data(), channelSpectra_[0], channelComplex_[0]);
} else {
std::vector<float> chanBuf(N);
for (int ch = 0; ch < nSpec; ++ch) {
for (int i = 0; i < N; ++i)
chanBuf[i] = accumBuf_[i * inCh + ch];
WindowFunctions::apply(window_, chanBuf.data(), N);
fft_.processReal(chanBuf.data(), tempDBs[ch], tempCplx[ch]);
chanBuf_[i] = accumBuf_[i * inCh + ch];
WindowFunctions::apply(window_, chanBuf_.data(), N);
fft_.processReal(chanBuf_.data(), channelSpectra_[ch], channelComplex_[ch]);
}
}
// Window gain correction.
float correction = -20.0f * std::log10(windowGain_ > 0 ? windowGain_ : 1.0f);
for (auto& db : tempDBs)
for (float& v : db)
v += correction;
// Apply cached window gain correction.
for (int ch = 0; ch < nSpec; ++ch) {
channelSpectra_[ch] = tempDBs[ch];
channelComplex_[ch] = tempCplx[ch];
channelWaterfalls_[ch].push_back(tempDBs[ch]);
for (float& v : channelSpectra_[ch])
v += windowCorrection_;
channelWaterfalls_[ch].push_back(channelSpectra_[ch]);
if (channelWaterfalls_[ch].size() > kWaterfallHistory)
channelWaterfalls_[ch].pop_front();
}