VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-27 20:44:20 -04:00
Code Issues Projects Releases Wiki Activity

demoddatv: Fix spectrum compilation against current cfft_engine API

Browse Source 
The spectrum template was not being instantiated by the current build,
so stale accesses to cfft_engine::n went unnoticed.

Replace direct accesses to the private cfft_engine member with the
public size() accessor. This restores spectrum compilation and allows
the upcoming VLA cleanup to be built and tested.

Signed-off-by: Robin Getz <rgetz503@gmail.com>
This commit is contained in:
Robin Getz
2026-07-25 15:28:57 -04:00
parent b5f216f049
commit bd0ad31f77
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/demoddatv/leansdr/sdr.h
+13 -11
View File
@@ -2086,9 +2086,10 @@ struct spectrum : runnable
void run()
{
while (in.readable() >= fft.n * decim && out.writable() >= 1)
const int fft_size = fft.size();
while (in.readable() >= fft_size * decim && out.writable() >= 1)
{
phase += fft.n * decim;
phase += fft_size * decim;
if (phase >= decimation)
{
@@ -2096,24 +2097,25 @@ struct spectrum : runnable
do_spectrum();
}
in.read(fft.n * decim);
in.read(fft_size * decim);
}
}
private:
void do_spectrum()
{
std::complex<T> data[fft.n];
const int fft_size = fft.size();
std::complex<T> data[fft_size];
if (decim == 1)
{
memcpy(data, in.rd(), fft.n * sizeof(data[0]));
memcpy(data, in.rd(), fft_size * sizeof(data[0]));
}
else
{
std::complex<T> *pin = in.rd();
for (int i = 0; i < fft.n; ++i, pin += decim) {
for (int i = 0; i < fft_size; ++i, pin += decim) {
data[i] = *pin;
}
}
@@ -2121,23 +2123,23 @@ struct spectrum : runnable
fft.inplace(data, true);
float power[NFFT];
for (int i = 0; i < fft.n; ++i) {
for (int i = 0; i < fft_size; ++i) {
power[i] = (float)data[i].real() * data[i].real() + (float)data[i].imag() * data[i].imag();
}
if (!avgpower)
{
// Initialize with first spectrum
avgpower = new float[fft.n];
memcpy(avgpower, power, fft.n * sizeof(avgpower[0]));
avgpower = new float[fft_size];
memcpy(avgpower, power, fft_size * sizeof(avgpower[0]));
}
// Accumulate and low-pass filter
for (int i = 0; i < fft.n; ++i)
for (int i = 0; i < fft_size; ++i)
avgpower[i] = avgpower[i] * (1 - kavg) + power[i] * kavg;
// Reuse power[]
for (int i = 0; i < fft.n / 2; ++i)
for (int i = 0; i < fft_size / 2; ++i)
{
power[i] = 10 * log10f(avgpower[NFFT / 2 + i]);
power[NFFT / 2 + i] = 10 * log10f(avgpower[i]);