VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-10 10:33:29 -05:00
Code Issues Projects Releases Wiki Activity

Mods and demods: prevent returning null or infinite values for squared magnitude

Browse Source
This commit is contained in:
f4exb 2017-05-16 17:46:44 +02:00
parent 747f400a78
commit 416817d0b8
11 changed files with 206 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/chanalyzerng/chanalyzerng.h
View File

@ -43,7 +43,7 @@ public:
int getInputSampleRate() const { return m_running.m_inputSampleRate; } int getInputSampleRate() const { return m_running.m_inputSampleRate; }
int getChannelSampleRate() const { return m_running.m_channelSampleRate; } int getChannelSampleRate() const { return m_running.m_channelSampleRate; }
Real getMagSq() const { return m_magsq; } Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; }
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
virtual void start(); virtual void start();

6
plugins/channelrx/demodam/amdemod.h
View File

@ -46,9 +46,9 @@ public:
void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) void getMagSqLevels(Real& avg, Real& peak, int& nbSamples)
{ {
avg = m_magsqSum / m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
peak = m_magsqPeak; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
nbSamples = m_magsqCount; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqSum = 0.0f; m_magsqSum = 0.0f;
m_magsqPeak = 0.0f; m_magsqPeak = 0.0f;
m_magsqCount = 0; m_magsqCount = 0;

6
plugins/channelrx/demodbfm/bfmdemod.h
View File

@ -71,10 +71,10 @@ public:
void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) void getMagSqLevels(Real& avg, Real& peak, int& nbSamples)
{ {
avg = m_magsqSum / m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
m_magsq = avg; m_magsq = avg;
peak = m_magsqPeak; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
nbSamples = m_magsqCount; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqSum = 0.0f; m_magsqSum = 0.0f;
m_magsqPeak = 0.0f; m_magsqPeak = 0.0f;
m_magsqCount = 0; m_magsqCount = 0;

7
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -75,15 +75,16 @@ public:
void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) void getMagSqLevels(Real& avg, Real& peak, int& nbSamples)
{ {
avg = m_magsqSum / m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
m_magsq = avg; m_magsq = avg;
peak = m_magsqPeak; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
nbSamples = m_magsqCount; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqSum = 0.0f; m_magsqSum = 0.0f;
m_magsqPeak = 0.0f; m_magsqPeak = 0.0f;
m_magsqCount = 0; m_magsqCount = 0;
} }
private: private:
class MsgConfigureMyPosition : public Message { class MsgConfigureMyPosition : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION

6
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -74,10 +74,10 @@ public:
void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) void getMagSqLevels(Real& avg, Real& peak, int& nbSamples)
{ {
avg = m_magsqSum / m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
m_magsq = avg; m_magsq = avg;
peak = m_magsqPeak; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
nbSamples = m_magsqCount; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqSum = 0.0f; m_magsqSum = 0.0f;
m_magsqPeak = 0.0f; m_magsqPeak = 0.0f;
m_magsqCount = 0; m_magsqCount = 0;

6
plugins/channelrx/demodssb/ssbdemod.h
View File

@ -53,10 +53,10 @@ public:
void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) void getMagSqLevels(Real& avg, Real& peak, int& nbSamples)
{ {
avg = m_magsqSum / m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
m_magsq = avg; m_magsq = avg;
peak = m_magsqPeak; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
nbSamples = m_magsqCount; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqSum = 0.0f; m_magsqSum = 0.0f;
m_magsqPeak = 0.0f; m_magsqPeak = 0.0f;
m_magsqCount = 0; m_magsqCount = 0;

6
plugins/channelrx/demodwfm/wfmdemod.h
View File

@ -55,10 +55,10 @@ public:
void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) void getMagSqLevels(Real& avg, Real& peak, int& nbSamples)
{ {
avg = m_magsqSum / m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
m_magsq = avg; m_magsq = avg;
peak = m_magsqPeak; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
nbSamples = m_magsqCount; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqSum = 0.0f; m_magsqSum = 0.0f;
m_magsqPeak = 0.0f; m_magsqPeak = 0.0f;
m_magsqCount = 0; m_magsqCount = 0;

2
plugins/channeltx/modam/ammod.h
View File

@ -190,7 +190,7 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
Real getMagSq() const { return m_magsq; } Real getMagSq() const { return m_magsq == 0.0 ? 1e-10 : m_magsq; }
CWKeyer *getCWKeyer() { return &m_cwKeyer; } CWKeyer *getCWKeyer() { return &m_cwKeyer; }

2
plugins/channeltx/modnfm/nfmmod.h
View File

@ -195,7 +195,7 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
Real getMagSq() const { return m_magsq; } Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; }
CWKeyer *getCWKeyer() { return &m_cwKeyer; } CWKeyer *getCWKeyer() { return &m_cwKeyer; }

2
plugins/channeltx/modssb/ssbmod.h
View File

@ -195,7 +195,7 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
Real getMagSq() const { return m_magsq; } Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; }
CWKeyer *getCWKeyer() { return &m_cwKeyer; } CWKeyer *getCWKeyer() { return &m_cwKeyer; }

2
plugins/channeltx/modwfm/wfmmod.h
View File

@ -192,7 +192,7 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
Real getMagSq() const { return m_magsq; } Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; }
CWKeyer *getCWKeyer() { return &m_cwKeyer; } CWKeyer *getCWKeyer() { return &m_cwKeyer; }