VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-04-04 18:48:34 -04:00
Code Issues Projects Releases Wiki Activity

Tx ph.2: fixed core dump in AM modulator by properly locking the settings mutex in the pull method

Browse Source
This commit is contained in:
f4exb 2016-10-30 20:57:27 +01:00
parent 91315913b4
commit 34bf0c4c61
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,25 +65,7 @@ void AMMod::pull(Sample& sample)
{
Complex ci;
// Resampler used for interpolation only
// m_interpolator.resample(&m_interpolatorDistanceRemain, m_modSample, &m_interpolatorConsumed, &ci);
// m_interpolatorDistanceRemain += m_interpolatorDistance;
//
// if (m_interpolatorConsumed)
// {
// Real t = m_toneNco.next();
// m_modSample.real(((t+1.0f) * m_running.m_modFactor * 16384.0f)); // modulate and scale zero frequency carrier
// m_modSample.imag(0.0f);
// m_interpolatorConsumed = false;
// }
// Specialized interpolator
// if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, m_modSample, &ci))
// {
// Real t = m_toneNco.next();
// m_modSample.real(((t+1.0f) * m_running.m_modFactor * 16384.0f)); // modulate and scale zero frequency carrier
// m_modSample.imag(0.0f);
// }
m_settingsMutex.lock();
if (m_interpolatorDistance > 1.0f) // decimate
{
@ -112,6 +94,8 @@ void AMMod::pull(Sample& sample)
ci *= m_carrierNco.nextIQ(); // shift to carrier frequency
m_settingsMutex.unlock();
Real magsq = ci.real() * ci.real() + ci.imag() * ci.imag();
magsq /= (1<<30);
m_movingAverage.feed(magsq);