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

UpChannelizer: pass baseband sample rate in notification message

This commit is contained in:
f4exb 2017-08-06 17:10:29 +02:00
parent d0f718d982
commit f6bc9daf8e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,7 @@ void SSBMod::pull(Sample& sample)
void SSBMod::pullAudio(int nbSamples)
{
unsigned int nbSamplesAudio = nbSamples * m_interpolatorDistance;
unsigned int nbSamplesAudio = nbSamples * ((Real) m_config.m_audioSampleRate / (Real) m_config.m_basebandSampleRate);
if (nbSamplesAudio > m_audioBuffer.size())
{
@ -567,13 +567,15 @@ bool SSBMod::handleMessage(const Message& cmd)
{
UpChannelizer::MsgChannelizerNotification& notif = (UpChannelizer::MsgChannelizerNotification&) cmd;
m_config.m_basebandSampleRate = notif.getBasebandSampleRate();
m_config.m_outputSampleRate = notif.getSampleRate();
m_config.m_inputFrequencyOffset = notif.getFrequencyOffset();
apply();
qDebug() << "SSBMod::handleMessage: MsgChannelizerNotification:"
<< " m_outputSampleRate: " << m_config.m_outputSampleRate
<< " m_basebandSampleRate: " << m_config.m_basebandSampleRate
<< " m_outputSampleRate: " << m_config.m_outputSampleRate
<< " m_inputFrequencyOffset: " << m_config.m_inputFrequencyOffset;
return true;

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

@ -341,6 +341,7 @@ private:
};
struct Config {
int m_basebandSampleRate;
int m_outputSampleRate;
qint64 m_inputFrequencyOffset;
Real m_bandwidth;
@ -364,6 +365,7 @@ private:
int m_agcThresholdDelay;
Config() :
m_basebandSampleRate(0),
m_outputSampleRate(0),
m_inputFrequencyOffset(0),
m_bandwidth(3000.0f),

2
sdrbase/dsp/upchannelizer.cpp
View File

@ -196,7 +196,7 @@ void UpChannelizer::applyConfiguration()
if (m_sampleSource != 0)
{
MsgChannelizerNotification notif(m_currentInputSampleRate, m_currentCenterFrequency);
MsgChannelizerNotification notif(m_outputSampleRate, m_currentInputSampleRate, m_currentCenterFrequency);
m_sampleSource->handleMessage(notif);
}
}

5
sdrbase/dsp/upchannelizer.h
View File

@ -40,16 +40,19 @@ public:
MESSAGE_CLASS_DECLARATION
public:
MsgChannelizerNotification(int samplerate, qint64 frequencyOffset) :
MsgChannelizerNotification(int basebandSampleRate, int samplerate, qint64 frequencyOffset) :
Message(),
m_basebandSampleRate(basebandSampleRate),
m_sampleRate(samplerate),
m_frequencyOffset(frequencyOffset)
{ }
int getBasebandSampleRate() const { return m_basebandSampleRate; }
int getSampleRate() const { return m_sampleRate; }
qint64 getFrequencyOffset() const { return m_frequencyOffset; }
private:
int m_basebandSampleRate;
int m_sampleRate;
qint64 m_frequencyOffset;
};