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

DSD demod plugin: DSD proper integration interim state #2

Browse Source
This commit is contained in:
f4exb 2016-04-09 19:14:19 +02:00
parent 5872ee0ca7
commit 497ce458dc
4 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dsd/dsd_state.h
View File

@ -104,9 +104,10 @@ typedef struct
int exitflag; // the former global that cannot be a global within SDRangel and is not of much use with it anyway int exitflag; // the former global that cannot be a global within SDRangel and is not of much use with it anyway
// New from original DSD for in-memory processing support with SDRangel: // New from original DSD for in-memory processing support with SDRangel:
const short *input_samples; //!< demodulator samples short *input_samples; //!< demodulator samples
int input_length; //!< 0: data not ready, >0: data ready for this amount of demodulator samples int input_length; //!< 0: data not ready, >0: data ready for this amount of demodulator samples
int input_offset; //!< consumer pointer int input_offset; //!< consumer pointer
int input_buffer_size; //!< Size of buffer in number of samples
short *output_buffer; //!< Output of decoder single S16LE short *output_buffer; //!< Output of decoder single S16LE
int output_offset; //!< producer pointer int output_offset; //!< producer pointer

11
plugins/channel/demoddsd/dsddecoder.cpp
View File

@ -52,8 +52,10 @@ DSDDecoder::DSDDecoder()
m_dsdParams.opts.mod_gfsk = 1; m_dsdParams.opts.mod_gfsk = 1;
m_dsdParams.state.rf_mod = 0; m_dsdParams.state.rf_mod = 0;
m_dsdParams.state.input_samples = (short *) malloc(1<<18);
m_dsdParams.state.input_length = 0; m_dsdParams.state.input_length = 0;
m_dsdParams.state.input_offset = 0; m_dsdParams.state.input_offset = 0;
m_dsdParams.state.input_buffer_size = 1<<17;
m_dsdParams.state.output_buffer = (short *) malloc(1<<18); // Raw output buffer with single S16LE samples @ 8k (max: 128 kS) m_dsdParams.state.output_buffer = (short *) malloc(1<<18); // Raw output buffer with single S16LE samples @ 8k (max: 128 kS)
m_dsdParams.state.output_offset = 0; m_dsdParams.state.output_offset = 0;
@ -82,14 +84,10 @@ DSDDecoder::~DSDDecoder()
{ {
free(m_dsdParams.state.output_samples); free(m_dsdParams.state.output_samples);
free(m_dsdParams.state.output_buffer); free(m_dsdParams.state.output_buffer);
free(m_dsdParams.state.input_samples);
} }
void DSDDecoder::setInBuffer(const short *inBuffer) void DSDDecoder::pushSamples(const short *samples,int nbSamples)
{
m_dsdParams.state.input_samples = inBuffer;
}
void DSDDecoder::pushSamples(int nbSamples)
{ {
if (nbSamples == 0) if (nbSamples == 0)
{ {
@ -98,6 +96,7 @@ void DSDDecoder::pushSamples(int nbSamples)
} }
else else
{ {
memcpy((void *) m_dsdParams.state.input_samples, (const void *) samples, nbSamples * sizeof(short));
m_dsdParams.state.input_offset = 0; m_dsdParams.state.input_offset = 0;
m_dsdParams.state.input_length = nbSamples; m_dsdParams.state.input_length = nbSamples;
m_dsdParams.state.output_finished = 0; m_dsdParams.state.output_finished = 0;

4
plugins/channel/demoddsd/dsddecoder.h
View File

@ -28,9 +28,7 @@ public:
DSDDecoder(); DSDDecoder();
~DSDDecoder(); ~DSDDecoder();
void setInBuffer(const short *inBuffer); void pushSamples(const short *samples, int nbSamples); // Push this amount of samples to the DSD decoder thread
void pushSample(short sample);
void pushSamples(int nbSamples); // Push this amount of samples to the DSD decoder thread
void popAudioSamples(AudioFifo *audioFifo, bool audioMute); void popAudioSamples(AudioFifo *audioFifo, bool audioMute);
void start(); void start();

7
plugins/channel/demoddsd/dsddemod.cpp
View File

@ -44,7 +44,6 @@ DSDDemod::DSDDemod(SampleSink* sampleSink) :
setObjectName("DSDDemod"); setObjectName("DSDDemod");
m_dsdInBuffer = new qint16[1<<18]; // 128 k Samples is the maximum size of all input devices sample buffers (Airspy or HackRF) = 2^(17+1) for 2 byte samples m_dsdInBuffer = new qint16[1<<18]; // 128 k Samples is the maximum size of all input devices sample buffers (Airspy or HackRF) = 2^(17+1) for 2 byte samples
m_dsdDecoder.setInBuffer(m_dsdInBuffer);
m_config.m_inputSampleRate = 96000; m_config.m_inputSampleRate = 96000;
m_config.m_inputFrequencyOffset = 0; m_config.m_inputFrequencyOffset = 0;
@ -105,7 +104,6 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
Complex c(it->real(), it->imag()); Complex c(it->real(), it->imag());
c *= m_nco.nextIQ(); c *= m_nco.nextIQ();
{
if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, c, &ci)) if (m_interpolator.interpolate(&m_interpolatorDistanceRemain, c, &ci))
{ {
qint16 sample; qint16 sample;
@ -173,7 +171,6 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
m_interpolatorDistanceRemain += m_interpolatorDistance; m_interpolatorDistanceRemain += m_interpolatorDistance;
} }
} }
}
// if (m_audioBufferFill > 0) // if (m_audioBufferFill > 0)
@ -189,9 +186,9 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
// } // }
m_dsdDecoder.popAudioSamples(&m_audioFifo, m_running.m_audioMute); m_dsdDecoder.popAudioSamples(&m_audioFifo, m_running.m_audioMute);
m_dsdDecoder.pushSamples(m_dsdInCount); m_dsdDecoder.pushSamples(m_dsdInBuffer, m_dsdInCount);
if((m_scope != 0) && (m_scopeEnabled)) if ((m_scope != 0) && (m_scopeEnabled))
{ {
m_scope->feed(m_scopeSampleBuffer.begin(), m_scopeSampleBuffer.end(), true); // true = real samples for what it's worth m_scope->feed(m_scopeSampleBuffer.begin(), m_scopeSampleBuffer.end(), true); // true = real samples for what it's worth
} }