VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -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/bladerf2output/bladerf2outputthread.cpp
+47 -40
View File
@@ -17,7 +17,7 @@
#include <algorithm>
#include "dsp/samplesourcefifodb.h"
#include "dsp/samplesourcefifo.h"
#include "bladerf2outputthread.h"
@@ -151,14 +151,14 @@ unsigned int BladeRF2OutputThread::getLog2Interpolation(unsigned int channel) co
}
}
void BladeRF2OutputThread::setFifo(unsigned int channel, SampleSourceFifoDB *sampleFifo)
void BladeRF2OutputThread::setFifo(unsigned int channel, SampleSourceFifo *sampleFifo)
{
if (channel < m_nbChannels) {
m_channels[channel].m_sampleFifo = sampleFifo;
}
}
SampleSourceFifoDB *BladeRF2OutputThread::getFifo(unsigned int channel)
SampleSourceFifo *BladeRF2OutputThread::getFifo(unsigned int channel)
{
if (channel < m_nbChannels) {
return m_channels[channel].m_sampleFifo;
@@ -193,47 +193,18 @@ void BladeRF2OutputThread::callbackSO(qint16* buf, qint32 len, unsigned int chan
{
if (m_channels[channel].m_sampleFifo)
{
float bal = m_channels[channel].m_sampleFifo->getRWBalance();
SampleVector& data = m_channels[channel].m_sampleFifo->getData();
unsigned int iPart1Begin, iPart1End, iPart2Begin, iPart2End;
m_channels[channel].m_sampleFifo->read(len/(1<<m_channels[channel].m_log2Interp), iPart1Begin, iPart1End, iPart2Begin, iPart2End);
if (bal < -0.25) {
qDebug("BladeRF2OutputThread::callbackSO: read lags: %f", bal);
} else if (bal > 0.25) {
qDebug("BladeRF2OutputThread::callbackSO: read leads: %f", bal);
if (iPart1Begin != iPart1End) {
callbackPart(buf, data, iPart1Begin, iPart1End, channel);
}
SampleVector::iterator beginRead;
m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
beginRead -= len/(1<<m_channels[channel].m_log2Interp);
unsigned int shift = (iPart1End - iPart1Begin)*(1<<m_channels[channel].m_log2Interp);
if (m_channels[channel].m_log2Interp == 0)
{
m_channels[channel].m_interpolators.interpolate1(&beginRead, buf, len*2);
}
else
{
switch (m_channels[channel].m_log2Interp)
{
case 1:
m_channels[channel].m_interpolators.interpolate2_cen(&beginRead, buf, len*2);
break;
case 2:
m_channels[channel].m_interpolators.interpolate4_cen(&beginRead, buf, len*2);
break;
case 3:
m_channels[channel].m_interpolators.interpolate8_cen(&beginRead, buf, len*2);
break;
case 4:
m_channels[channel].m_interpolators.interpolate16_cen(&beginRead, buf, len*2);
break;
case 5:
m_channels[channel].m_interpolators.interpolate32_cen(&beginRead, buf, len*2);
break;
case 6:
m_channels[channel].m_interpolators.interpolate64_cen(&beginRead, buf, len*2);
break;
default:
break;
}
if (iPart2Begin != iPart2End) {
callbackPart(buf + 2*shift, data, iPart2Begin, iPart2End, channel);
}
}
else
@@ -242,3 +213,39 @@ void BladeRF2OutputThread::callbackSO(qint16* buf, qint32 len, unsigned int chan
}
}
void BladeRF2OutputThread::callbackPart(qint16* buf, SampleVector& data, unsigned int iBegin, unsigned int iEnd, unsigned int channel)
{
SampleVector::iterator beginRead = data.begin() + iBegin;
int len = 2*(iEnd - iBegin)*(1<<m_channels[channel].m_log2Interp);
if (m_channels[channel].m_log2Interp == 0)
{
m_channels[channel].m_interpolators.interpolate1(&beginRead, buf, len);
}
else
{
switch (m_channels[channel].m_log2Interp)
{
case 1:
m_channels[channel].m_interpolators.interpolate2_cen(&beginRead, buf, len);
break;
case 2:
m_channels[channel].m_interpolators.interpolate4_cen(&beginRead, buf, len);
break;
case 3:
m_channels[channel].m_interpolators.interpolate8_cen(&beginRead, buf, len);
break;
case 4:
m_channels[channel].m_interpolators.interpolate16_cen(&beginRead, buf, len);
break;
case 5:
m_channels[channel].m_interpolators.interpolate32_cen(&beginRead, buf, len);
break;
case 6:
m_channels[channel].m_interpolators.interpolate64_cen(&beginRead, buf, len);
break;
default:
break;
}
}
}