VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-23 12:48:49 -04:00
Code Issues Projects Releases Wiki Activity

SoapySDR output: support floating point type samples

Browse Source
This commit is contained in:
f4exb 2019-05-17 18:35:34 +02:00
parent 7eef772b55
commit 2d44fa3b99
4 changed files with 1446 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
plugins/samplesink/soapysdroutput/soapysdroutputthread.cpp
View File

@ -169,7 +169,7 @@ void SoapySDROutputThread::run()
break;
case InterpolatorFloat:
default:
// TODO
callbackSOIF((float*) buffs[0], numElems);
break;
}
}
@ -270,7 +270,7 @@ void SoapySDROutputThread::callbackMO(std::vector<void *>& buffs, qint32 samples
break;
case InterpolatorFloat:
default:
// TODO
std::fill((float*) buffs[ichan], (float*) buffs[ichan] + 2*samplesPerChannel, 0.0f);
break;
}
}
@ -437,3 +437,57 @@ void SoapySDROutputThread::callbackSO16(qint16* buf, qint32 len, unsigned int ch
std::fill(buf, buf+2*len, 0);
}
}
void SoapySDROutputThread::callbackSOIF(float* buf, qint32 len, unsigned int channel)
{
if (m_channels[channel].m_sampleFifo)
{
float bal = m_channels[channel].m_sampleFifo->getRWBalance();
if (bal < -0.25) {
qDebug("SoapySDROutputThread::callbackSO16: read lags: %f", bal);
} else if (bal > 0.25) {
qDebug("SoapySDROutputThread::callbackSO16: read leads: %f", bal);
}
SampleVector::iterator beginRead;
m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
beginRead -= len;
if (m_channels[channel].m_log2Interp == 0)
{
m_channels[channel].m_interpolatorsIF.interpolate1(&beginRead, buf, len*2);
}
else
{
switch (m_channels[channel].m_log2Interp)
{
case 1:
m_channels[channel].m_interpolatorsIF.interpolate2_cen(&beginRead, buf, len*2);
break;
case 2:
m_channels[channel].m_interpolatorsIF.interpolate4_cen(&beginRead, buf, len*2);
break;
case 3:
m_channels[channel].m_interpolatorsIF.interpolate8_cen(&beginRead, buf, len*2);
break;
case 4:
m_channels[channel].m_interpolatorsIF.interpolate16_cen(&beginRead, buf, len*2);
break;
case 5:
m_channels[channel].m_interpolatorsIF.interpolate32_cen(&beginRead, buf, len*2);
break;
case 6:
m_channels[channel].m_interpolatorsIF.interpolate64_cen(&beginRead, buf, len*2);
break;
default:
break;
}
}
}
else
{
std::fill(buf, buf+2*len, 0.0f);
}
}

3
plugins/samplesink/soapysdroutput/soapysdroutputthread.h
View File

@ -27,6 +27,7 @@
#include "soapysdr/devicesoapysdrshared.h"
#include "dsp/interpolators.h"
#include "dsp/interpolatorsif.h"
class SampleSourceFifo;
@ -56,6 +57,7 @@ private:
Interpolators<qint8, SDR_TX_SAMP_SZ, 8> m_interpolators8;
Interpolators<qint16, SDR_TX_SAMP_SZ, 12> m_interpolators12;
Interpolators<qint16, SDR_TX_SAMP_SZ, 16> m_interpolators16;
InterpolatorsIF<SDR_TX_SAMP_SZ, SDR_TX_SAMP_SZ> m_interpolatorsIF;
Channel() :
m_sampleFifo(0),
@ -90,6 +92,7 @@ private:
void callbackSO8(qint8* buf, qint32 len, unsigned int channel = 0);
void callbackSO12(qint16* buf, qint32 len, unsigned int channel = 0);
void callbackSO16(qint16* buf, qint32 len, unsigned int channel = 0);
void callbackSOIF(float* buf, qint32 len, unsigned int channel = 0);
void callbackMO(std::vector<void *>& buffs, qint32 samplesPerChannel);
};

1
sdrbase/CMakeLists.txt
View File

@ -133,6 +133,7 @@ set(sdrbase_HEADERS
dsp/decimatorsfi.h
dsp/decimatorsu.h
dsp/interpolators.h
dsp/interpolatorsif.h
dsp/dspcommands.h
dsp/dspengine.h
dsp/dspdevicesourceengine.h

1386
sdrbase/dsp/interpolatorsif.h Normal file
View File

File diff suppressed because it is too large Load Diff