VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 14:04:46 -04:00
Code Issues Projects Releases Wiki Activity

SampleSourceFifo refactoring and Tx code reorganization

Browse Source
This commit is contained in:
f4exb
2019-11-15 01:04:24 +01:00
parent 246ff824af
commit 3b74153ec6
198 changed files with 13267 additions and 7750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/testsink/testsinkthread.cpp
+52 -41
View File
@@ -21,11 +21,11 @@
#include <algorithm>
#include <QDebug>
#include "dsp/samplesourcefifodb.h"
#include "dsp/samplesourcefifo.h"
#include "dsp/basebandsamplesink.h"
#include "testsinkthread.h"
TestSinkThread::TestSinkThread(SampleSourceFifoDB* sampleFifo, QObject* parent) :
TestSinkThread::TestSinkThread(SampleSourceFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_bufsize(0),
@@ -88,7 +88,7 @@ void TestSinkThread::setSamplerate(int samplerate)
// resize sample FIFO
if (m_sampleFifo) {
m_sampleFifo->resize(samplerate); // 1s buffer
m_sampleFifo->resize(SampleSourceFifo::getSizePolicy(samplerate));
}
// resize output buffer
@@ -168,52 +168,63 @@ void TestSinkThread::tick()
m_throttleToggle = !m_throttleToggle;
}
SampleVector::iterator readUntil;
m_sampleFifo->readAdvance(readUntil, m_samplesChunkSize);
SampleVector::iterator beginRead = readUntil - m_samplesChunkSize;
unsigned int iPart1Begin, iPart1End, iPart2Begin, iPart2End;
SampleVector& data = m_sampleFifo->getData();
m_sampleFifo->read(m_samplesChunkSize, iPart1Begin, iPart1End, iPart2Begin, iPart2End);
m_samplesCount += m_samplesChunkSize;
int chunkSize = std::min((int) m_samplesChunkSize, m_samplerate);
if (m_log2Interpolation == 0)
{
m_interpolators.interpolate1(&beginRead, m_buf, 2*chunkSize);
feedSpectrum(m_buf, 2*chunkSize);
//m_ofstream->write(reinterpret_cast<char*>(&(*beginRead)), m_samplesChunkSize*sizeof(Sample));
if (iPart1Begin != iPart1End) {
callbackPart(data, iPart1Begin, iPart1End);
}
else
{
switch (m_log2Interpolation)
{
case 1:
m_interpolators.interpolate2_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 2:
m_interpolators.interpolate4_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 3:
m_interpolators.interpolate8_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 4:
m_interpolators.interpolate16_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 5:
m_interpolators.interpolate32_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 6:
m_interpolators.interpolate64_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
default:
break;
}
feedSpectrum(m_buf, 2*chunkSize*(1<<m_log2Interpolation));
//m_ofstream->write(reinterpret_cast<char*>(m_buf), m_samplesChunkSize*(1<<m_log2Interpolation)*2*sizeof(int16_t));
if (iPart2Begin != iPart2End) {
callbackPart(data, iPart2Begin, iPart2End);
}
}
}
void TestSinkThread::callbackPart(SampleVector& data, unsigned int iBegin, unsigned int iEnd)
{
SampleVector::iterator beginRead = data.begin() + iBegin;
unsigned int chunkSize = iEnd - iBegin;
if (m_log2Interpolation == 0)
{
m_interpolators.interpolate1(&beginRead, m_buf, 2*chunkSize);
feedSpectrum(m_buf, 2*chunkSize);
}
else
{
switch (m_log2Interpolation)
{
case 1:
m_interpolators.interpolate2_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 2:
m_interpolators.interpolate4_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 3:
m_interpolators.interpolate8_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 4:
m_interpolators.interpolate16_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 5:
m_interpolators.interpolate32_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
case 6:
m_interpolators.interpolate64_cen(&beginRead, m_buf, chunkSize*(1<<m_log2Interpolation)*2);
break;
default:
break;
}
feedSpectrum(m_buf, 2*chunkSize*(1<<m_log2Interpolation));
}
}
void TestSinkThread::feedSpectrum(int16_t *buf, unsigned int bufSize)
{
if (!m_spectrumSink) {