VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 15:33:34 -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/soapysdroutput/soapysdroutput.cpp
+23 -27
View File
@@ -74,7 +74,7 @@ void SoapySDROutput::destroy()
bool SoapySDROutput::openDevice()
{
m_sampleSourceFifo.resize(m_settings.m_devSampleRate/(1<<(m_settings.m_log2Interp <= 4 ? m_settings.m_log2Interp : 4)));
m_sampleSourceFifo.resize(SampleSourceFifo::getSizePolicy(m_settings.m_devSampleRate));
// look for Tx buddies and get reference to the device object
if (m_deviceAPI->getSinkBuddies().size() > 0) // look sink sibling first
@@ -463,7 +463,7 @@ bool SoapySDROutput::start()
{
qDebug("SoapySDROutput::start: expand channels. Re-allocate thread and take ownership");
SampleSourceFifoDB **fifos = new SampleSourceFifoDB*[nbOriginalChannels];
SampleSourceFifo **fifos = new SampleSourceFifo*[nbOriginalChannels];
unsigned int *log2Interps = new unsigned int[nbOriginalChannels];
for (int i = 0; i < nbOriginalChannels; i++) // save original FIFO references and data
@@ -574,7 +574,7 @@ void SoapySDROutput::stop()
{
qDebug("SoapySDROutput::stop: MO mode. Reduce by deleting and re-creating the thread");
soapySDROutputThread->stopWork();
SampleSourceFifoDB **fifos = new SampleSourceFifoDB*[nbOriginalChannels-1];
SampleSourceFifo **fifos = new SampleSourceFifo*[nbOriginalChannels-1];
unsigned int *log2Interps = new unsigned int[nbOriginalChannels-1];
int highestActiveChannelIndex = -1;
@@ -871,7 +871,7 @@ bool SoapySDROutput::applySettings(const SoapySDROutputSettings& settings, bool
if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || (m_settings.m_log2Interp != settings.m_log2Interp) || force)
{
SoapySDROutputThread *soapySDROutputThread = findThread();
SampleSourceFifoDB *fifo = 0;
SampleSourceFifo *fifo = nullptr;
if (soapySDROutputThread)
{
@@ -879,20 +879,10 @@ bool SoapySDROutput::applySettings(const SoapySDROutputSettings& settings, bool
soapySDROutputThread->setFifo(requestedChannel, 0);
}
int fifoSize;
if (settings.m_log2Interp >= 5)
{
fifoSize = DeviceSoapySDRShared::m_sampleFifoMinSize32;
}
else
{
fifoSize = std::max(
(int) ((settings.m_devSampleRate/(1<<settings.m_log2Interp)) * DeviceSoapySDRShared::m_sampleFifoLengthInSeconds),
DeviceSoapySDRShared::m_sampleFifoMinSize);
}
m_sampleSourceFifo.resize(fifoSize);
unsigned int fifoRate = std::max(
(unsigned int) settings.m_devSampleRate / (1<<settings.m_log2Interp),
DeviceSoapySDRShared::m_sampleFifoMinRate);
m_sampleSourceFifo.resize(SampleSourceFifo::getSizePolicy(fifoRate));
if (fifo) {
soapySDROutputThread->setFifo(requestedChannel, &m_sampleSourceFifo);
@@ -1894,13 +1884,14 @@ void SoapySDROutput::webapiReverseSendSettings(QList<QString>& deviceSettingsKey
m_networkRequest.setUrl(QUrl(deviceSettingsURL));
m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QBuffer *buffer=new QBuffer();
QBuffer *buffer = new QBuffer();
buffer->open((QBuffer::ReadWrite));
buffer->write(swgDeviceSettings->asJson().toUtf8());
buffer->seek(0);
// Always use PATCH to avoid passing reverse API settings
m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
buffer->setParent(reply);
delete swgDeviceSettings;
}
@@ -1919,17 +1910,19 @@ void SoapySDROutput::webapiReverseSendStartStop(bool start)
m_networkRequest.setUrl(QUrl(deviceSettingsURL));
m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QBuffer *buffer=new QBuffer();
QBuffer *buffer = new QBuffer();
buffer->open((QBuffer::ReadWrite));
buffer->write(swgDeviceSettings->asJson().toUtf8());
buffer->seek(0);
QNetworkReply *reply;
if (start) {
m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer);
reply = m_networkManager->sendCustomRequest(m_networkRequest, "POST", buffer);
} else {
m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
reply = m_networkManager->sendCustomRequest(m_networkRequest, "DELETE", buffer);
}
buffer->setParent(reply);
delete swgDeviceSettings;
}
@@ -1943,10 +1936,13 @@ void SoapySDROutput::networkManagerFinished(QNetworkReply *reply)
<< " error(" << (int) replyError
<< "): " << replyError
<< ": " << reply->errorString();
return;
}
else
{
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("SoapySDROutput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("SoapySDROutput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
reply->deleteLater();
}