VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 13:47:50 -04:00
Code Issues Projects Releases Wiki Activity

AM Modulator: use CW smoother

Browse Source
This commit is contained in:
f4exb 2016-12-14 23:45:16 +01:00
parent 0a7e9261e2
commit 1186e80663
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/channeltx/modam/ammod.cpp
View File

@ -71,6 +71,7 @@ AMMod::AMMod() :
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwKeyer.setWPM(13); m_cwKeyer.setWPM(13);
m_cwKeyer.setMode(CWKeyer::CWNone); m_cwKeyer.setMode(CWKeyer::CWNone);
m_cwSmoother.setNbFadeSamples(96); // 2 ms @ 48 kHz
} }
AMMod::~AMMod() AMMod::~AMMod()
@ -182,14 +183,24 @@ void AMMod::pullAF(Real& sample)
sample = ((audioSample[0] + audioSample[1]) / 65536.0f) * m_running.m_volumeFactor; sample = ((audioSample[0] + audioSample[1]) / 65536.0f) * m_running.m_volumeFactor;
break; break;
case AMModInputCWTone: case AMModInputCWTone:
Real fadeFactor;
if (m_cwKeyer.getSample()) if (m_cwKeyer.getSample())
{ {
sample = m_toneNco.next(); m_cwSmoother.getFadeSample(true, fadeFactor);
sample = m_toneNco.next() * fadeFactor;
} }
else else
{ {
sample = 0.0f; if (m_cwSmoother.getFadeSample(false, fadeFactor))
m_toneNco.setPhase(0); {
sample = m_toneNco.next() * fadeFactor;
}
else
{
sample = 0.0f;
m_toneNco.setPhase(0);
}
} }
break; break;
case AMModInputNone: case AMModInputNone:
@ -348,6 +359,7 @@ void AMMod::apply()
if (m_config.m_audioSampleRate != m_running.m_audioSampleRate) if (m_config.m_audioSampleRate != m_running.m_audioSampleRate)
{ {
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms
} }
m_running.m_outputSampleRate = m_config.m_outputSampleRate; m_running.m_outputSampleRate = m_config.m_outputSampleRate;

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

@ -311,6 +311,7 @@ private:
Real m_peakLevel; Real m_peakLevel;
Real m_levelSum; Real m_levelSum;
CWKeyer m_cwKeyer; CWKeyer m_cwKeyer;
CWSmoother m_cwSmoother;
static const int m_levelNbSamples; static const int m_levelNbSamples;