VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-14 06:45:21 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include-gpl/dsp/channelizer.h
View File

@ -2,6 +2,7 @@
#define INCLUDE_CHANNELIZER_H #define INCLUDE_CHANNELIZER_H
#include <list> #include <list>
#include <QMutex>
#include "dsp/samplesink.h" #include "dsp/samplesink.h"
#include "util/export.h" #include "util/export.h"
#include "util/message.h" #include "util/message.h"
@ -70,6 +71,7 @@ protected:
int m_currentOutputSampleRate; int m_currentOutputSampleRate;
int m_currentCenterFrequency; int m_currentCenterFrequency;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
QMutex m_mutex;
void applyConfiguration(); void applyConfiguration();
bool signalContainsChannel(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) const; bool signalContainsChannel(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) const;
@ -81,53 +83,3 @@ signals:
}; };
#endif // INCLUDE_CHANNELIZER_H #endif // INCLUDE_CHANNELIZER_H
#if 0
#ifndef INCLUDE_CHANNELIZER_H
#define INCLUDE_CHANNELIZER_H
#include "samplesink.h"
#include "spectrum.h"
#include "nco.h"
#include "interpolator.h"
#include "pidcontroller.h"
#include "hardware/audiofifo.h"
class AudioOutput;
class Channelizer : public SampleSink {
public:
Channelizer();
~Channelizer();
#if 0
void setGLSpectrum(GLSpectrum* glSpectrum);
#endif
size_t workUnitSize();
size_t work(SampleVector::const_iterator begin, SampleVector::const_iterator end);
private:
#if 0
NCO m_nco;
Interpolator m_interpolator;
Real m_distance;
Interpolator m_interpolator2;
Real m_distance2;
SampleVector m_buffer;
size_t m_bufferFill;
Complex m_lastSample;
AudioOutput* m_audioOutput;
AudioFifo m_audioFifo;
Real m_resampler;
PIDController m_resamplerCtrl;
Spectrum m_spectrum;
#endif
};
#endif // INCLUDE_CHANNELIZER_H
#endif

21
sdrbase/dsp/channelizer.cpp
View File

@ -37,17 +37,28 @@ void Channelizer::feed(const SampleVector::const_iterator& begin, const SampleVe
return; 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); Sample s(*sample);
FilterStages::iterator stage = m_filterStages.begin(); FilterStages::iterator stage = m_filterStages.begin();
while(stage != m_filterStages.end()) {
for (; stage != m_filterStages.end(); ++stage)
{
if(!(*stage)->work(&s)) if(!(*stage)->work(&s))
{
break; break;
++stage;
} }
}
if(stage == m_filterStages.end()) if(stage == m_filterStages.end())
{
m_sampleBuffer.push_back(s); m_sampleBuffer.push_back(s);
} }
}
m_mutex.unlock();
m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), positiveOnly); m_sampleSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), positiveOnly);
m_sampleBuffer.clear(); m_sampleBuffer.clear();
@ -125,12 +136,16 @@ void Channelizer::applyConfiguration()
return; return;
} }
m_mutex.lock();
freeFilterChain(); freeFilterChain();
m_currentCenterFrequency = createFilterChain( m_currentCenterFrequency = createFilterChain(
m_inputSampleRate / -2, m_inputSampleRate / 2, m_inputSampleRate / -2, m_inputSampleRate / 2,
m_requestedCenterFrequency - m_requestedOutputSampleRate / 2, m_requestedCenterFrequency + m_requestedOutputSampleRate / 2); m_requestedCenterFrequency - m_requestedOutputSampleRate / 2, m_requestedCenterFrequency + m_requestedOutputSampleRate / 2);
m_mutex.unlock();
m_currentOutputSampleRate = m_inputSampleRate / (1 << m_filterStages.size()); m_currentOutputSampleRate = m_inputSampleRate / (1 << m_filterStages.size());
qDebug() << "Channelizer::applyConfiguration in=" << m_inputSampleRate qDebug() << "Channelizer::applyConfiguration in=" << m_inputSampleRate