VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 17:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Remote source: set socket receive buffer size from sample rate in meta data

Browse Source
This commit is contained in:
f4exb 2021-12-07 04:50:05 +01:00
parent bb1f833d02
commit 2515f08409
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/channeltx/remotesource/remotesourceworker.cpp
View File

@ -31,7 +31,8 @@ RemoteSourceWorker::RemoteSourceWorker(RemoteDataQueue *dataQueue, QObject* pare
m_running(false), m_running(false),
m_dataQueue(dataQueue), m_dataQueue(dataQueue),
m_address(QHostAddress::LocalHost), m_address(QHostAddress::LocalHost),
m_socket(nullptr) m_socket(nullptr),
m_sampleRate(0)
{ {
std::fill(m_dataBlocks, m_dataBlocks+4, (RemoteDataBlock *) 0); std::fill(m_dataBlocks, m_dataBlocks+4, (RemoteDataBlock *) 0);
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
@ -52,6 +53,7 @@ void RemoteSourceWorker::startWork()
{ {
qDebug("RemoteSourceWorker::startWork"); qDebug("RemoteSourceWorker::startWork");
m_socket = new QUdpSocket(this); m_socket = new QUdpSocket(this);
m_socket->setSocketOption(QAbstractSocket::ReceiveBufferSizeSocketOption, getDataSocketBufferSize(m_sampleRate));
m_running = false; m_running = false;
} }
@ -99,6 +101,20 @@ void RemoteSourceWorker::readPendingDatagrams()
if (size == sizeof(RemoteSuperBlock)) if (size == sizeof(RemoteSuperBlock))
{ {
unsigned int dataBlockIndex = superBlock.m_header.m_frameIndex % m_nbDataBlocks; unsigned int dataBlockIndex = superBlock.m_header.m_frameIndex % m_nbDataBlocks;
int blockIndex = superBlock.m_header.m_blockIndex;
if (blockIndex == 0) // first block with meta data
{
const RemoteMetaDataFEC *metaData = (const RemoteMetaDataFEC *) &superBlock.m_protectedBlock;
uint32_t sampleRate = metaData->m_sampleRate;
if (m_sampleRate != sampleRate)
{
qDebug("RemoteSourceWorker::readPendingDatagrams: sampleRate: %u", sampleRate);
m_socket->setSocketOption(QAbstractSocket::ReceiveBufferSizeSocketOption, getDataSocketBufferSize(sampleRate));
m_sampleRate = sampleRate;
}
}
// create the first block for this index // create the first block for this index
if (m_dataBlocks[dataBlockIndex] == 0) { if (m_dataBlocks[dataBlockIndex] == 0) {
@ -145,3 +161,12 @@ void RemoteSourceWorker::readPendingDatagrams()
} }
} }
int RemoteSourceWorker::getDataSocketBufferSize(uint32_t inSampleRate)
{
// set a floor value at 24 kS/s
uint32_t samplerate = inSampleRate < 24000 ? 24000 : inSampleRate;
// 250 ms (1/4s) at current sample rate
int bufferSize = (samplerate * 2 * (SDR_RX_SAMP_SZ == 16 ? 2 : 4)) / 4;
qDebug("RemoteSourceWorker::getDataSocketBufferSize: %d bytes", bufferSize);
return bufferSize;
}

5
plugins/channeltx/remotesource/remotesourceworker.h
View File

@ -70,8 +70,11 @@ private:
QHostAddress m_address; QHostAddress m_address;
QUdpSocket *m_socket; QUdpSocket *m_socket;
static const uint32_t m_nbDataBlocks = 4; //!< number of data blocks in the ring buffer static const uint32_t m_nbDataBlocks = 4; //!< number of data blocks in the ring buffer
RemoteDataBlock *m_dataBlocks[m_nbDataBlocks]; //!< ring buffer of data blocks indexed by frame affinity RemoteDataBlock *m_dataBlocks[m_nbDataBlocks]; //!< ring buffer of data blocks indexed by frame affinity
uint32_t m_sampleRate; //!< current sample rate from meta data
static int getDataSocketBufferSize(uint32_t inSampleRate);
private slots: private slots:
void handleInputMessages(); void handleInputMessages();