VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-28 15:56:33 -04:00
Code Issues Projects Releases Wiki Activity

SpectrumVis: use GLSpectrumSettings

Browse Source
This commit is contained in:
f4exb 2020-05-01 02:12:30 +02:00
parent 84e44a0948
commit 45ef7b3546
2 changed files with 172 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

280
sdrbase/dsp/spectrumvis.cpp
View File

@ -53,9 +53,6 @@ SpectrumVis::SpectrumVis(Real scalef) :
m_needMoreSamples(false), m_needMoreSamples(false),
m_scalef(scalef), m_scalef(scalef),
m_glSpectrum(nullptr), m_glSpectrum(nullptr),
m_averageNb(0),
m_avgMode(AvgModeNone),
m_linear(false),
m_centerFrequency(0), m_centerFrequency(0),
m_sampleRate(48000), m_sampleRate(48000),
m_ofs(0), m_ofs(0),
@ -63,14 +60,14 @@ SpectrumVis::SpectrumVis(Real scalef) :
m_mutex(QMutex::Recursive) m_mutex(QMutex::Recursive)
{ {
setObjectName("SpectrumVis"); setObjectName("SpectrumVis");
handleConfigure(1024, 0, 100, 0, 0, AvgModeNone, FFTWindow::BlackmanHarris, false); applySettings(m_settings, true);
//m_wsSpectrum.openSocket(); // FIXME: conditional //m_wsSpectrum.openSocket(); // FIXME: conditional
} }
SpectrumVis::~SpectrumVis() SpectrumVis::~SpectrumVis()
{ {
FFTFactory *fftFactory = DSPEngine::instance()->getFFTFactory(); FFTFactory *fftFactory = DSPEngine::instance()->getFFTFactory();
fftFactory->releaseEngine(m_fftSize, false, m_fftEngineSequence); fftFactory->releaseEngine(m_settings.m_fftSize, false, m_fftEngineSequence);
} }
void SpectrumVis::openWSSpectrum() void SpectrumVis::openWSSpectrum()
@ -95,16 +92,18 @@ void SpectrumVis::configure(MessageQueue* msgQueue,
FFTWindow::Function window, FFTWindow::Function window,
bool linear) bool linear)
{ {
MsgConfigureSpectrumVis* cmd = new MsgConfigureSpectrumVis( GLSpectrumSettings settings = m_settings;
fftSize, settings.m_fftSize = fftSize;
refLevel, settings.m_refLevel = refLevel;
powerRange, settings.m_powerRange = powerRange;
overlapPercent, settings.m_fftOverlap = overlapPercent;
averagingNb, settings.m_averagingMode = (GLSpectrumSettings::AveragingMode) averagingMode;
averagingMode, settings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(averagingNb, settings.m_averagingMode);
window, settings.m_fftWindow = window;
linear settings.m_linear = linear;
);
MsgConfigureSpectrumVis* cmd = MsgConfigureSpectrumVis::create(settings, false);
msgQueue->push(cmd); msgQueue->push(cmd);
} }
@ -160,9 +159,9 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
Complex c; Complex c;
Real v; Real v;
if (m_avgMode == AvgModeNone) if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeNone)
{ {
for (unsigned int i = 0; i < m_fftSize; i++) for (unsigned int i = 0; i < m_settings.m_fftSize; i++)
{ {
if (i < length) { if (i < length) {
c = begin[i]; c = begin[i];
@ -171,13 +170,13 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
} }
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i] = v; m_powerSpectrum[i] = v;
} }
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -185,18 +184,18 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
} }
else if (m_avgMode == AvgModeMovingAvg) else if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMoving)
{ {
for (unsigned int i = 0; i < m_fftSize; i++) for (unsigned int i = 0; i < m_settings.m_fftSize; i++)
{ {
if (i < length) { if (i < length) {
c = begin[i]; c = begin[i];
@ -206,13 +205,13 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_movingAverage.storeAndGetAvg(v, i); v = m_movingAverage.storeAndGetAvg(v, i);
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i] = v; m_powerSpectrum[i] = v;
} }
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -220,22 +219,22 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
m_movingAverage.nextAverage(); m_movingAverage.nextAverage();
} }
else if (m_avgMode == AvgModeFixedAvg) else if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeFixed)
{ {
double avg; double avg;
for (unsigned int i = 0; i < m_fftSize; i++) for (unsigned int i = 0; i < m_settings.m_fftSize; i++)
{ {
if (i < length) { if (i < length) {
c = begin[i]; c = begin[i];
@ -248,7 +247,7 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
// result available // result available
if (m_fixedAverage.storeAndGetAvg(avg, v, i)) if (m_fixedAverage.storeAndGetAvg(avg, v, i))
{ {
avg = m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs; avg = m_settings.m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs;
m_powerSpectrum[i] = avg; m_powerSpectrum[i] = avg;
} }
} }
@ -258,7 +257,7 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
{ {
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -266,21 +265,21 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
} }
} }
else if (m_avgMode == AvgModeMax) else if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMax)
{ {
double max; double max;
for (unsigned int i = 0; i < m_fftSize; i++) for (unsigned int i = 0; i < m_settings.m_fftSize; i++)
{ {
if (i < length) { if (i < length) {
c = begin[i]; c = begin[i];
@ -293,7 +292,7 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
// result available // result available
if (m_max.storeAndGetMax(max, v, i)) if (m_max.storeAndGetMax(max, v, i))
{ {
max = m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs; max = m_settings.m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs;
m_powerSpectrum[i] = max; m_powerSpectrum[i] = max;
} }
} }
@ -303,7 +302,7 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
{ {
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -311,12 +310,12 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
} }
@ -364,9 +363,9 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
const Complex* fftOut = m_fft->out(); const Complex* fftOut = m_fft->out();
Complex c; Complex c;
Real v; Real v;
std::size_t halfSize = m_fftSize / 2; std::size_t halfSize = m_settings.m_fftSize / 2;
if (m_avgMode == AvgModeNone) if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeNone)
{ {
if ( positiveOnly ) if ( positiveOnly )
{ {
@ -374,7 +373,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
c = fftOut[i]; c = fftOut[i];
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i * 2] = v; m_powerSpectrum[i * 2] = v;
m_powerSpectrum[i * 2 + 1] = v; m_powerSpectrum[i * 2 + 1] = v;
} }
@ -385,19 +384,19 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
c = fftOut[i + halfSize]; c = fftOut[i + halfSize];
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i] = v; m_powerSpectrum[i] = v;
c = fftOut[i]; c = fftOut[i];
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i + halfSize] = v; m_powerSpectrum[i + halfSize] = v;
} }
} }
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -405,16 +404,16 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
} }
else if (m_avgMode == AvgModeMovingAvg) else if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMoving)
{ {
if ( positiveOnly ) if ( positiveOnly )
{ {
@ -423,7 +422,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
c = fftOut[i]; c = fftOut[i];
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_movingAverage.storeAndGetAvg(v, i); v = m_movingAverage.storeAndGetAvg(v, i);
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i * 2] = v; m_powerSpectrum[i * 2] = v;
m_powerSpectrum[i * 2 + 1] = v; m_powerSpectrum[i * 2 + 1] = v;
} }
@ -435,20 +434,20 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
c = fftOut[i + halfSize]; c = fftOut[i + halfSize];
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_movingAverage.storeAndGetAvg(v, i+halfSize); v = m_movingAverage.storeAndGetAvg(v, i+halfSize);
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i] = v; m_powerSpectrum[i] = v;
c = fftOut[i]; c = fftOut[i];
v = c.real() * c.real() + c.imag() * c.imag(); v = c.real() * c.real() + c.imag() * c.imag();
v = m_movingAverage.storeAndGetAvg(v, i); v = m_movingAverage.storeAndGetAvg(v, i);
v = m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs; v = m_settings.m_linear ? v/m_powFFTDiv : m_mult * log2f(v) + m_ofs;
m_powerSpectrum[i + halfSize] = v; m_powerSpectrum[i + halfSize] = v;
} }
} }
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -456,18 +455,18 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
m_movingAverage.nextAverage(); m_movingAverage.nextAverage();
} }
else if (m_avgMode == AvgModeFixedAvg) else if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeFixed)
{ {
double avg; double avg;
@ -480,7 +479,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
if (m_fixedAverage.storeAndGetAvg(avg, v, i)) if (m_fixedAverage.storeAndGetAvg(avg, v, i))
{ {
avg = m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs; avg = m_settings.m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs;
m_powerSpectrum[i * 2] = avg; m_powerSpectrum[i * 2] = avg;
m_powerSpectrum[i * 2 + 1] = avg; m_powerSpectrum[i * 2 + 1] = avg;
} }
@ -496,7 +495,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
// result available // result available
if (m_fixedAverage.storeAndGetAvg(avg, v, i+halfSize)) if (m_fixedAverage.storeAndGetAvg(avg, v, i+halfSize))
{ {
avg = m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs; avg = m_settings.m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs;
m_powerSpectrum[i] = avg; m_powerSpectrum[i] = avg;
} }
@ -506,7 +505,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
// result available // result available
if (m_fixedAverage.storeAndGetAvg(avg, v, i)) if (m_fixedAverage.storeAndGetAvg(avg, v, i))
{ {
avg = m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs; avg = m_settings.m_linear ? avg/m_powFFTDiv : m_mult * log2f(avg) + m_ofs;
m_powerSpectrum[i + halfSize] = avg; m_powerSpectrum[i + halfSize] = avg;
} }
} }
@ -517,7 +516,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -525,17 +524,17 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
} }
} }
else if (m_avgMode == AvgModeMax) else if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMax)
{ {
double max; double max;
@ -548,7 +547,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
if (m_max.storeAndGetMax(max, v, i)) if (m_max.storeAndGetMax(max, v, i))
{ {
max = m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs; max = m_settings.m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs;
m_powerSpectrum[i * 2] = max; m_powerSpectrum[i * 2] = max;
m_powerSpectrum[i * 2 + 1] = max; m_powerSpectrum[i * 2 + 1] = max;
} }
@ -564,7 +563,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
// result available // result available
if (m_max.storeAndGetMax(max, v, i+halfSize)) if (m_max.storeAndGetMax(max, v, i+halfSize))
{ {
max = m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs; max = m_settings.m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs;
m_powerSpectrum[i] = max; m_powerSpectrum[i] = max;
} }
@ -574,7 +573,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
// result available // result available
if (m_max.storeAndGetMax(max, v, i)) if (m_max.storeAndGetMax(max, v, i))
{ {
max = m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs; max = m_settings.m_linear ? max/m_powFFTDiv : m_mult * log2f(max) + m_ofs;
m_powerSpectrum[i + halfSize] = max; m_powerSpectrum[i + halfSize] = max;
} }
} }
@ -585,7 +584,7 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
// send new data to visualisation // send new data to visualisation
if (m_glSpectrum) { if (m_glSpectrum) {
m_glSpectrum->newSpectrum(m_powerSpectrum, m_fftSize); m_glSpectrum->newSpectrum(m_powerSpectrum, m_settings.m_fftSize);
} }
// web socket spectrum connections // web socket spectrum connections
@ -593,12 +592,12 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
{ {
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_fftSize, m_settings.m_fftSize,
m_refLevel, m_settings.m_refLevel,
m_powerRange, m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_linear m_settings.m_linear
); );
} }
} }
@ -649,15 +648,9 @@ bool SpectrumVis::handleMessage(const Message& message)
} }
else if (MsgConfigureSpectrumVis::match(message)) else if (MsgConfigureSpectrumVis::match(message))
{ {
MsgConfigureSpectrumVis& conf = (MsgConfigureSpectrumVis&) message; MsgConfigureSpectrumVis& cfg = (MsgConfigureSpectrumVis&) message;
handleConfigure(conf.getFFTSize(), qDebug() << "SpectrumVis::handleMessage: MsgConfigureSpectrumVis";
conf.getRefLevel(), applySettings(cfg.getSettings(), cfg.getForce());
conf.getPowerRange(),
conf.getOverlapPercent(),
conf.getAverageNb(),
conf.getAvgMode(),
conf.getWindow(),
conf.getLinear());
return true; return true;
} }
else if (MsgConfigureDSP::match(message)) else if (MsgConfigureDSP::match(message))
@ -677,10 +670,12 @@ bool SpectrumVis::handleMessage(const Message& message)
{ {
MsgConfigureWSpectrumOpenClose& conf = (MsgConfigureWSpectrumOpenClose&) message; MsgConfigureWSpectrumOpenClose& conf = (MsgConfigureWSpectrumOpenClose&) message;
handleWSOpenClose(conf.getOpenClose()); handleWSOpenClose(conf.getOpenClose());
return true;
} }
else if (MsgConfigureWSpectrum::match(message)) { else if (MsgConfigureWSpectrum::match(message)) {
MsgConfigureWSpectrum& conf = (MsgConfigureWSpectrum&) message; MsgConfigureWSpectrum& conf = (MsgConfigureWSpectrum&) message;
handleConfigureWSSpectrum(conf.getAddress(), conf.getPort()); handleConfigureWSSpectrum(conf.getAddress(), conf.getPort());
return true;
} }
else else
{ {
@ -688,52 +683,69 @@ bool SpectrumVis::handleMessage(const Message& message)
} }
} }
void SpectrumVis::handleConfigure(int fftSize, void SpectrumVis::applySettings(const GLSpectrumSettings& settings, bool force)
float refLevel,
float powerRange,
int overlapPercent,
unsigned int averageNb,
AvgMode averagingMode,
FFTWindow::Function window,
bool linear)
{ {
// qDebug("SpectrumVis::handleConfigure, fftSize: %d overlapPercent: %d averageNb: %u averagingMode: %d window: %d linear: %s", QMutexLocker mutexLocker(&m_mutex);
// fftSize, overlapPercent, averageNb, (int) averagingMode, (int) window, linear ? "true" : "false");
QMutexLocker mutexLocker(&m_mutex);
if (fftSize > MAX_FFT_SIZE) { int fftSize = settings.m_fftSize > MAX_FFT_SIZE ?
fftSize = MAX_FFT_SIZE; MAX_FFT_SIZE :
} else if (fftSize < 64) { settings.m_fftSize < 64 ?
fftSize = 64; 64 :
} settings.m_fftSize;
m_refLevel = refLevel; int overlapPercent = settings.m_fftOverlap > 100 ?
m_powerRange = powerRange; 100 :
settings.m_fftOverlap < 0 ?
0 :
settings.m_fftOverlap;
if (overlapPercent > 100) { qDebug() << "SpectrumVis::applySettings:"
m_overlapPercent = 100; << " m_fftSize: " << fftSize
} else if (overlapPercent < 0) { << " m_fftWindow: " << settings.m_fftWindow
m_overlapPercent = 0; << " m_fftOverlap: " << overlapPercent
} else { << " m_averagingIndex: " << settings.m_averagingIndex
m_overlapPercent = overlapPercent; << " m_averagingMode: " << settings.m_averagingMode
} << " m_refLevel: " << settings.m_refLevel
<< " m_powerRange: " << settings.m_powerRange
<< " m_linear: " << settings.m_linear
<< " force: " << force;
FFTFactory *fftFactory = DSPEngine::instance()->getFFTFactory(); if ((fftSize != m_settings.m_fftSize) || force)
fftFactory->releaseEngine(m_fftSize, false, m_fftEngineSequence); {
m_fftEngineSequence = fftFactory->getEngine(fftSize, false, &m_fft); FFTFactory *fftFactory = DSPEngine::instance()->getFFTFactory();
m_fftSize = fftSize; fftFactory->releaseEngine(m_settings.m_fftSize, false, m_fftEngineSequence);
m_window.create(window, m_fftSize); m_fftEngineSequence = fftFactory->getEngine(fftSize, false, &m_fft);
m_overlapSize = (m_fftSize * m_overlapPercent) / 100; m_ofs = 20.0f * log10f(1.0f / fftSize);
m_refillSize = m_fftSize - m_overlapSize; m_powFFTDiv = fftSize * fftSize;
m_fftBufferFill = m_overlapSize; }
m_movingAverage.resize(fftSize, averageNb > 1000 ? 1000 : averageNb); // Capping to avoid out of memory condition
m_fixedAverage.resize(fftSize, averageNb); if ((fftSize != m_settings.m_fftSize)
m_max.resize(fftSize, averageNb); || (settings.m_fftWindow != m_settings.m_fftWindow) || force)
m_averageNb = averageNb; {
m_avgMode = averagingMode; m_window.create(settings.m_fftWindow, fftSize);
m_linear = linear; }
m_ofs = 20.0f * log10f(1.0f / m_fftSize);
m_powFFTDiv = m_fftSize*m_fftSize; if ((fftSize != m_settings.m_fftSize)
|| (overlapPercent != m_settings.m_fftOverlap) || force)
{
m_overlapSize = (fftSize * overlapPercent) / 100;
m_refillSize = fftSize - m_overlapSize;
m_fftBufferFill = m_overlapSize;
}
if ((fftSize != m_settings.m_fftSize)
|| (settings.m_averagingIndex != m_settings.m_averagingIndex)
|| (settings.m_averagingMode != m_settings.m_averagingMode) || force)
{
unsigned int averagingValue = GLSpectrumSettings::getAveragingValue(settings.m_averagingIndex, settings.m_averagingMode);
m_movingAverage.resize(fftSize, averagingValue > 1000 ? 1000 : averagingValue); // Capping to avoid out of memory condition
m_fixedAverage.resize(fftSize, averagingValue);
m_max.resize(fftSize, averagingValue);
}
m_settings = settings;
m_settings.m_fftSize = fftSize;
m_settings.m_fftOverlap = overlapPercent;
} }
void SpectrumVis::handleConfigureDSP(uint64_t centerFrequency, int sampleRate) void SpectrumVis::handleConfigureDSP(uint64_t centerFrequency, int sampleRate)

85
sdrbase/dsp/spectrumvis.h
View File

@ -26,6 +26,7 @@
#include "dsp/basebandsamplesink.h" #include "dsp/basebandsamplesink.h"
#include "dsp/fftengine.h" #include "dsp/fftengine.h"
#include "dsp/fftwindow.h" #include "dsp/fftwindow.h"
#include "dsp/glspectrumsettings.h"
#include "export.h" #include "export.h"
#include "util/message.h" #include "util/message.h"
#include "util/movingaverage2d.h" #include "util/movingaverage2d.h"
@ -39,6 +40,29 @@ class MessageQueue;
class SDRGUI_API SpectrumVis : public BasebandSampleSink { class SDRGUI_API SpectrumVis : public BasebandSampleSink {
public: public:
class MsgConfigureSpectrumVis : public Message {
MESSAGE_CLASS_DECLARATION
public:
const GLSpectrumSettings& getSettings() const { return m_settings; }
bool getForce() const { return m_force; }
static MsgConfigureSpectrumVis* create(const GLSpectrumSettings& settings, bool force)
{
return new MsgConfigureSpectrumVis(settings, force);
}
private:
GLSpectrumSettings m_settings;
bool m_force;
MsgConfigureSpectrumVis(const GLSpectrumSettings& settings, bool force) :
Message(),
m_settings(settings),
m_force(force)
{ }
};
enum AvgMode enum AvgMode
{ {
AvgModeNone, AvgModeNone,
@ -75,50 +99,6 @@ public:
virtual bool handleMessage(const Message& message); virtual bool handleMessage(const Message& message);
private: private:
class MsgConfigureSpectrumVis : public Message {
MESSAGE_CLASS_DECLARATION
public:
MsgConfigureSpectrumVis(
int fftSize,
float refLevel,
float powerRange,
int overlapPercent,
unsigned int averageNb,
AvgMode avgMode,
FFTWindow::Function window,
bool linear) :
Message(),
m_fftSize(fftSize),
m_overlapPercent(overlapPercent),
m_refLevel(refLevel),
m_powerRange(powerRange),
m_averageNb(averageNb),
m_avgMode(avgMode),
m_window(window),
m_linear(linear)
{}
int getFFTSize() const { return m_fftSize; }
float getRefLevel() const { return m_refLevel; }
float getPowerRange() const { return m_powerRange; }
int getOverlapPercent() const { return m_overlapPercent; }
unsigned int getAverageNb() const { return m_averageNb; }
SpectrumVis::AvgMode getAvgMode() const { return m_avgMode; }
FFTWindow::Function getWindow() const { return m_window; }
bool getLinear() const { return m_linear; }
private:
int m_fftSize;
int m_overlapPercent;
float m_refLevel;
float m_powerRange;
unsigned int m_averageNb;
SpectrumVis::AvgMode m_avgMode;
FFTWindow::Function m_window;
bool m_linear;
};
class MsgConfigureDSP : public Message class MsgConfigureDSP : public Message
{ {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
@ -196,10 +176,7 @@ private:
std::vector<Complex> m_fftBuffer; std::vector<Complex> m_fftBuffer;
std::vector<Real> m_powerSpectrum; std::vector<Real> m_powerSpectrum;
std::size_t m_fftSize; GLSpectrumSettings m_settings;
float m_refLevel;
float m_powerRange;
std::size_t m_overlapPercent;
std::size_t m_overlapSize; std::size_t m_overlapSize;
std::size_t m_refillSize; std::size_t m_refillSize;
std::size_t m_fftBufferFill; std::size_t m_fftBufferFill;
@ -211,9 +188,6 @@ private:
MovingAverage2D<double> m_movingAverage; MovingAverage2D<double> m_movingAverage;
FixedAverage2D<double> m_fixedAverage; FixedAverage2D<double> m_fixedAverage;
Max2D<double> m_max; Max2D<double> m_max;
unsigned int m_averageNb;
AvgMode m_avgMode;
bool m_linear;
uint64_t m_centerFrequency; uint64_t m_centerFrequency;
int m_sampleRate; int m_sampleRate;
@ -224,14 +198,7 @@ private:
QMutex m_mutex; QMutex m_mutex;
void handleConfigure(int fftSize, void applySettings(const GLSpectrumSettings& settings, bool force = false);
float refLevel,
float powerRange,
int overlapPercent,
unsigned int averageNb,
AvgMode averagingMode,
FFTWindow::Function window,
bool linear);
void handleWSOpenClose(bool openClose); void handleWSOpenClose(bool openClose);
void handleConfigureDSP(uint64_t centerFrequency, void handleConfigureDSP(uint64_t centerFrequency,
int sampleRate); int sampleRate);