VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-21 04:58:38 -05:00
Code Issues Projects Releases Wiki Activity

Tx ph.2: allow decimation in AM modulator i.e. output sample rate lower than audio rate

Browse Source
This commit is contained in:
f4exb 2016-10-28 04:34:06 +02:00
parent 4d273d8a13
commit babd4f8014
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,12 +78,35 @@ void AMMod::pull(Sample& sample)
// } // }
// Specialized interpolator // Specialized interpolator
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, m_modSample, &ci)) // 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);
// }
if (m_interpolatorDistance > 1.0f) // decimate
{
Real t = m_toneNco.next(); 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.real(((t+1.0f) * m_running.m_modFactor * 16384.0f)); // modulate and scale zero frequency carrier
m_modSample.imag(0.0f); m_modSample.imag(0.0f);
}
while (!m_interpolator.decimate(&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);
}
}
else
{
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_interpolatorDistanceRemain += m_interpolatorDistance; m_interpolatorDistanceRemain += m_interpolatorDistance;
@ -169,10 +192,10 @@ void AMMod::apply()
(m_config.m_rfBandwidth != m_running.m_rfBandwidth)) (m_config.m_rfBandwidth != m_running.m_rfBandwidth))
{ {
m_settingsMutex.lock(); m_settingsMutex.lock();
m_interpolator.create(16, m_config.m_outputSampleRate, m_config.m_rfBandwidth / 2.2);
m_interpolatorDistanceRemain = 0; m_interpolatorDistanceRemain = 0;
m_interpolatorConsumed = false; m_interpolatorConsumed = false;
m_interpolatorDistance = (Real) m_config.m_audioSampleRate / (Real) m_config.m_outputSampleRate; m_interpolatorDistance = (Real) m_config.m_audioSampleRate / (Real) m_config.m_outputSampleRate;
m_interpolator.create(16, m_config.m_outputSampleRate, m_config.m_rfBandwidth / 2.2);
m_settingsMutex.unlock(); m_settingsMutex.unlock();
} }

2
plugins/samplesink/filesink/filesinkgui.cpp
View File

@ -327,7 +327,7 @@ void FileSinkGui::tick()
} }
} }
unsigned int FileSinkSampleRates::m_rates[] = {48, 60, 60, 64, 72}; unsigned int FileSinkSampleRates::m_rates[] = {32, 36, 48, 64, 72};
unsigned int FileSinkSampleRates::m_nb_rates = 5; unsigned int FileSinkSampleRates::m_nb_rates = 5;
unsigned int FileSinkSampleRates::getRate(unsigned int rate_index) unsigned int FileSinkSampleRates::getRate(unsigned int rate_index)