VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Mag AGC: corrected step calculation. Added method to combine step up and down smoothing

This commit is contained in:
f4exb 2018-05-06 02:39:39 +02:00
parent 6b1123009d
commit 56c0aaedcd
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@ void SSBDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
}
else
{
fftfilt::cmplx z = delayedSample * m_agc.getStepDownValue();
fftfilt::cmplx z = delayedSample * m_agc.getStepValue();
if (m_audioBinaual)
{
@ -405,7 +405,7 @@ void SSBDemod::applyAudioSampleRate(int sampleRate)
if (m_agcNbSamples != agcNbSamples)
{
m_agc.resize(agcNbSamples, agcTarget);
m_agc.resize(agcNbSamples, std::min(sampleRate/20, agcNbSamples/2), agcTarget);
m_agc.setStepDownDelay(agcNbSamples);
m_agcNbSamples = agcNbSamples;
}
@ -503,7 +503,7 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force)
if (m_agcNbSamples != agcNbSamples)
{
m_settingsMutex.lock();
m_agc.resize(agcNbSamples, agcTarget);
m_agc.resize(agcNbSamples, std::min((int)m_audioSampleRate/20, agcNbSamples/2), agcTarget);
m_agc.setStepDownDelay(agcNbSamples);
m_agcNbSamples = agcNbSamples;
m_settingsMutex.unlock();

2
plugins/channelrx/udpsrc/udpsrc.cpp
View File

@ -524,7 +524,7 @@ void UDPSrc::applySettings(const UDPSrcSettings& settings, bool force)
m_squelchRelease = (settings.m_outputSampleRate * settings.m_squelchGate) / 100;
initSquelch(m_squelchOpen);
m_agc.resize(settings.m_outputSampleRate * 0.2, m_agcTarget); // Fixed 200 ms
m_agc.resize(settings.m_outputSampleRate/5, settings.m_outputSampleRate/20, m_agcTarget); // Fixed 200 ms
int stepDownDelay = (settings.m_outputSampleRate * (settings.m_squelchGate == 0 ? 1 : settings.m_squelchGate))/100;
m_agc.setStepDownDelay(stepDownDelay);
m_agc.setGate(settings.m_outputSampleRate * 0.05);

7
plugins/channeltx/modssb/ssbmod.cpp
View File

@ -68,7 +68,8 @@ SSBMod::SSBMod(DeviceSinkAPI *deviceAPI) :
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_inAGC(9600, 0.2, 1e-4)
m_inAGC(9600, 0.2, 1e-4),
m_agcStepLength(2400)
{
setObjectName(m_channelId);
@ -690,6 +691,8 @@ void SSBMod::applyAudioSampleRate(int sampleRate)
m_toneNco.setFreq(m_settings.m_toneFrequency, sampleRate);
m_cwKeyer.setSampleRate(sampleRate);
m_agcStepLength = std::min(sampleRate/20, m_settings.m_agcTime/2); // 50 ms or half the AGC length whichever is smaller
m_settingsMutex.unlock();
m_audioSampleRate = sampleRate;
@ -796,7 +799,7 @@ void SSBMod::applySettings(const SSBModSettings& settings, bool force)
(settings.m_agcOrder != m_settings.m_agcOrder) || force)
{
m_settingsMutex.lock();
m_inAGC.resize(settings.m_agcTime, settings.m_agcOrder);
m_inAGC.resize(settings.m_agcTime, m_agcStepLength, settings.m_agcOrder);
m_settingsMutex.unlock();
}

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

@ -309,6 +309,7 @@ private:
CWKeyer m_cwKeyer;
MagAGC m_inAGC;
int m_agcStepLength;
static const int m_levelNbSamples;

20
sdrbase/dsp/agc.cpp
View File

@ -10,8 +10,6 @@
#include "util/stepfunctions.h"
#define StepLengthMax 2400 // 50ms
AGC::AGC(int historySize, double R) :
m_u0(1.0),
m_R(R),
@ -49,7 +47,7 @@ MagAGC::MagAGC(int historySize, double R, double threshold) :
m_threshold(threshold),
m_thresholdEnable(true),
m_gate(0),
m_stepLength(std::min(StepLengthMax, historySize/2)),
m_stepLength(std::min(2400, historySize/2)), // max 50 ms (at 48 kHz)
m_stepDelta(1.0/m_stepLength),
m_stepUpCounter(0),
m_stepDownCounter(m_stepLength),
@ -63,10 +61,10 @@ MagAGC::MagAGC(int historySize, double R, double threshold) :
MagAGC::~MagAGC()
{}
void MagAGC::resize(int historySize, Real R)
void MagAGC::resize(int historySize, int stepLength, Real R)
{
m_R2 = R*R;
m_stepLength = std::min(StepLengthMax, historySize/2);
m_stepLength = stepLength;
m_stepDelta = 1.0 / m_stepLength;
m_stepUpCounter = 0;
m_stepDownCounter = m_stepLength;
@ -188,3 +186,15 @@ float MagAGC::getStepDownValue() const
return StepFunctions::smootherstep(m_stepDownCounter * m_stepDelta);
}
}
float MagAGC::getStepValue() const
{
if (m_count < m_stepDownDelay)
{
return StepFunctions::smootherstep(m_stepUpCounter * m_stepDelta); // step up
}
else
{
return StepFunctions::smootherstep(m_stepDownCounter * m_stepDelta); // step down
}
}

3
sdrbase/dsp/agc.h
View File

@ -39,7 +39,7 @@ public:
MagAGC(int historySize, double R, double threshold);
virtual ~MagAGC();
void setSquared(bool squared) { m_squared = squared; }
void resize(int historySize, Real R);
void resize(int historySize, int stepLength, Real R);
void setOrder(double R);
virtual void feed(Complex& ci);
double feedAndGetValue(const Complex& ci);
@ -52,6 +52,7 @@ public:
void setClampMax(double clampMax) { m_clampMax = clampMax; }
int getStepDownDelay() const { return m_stepDownDelay; }
float getStepDownValue() const;
float getStepValue() const;
private:
bool m_squared; //!< use squared magnitude (power) to compute AGC value