VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-29 21:44:14 -04:00
Code Issues Projects Releases Wiki Activity

Fixed segfault while changing center frequency or sample rate

Browse Source
This commit is contained in:
f4exb
2015-09-06 10:21:06 +02:00
parent e784cf7f7f
commit ed0d613f10
2 changed files with 20 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/dsp/channelizer.cpp
+18 -3
View File
@@ -37,18 +37,29 @@ void Channelizer::feed(const SampleVector::const_iterator& begin, const SampleVe
return;
}
for(SampleVector::const_iterator sample = begin; sample != end; ++sample) {
m_mutex.lock();
for(SampleVector::const_iterator sample = begin; sample != end; ++sample)
{
Sample s(*sample);
FilterStages::iterator stage = m_filterStages.begin();
while(stage != m_filterStages.end()) {
for (; stage != m_filterStages.end(); ++stage)
{
if(!(*stage)->work(&s))
{
break;
++stage;
}
}
if(stage == m_filterStages.end())
{
m_sampleBuffer.push_back(s);
}
}
m_mutex.unlock();
m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), positiveOnly);
m_sampleBuffer.clear();
}
@@ -125,12 +136,16 @@ void Channelizer::applyConfiguration()
return;
}
m_mutex.lock();
freeFilterChain();
m_currentCenterFrequency = createFilterChain(
m_inputSampleRate / -2, m_inputSampleRate / 2,
m_requestedCenterFrequency - m_requestedOutputSampleRate / 2, m_requestedCenterFrequency + m_requestedOutputSampleRate / 2);
m_mutex.unlock();
m_currentOutputSampleRate = m_inputSampleRate / (1 << m_filterStages.size());
qDebug() << "Channelizer::applyConfiguration in=" << m_inputSampleRate