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

XTRX input: basic MIMO working

Browse Source
This commit is contained in:
f4exb 2018-12-31 20:22:42 +01:00
parent 598afa1386
commit 7c8a2120e6
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/samplesource/xtrxinput/xtrxinputthread.cpp
View File

@ -38,8 +38,6 @@ XTRXInputThread::XTRXInputThread(struct xtrx_dev *dev, unsigned int nbChannels,
for (unsigned int i = 0; i < 2; i++) { for (unsigned int i = 0; i < 2; i++) {
m_channels[i].m_convertBuffer.resize(DeviceXTRX::blockSize, Sample{0,0}); m_channels[i].m_convertBuffer.resize(DeviceXTRX::blockSize, Sample{0,0});
} }
m_buf = new qint16[2*DeviceXTRX::blockSize*2]; // room for two channels
} }
XTRXInputThread::~XTRXInputThread() XTRXInputThread::~XTRXInputThread()
@ -50,7 +48,6 @@ XTRXInputThread::~XTRXInputThread()
stopWork(); stopWork();
} }
delete[] m_buf;
delete[] m_channels; delete[] m_channels;
} }
@ -99,7 +96,7 @@ void XTRXInputThread::run()
params.rx.chs = XTRX_CH_AB; params.rx.chs = XTRX_CH_AB;
params.rx.wfmt = XTRX_WF_16; params.rx.wfmt = XTRX_WF_16;
params.rx.hfmt = XTRX_IQ_INT16; params.rx.hfmt = XTRX_IQ_INT16;
params.rx_stream_start = 2*8192; params.rx_stream_start = 2*DeviceXTRX::blockSize; // was 2*8192
if (m_nbChannels == 1) if (m_nbChannels == 1)
{ {
@ -124,11 +121,18 @@ void XTRXInputThread::run()
qDebug("XTRXInputThread::run: stream started"); qDebug("XTRXInputThread::run: stream started");
} }
void* buffers[1] = { m_buf }; const unsigned int elemSize = 4; // XTRX uses 4 byte I+Q samples
std::vector<std::vector<char>> buffMem(m_nbChannels, std::vector<char>(elemSize*DeviceXTRX::blockSize));
std::vector<void *> buffs(m_nbChannels);
for (std::size_t i = 0; i < m_nbChannels; i++) {
buffs[i] = buffMem[i].data();
}
xtrx_recv_ex_info_t nfo; xtrx_recv_ex_info_t nfo;
nfo.samples = DeviceXTRX::blockSize; nfo.samples = DeviceXTRX::blockSize;
nfo.buffer_count = 1; nfo.buffer_count = m_nbChannels;
nfo.buffers = (void* const*)buffers; nfo.buffers = (void* const*) buffs.data();
nfo.flags = RCVEX_DONT_INSER_ZEROS | RCVEX_DROP_OLD_ON_OVERFLOW; nfo.flags = RCVEX_DONT_INSER_ZEROS | RCVEX_DROP_OLD_ON_OVERFLOW;
while (m_running) while (m_running)
@ -143,9 +147,9 @@ void XTRXInputThread::run()
} }
if (m_nbChannels > 1) { if (m_nbChannels > 1) {
callbackMI(m_buf, 2 * nfo.out_samples); callbackMI((const qint16*) buffs[0], (const qint16*) buffs[1], 2 * nfo.out_samples);
} else { } else {
callbackSI(m_buf, 2 * nfo.out_samples); callbackSI((const qint16*) buffs[0], 2 * nfo.out_samples);
} }
} }
@ -253,9 +257,16 @@ void XTRXInputThread::callbackSI(const qint16* buf, qint32 len)
m_channels[m_uniqueChannelIndex].m_sampleFifo->write(m_channels[m_uniqueChannelIndex].m_convertBuffer.begin(), it); m_channels[m_uniqueChannelIndex].m_sampleFifo->write(m_channels[m_uniqueChannelIndex].m_convertBuffer.begin(), it);
} }
void XTRXInputThread::callbackMI(const qint16* buf, qint32 len) void XTRXInputThread::callbackMI(const qint16* buf0, const qint16* buf1, qint32 len)
{ {
(void) buf; unsigned int uniqueChannelIndex = m_uniqueChannelIndex;
(void) len;
// TODO // channel 0
m_uniqueChannelIndex = 0;
callbackSI(buf0, len);
// channel 1
m_uniqueChannelIndex = 1;
callbackSI(buf1, len);
m_uniqueChannelIndex = uniqueChannelIndex;
} }

3
plugins/samplesource/xtrxinput/xtrxinputthread.h
View File

@ -70,14 +70,13 @@ private:
struct xtrx_dev *m_dev; struct xtrx_dev *m_dev;
Channel *m_channels; //!< Array of channels dynamically allocated for the given number of Rx channels Channel *m_channels; //!< Array of channels dynamically allocated for the given number of Rx channels
qint16 *m_buf;
unsigned int m_nbChannels; unsigned int m_nbChannels;
unsigned int m_uniqueChannelIndex; unsigned int m_uniqueChannelIndex;
void run(); void run();
unsigned int getNbFifos(); unsigned int getNbFifos();
void callbackSI(const qint16* buf, qint32 len); void callbackSI(const qint16* buf, qint32 len);
void callbackMI(const qint16* buf, qint32 len); void callbackMI(const qint16* buf0, const qint16* buf1, qint32 len);
}; };