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

Use a simplified version of sample FIFO (sample vector) in the threaded baseband sample sink

Browse Source
This commit is contained in:
f4exb 2019-08-24 04:54:07 +02:00
parent ac8a73c529
commit ae07fba863
5 changed files with 116 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrbase/CMakeLists.txt
View File

@ -97,6 +97,7 @@ set(sdrbase_SOURCES
dsp/phaselockcomplex.cpp
dsp/projector.cpp
dsp/samplesinkfifo.cpp
dsp/samplesinkvector.cpp
dsp/samplesourcefifo.cpp
dsp/samplesinkfifodoublebuffered.cpp
dsp/basebandsamplesink.cpp
@ -233,6 +234,7 @@ set(sdrbase_HEADERS
dsp/projector.h
dsp/recursivefilters.h
dsp/samplesinkfifo.h
dsp/samplesinkvector.h
dsp/samplesourcefifo.h
dsp/samplesinkfifodoublebuffered.h
dsp/samplesinkfifodecimator.h

47
sdrbase/dsp/samplesinkvector.cpp Normal file
View File

@ -0,0 +1,47 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2019 Edouard Griffiths, F4EXB //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "samplesinkvector.h"
SampleSinkVector::SampleSinkVector(QObject* parent) :
QObject(parent),
m_dataSize(0)
{}
SampleSinkVector::~SampleSinkVector()
{}
void SampleSinkVector::write(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
{
if (end - begin > m_sampleVector.size()) {
m_sampleVector.resize(end - begin);
}
std::copy(begin, end, m_sampleVector.begin());
m_dataSize = end - begin;
// m_begin = begin;
// m_end = end;
emit dataReady();
}
void SampleSinkVector::read(SampleVector::const_iterator& begin, SampleVector::const_iterator& end)
{
begin = m_sampleVector.begin();
end = m_sampleVector.begin() + m_dataSize;
// begin = m_begin;
// end = m_end;
}

48
sdrbase/dsp/samplesinkvector.h Normal file
View File

@ -0,0 +1,48 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2019 Edouard Griffiths, F4EXB //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef SDRBASE_DSP_SAMPLESINKVECTOR_H_
#define SDRBASE_DSP_SAMPLESINKVECTOR_H_
#include <QObject>
#include "dsp/dsptypes.h"
#include "export.h"
class SDRBASE_API SampleSinkVector : public QObject {
Q_OBJECT
public:
SampleSinkVector(QObject* parent = nullptr);
~SampleSinkVector();
void write(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
void read(SampleVector::const_iterator& begin, SampleVector::const_iterator& end);
signals:
void dataReady();
private:
SampleVector m_sampleVector;
int m_dataSize;
int m_sampleVectorSize;
SampleVector::const_iterator m_begin;
SampleVector::const_iterator m_end;
};
#endif // SDRBASE_DSP_SAMPLESINKVECTOR_H_

18
sdrbase/dsp/threadedbasebandsamplesink.cpp
View File

@ -8,7 +8,8 @@
ThreadedBasebandSampleSinkFifo::ThreadedBasebandSampleSinkFifo(BasebandSampleSink *sampleSink, std::size_t size) :
m_sampleSink(sampleSink)
{
connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData()));
//connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData()));
connect(&m_sampleVector, SIGNAL(dataReady()), this, SLOT(handleVectorData()));
m_sampleFifo.setSize(size);
}
@ -19,7 +20,20 @@ ThreadedBasebandSampleSinkFifo::~ThreadedBasebandSampleSinkFifo()
void ThreadedBasebandSampleSinkFifo::writeToFifo(SampleVector::const_iterator& begin, SampleVector::const_iterator& end)
{
m_sampleFifo.write(begin, end);
//m_sampleFifo.write(begin, end);
m_sampleVector.write(begin, end);
}
void ThreadedBasebandSampleSinkFifo::handleVectorData()
{
SampleVector::const_iterator vbegin;
SampleVector::const_iterator vend;
if (m_sampleSink)
{
m_sampleVector.read(vbegin, vend);
m_sampleSink->feed(vbegin, vend, false);
}
}
void ThreadedBasebandSampleSinkFifo::handleFifoData() // FIXME: Fixed? Move it to the new threadable sink class

3
sdrbase/dsp/threadedbasebandsamplesink.h
View File

@ -23,6 +23,7 @@
#include <QMutex>
#include "samplesinkfifo.h"
#include "samplesinkvector.h"
#include "util/messagequeue.h"
#include "export.h"
@ -43,9 +44,11 @@ public:
BasebandSampleSink* m_sampleSink;
SampleSinkFifo m_sampleFifo;
SampleSinkVector m_sampleVector;
public slots:
void handleFifoData();
void handleVectorData();
};
/**