SampleSourceFifo refactoring and Tx code reorganization

plugins/samplesink/hackrfoutput/hackrfoutput.cpp

@@ -40,8 +40,8 @@ MESSAGE_CLASS_DEFINITION(HackRFOutput::MsgReportHackRF, Message)
 HackRFOutput::HackRFOutput(DeviceAPI *deviceAPI) :
     m_deviceAPI(deviceAPI),
 	m_settings(),
-	m_dev(0),
-	m_hackRFThread(0),
+	m_dev(nullptr),
+	m_hackRFThread(nullptr),
 	m_deviceDescription("HackRFOutput"),
 	m_running(false)
 {
@@ -77,7 +77,7 @@ bool HackRFOutput::openDevice()
         closeDevice();
     }
 
-    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));
 
     if (m_deviceAPI->getSourceBuddies().size() > 0)
     {
@@ -373,10 +373,10 @@ bool HackRFOutput::applySettings(const HackRFOutputSettings& settings, bool forc
     if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || (m_settings.m_log2Interp != settings.m_log2Interp) || force)
     {
         forwardChange = true;
-        int fifoSize = std::max(
-                (int) ((settings.m_devSampleRate/(1<<settings.m_log2Interp)) * DeviceHackRFShared::m_sampleFifoLengthInSeconds),
-                DeviceHackRFShared::m_sampleFifoMinSize);
-        m_sampleSourceFifo.resize(fifoSize);
+        unsigned int fifoRate = std::max(
+            (unsigned int) settings.m_devSampleRate / (1<<settings.m_log2Interp),
+            DeviceHackRFShared::m_sampleFifoMinRate);
+        m_sampleSourceFifo.resize(SampleSourceFifo::getSizePolicy(fifoRate));
     }
 
 	if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || force)
@@ -621,10 +621,10 @@ void HackRFOutput::webapiUpdateDeviceSettings(
         settings.m_lnaExt = response.getHackRfOutputSettings()->getLnaExt() != 0;
     }
     if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
-        settings.m_transverterDeltaFrequency = response.getHackRfInputSettings()->getTransverterDeltaFrequency();
+        settings.m_transverterDeltaFrequency = response.getHackRfOutputSettings()->getTransverterDeltaFrequency();
     }
     if (deviceSettingsKeys.contains("transverterMode")) {
-        settings.m_transverterMode = response.getHackRfInputSettings()->getTransverterMode() != 0;
+        settings.m_transverterMode = response.getHackRfOutputSettings()->getTransverterMode() != 0;
     }
     if (deviceSettingsKeys.contains("useReverseAPI")) {
         settings.m_useReverseAPI = response.getHackRfOutputSettings()->getUseReverseApi() != 0;
@@ -746,13 +746,14 @@ void HackRFOutput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys,
     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;
 }
@@ -771,17 +772,19 @@ void HackRFOutput::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;
 }
 
@@ -795,10 +798,13 @@ void HackRFOutput::networkManagerFinished(QNetworkReply *reply)
                 << " error(" << (int) replyError
                 << "): " << replyError
                 << ": " << reply->errorString();
-        return;
+    }
+    else
+    {
+        QString answer = reply->readAll();
+        answer.chop(1); // remove last \n
+        qDebug("HackRFOutput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
     }
 
-    QString answer = reply->readAll();
-    answer.chop(1); // remove last \n
-    qDebug("HackRFOutput::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
+    reply->deleteLater();
 }

plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp

@@ -31,7 +31,7 @@
 
 const PluginDescriptor HackRFOutputPlugin::m_pluginDescriptor = {
 	QString("HackRF Output"),
-	QString("4.11.10"),
+	QString("4.12.0"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,

plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp

@@ -20,9 +20,9 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "dsp/samplesourcefifodb.h"
+#include "dsp/samplesourcefifo.h"
 
-HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifoDB* sampleFifo, QObject* parent) :
+HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sampleFifo, QObject* parent) :
 	QThread(parent),
 	m_running(false),
 	m_dev(dev),
@@ -118,9 +118,25 @@ void HackRFOutputThread::run()
 //  Interpolate according to specified log2 (ex: log2=4 => interp=16)
 void HackRFOutputThread::callback(qint8* buf, qint32 len)
 {
-    SampleVector::iterator beginRead;
-    m_sampleFifo->readAdvance(beginRead, len/(2*(1<<m_log2Interp)));
-    beginRead -= len/(2*(1<<m_log2Interp));
+    SampleVector& data = m_sampleFifo->getData();
+    unsigned int iPart1Begin, iPart1End, iPart2Begin, iPart2End;
+    m_sampleFifo->read(len/(2*(1<<m_log2Interp)), iPart1Begin, iPart1End, iPart2Begin, iPart2End);
+
+    if (iPart1Begin != iPart1End) {
+        callbackPart(buf, data, iPart1Begin, iPart1End);
+    }
+
+    unsigned int shift = (iPart1End - iPart1Begin)*(1<<m_log2Interp);
+
+    if (iPart2Begin != iPart2End) {
+        callbackPart(buf + 2*shift, data, iPart2Begin, iPart2End);
+    }
+}
+
+void HackRFOutputThread::callbackPart(qint8* buf, SampleVector& data, unsigned int iBegin, unsigned int iEnd)
+{
+    SampleVector::iterator beginRead = data.begin() + iBegin;
+    int len = 2*(iEnd - iBegin)*(1<<m_log2Interp);
 
 	if (m_log2Interp == 0)
 	{

plugins/samplesink/hackrfoutput/hackrfoutputthread.h

@@ -28,11 +28,13 @@
 
 #define HACKRF_BLOCKSIZE (1<<17)
 
+class SampleSourceFifo;
+
 class HackRFOutputThread : public QThread {
 	Q_OBJECT
 
 public:
-	HackRFOutputThread(hackrf_device* dev, SampleSourceFifoDB* sampleFifo, QObject* parent = NULL);
+	HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sampleFifo, QObject* parent = nullptr);
 	~HackRFOutputThread();
 
 	void startWork();
@@ -47,7 +49,7 @@ private:
 
 	hackrf_device* m_dev;
 	qint8 m_buf[2*HACKRF_BLOCKSIZE];
-	SampleSourceFifoDB* m_sampleFifo;
+	SampleSourceFifo* m_sampleFifo;
 
 	unsigned int m_log2Interp;
     int m_fcPos;
@@ -56,6 +58,7 @@ private:
 
 	void run();
 	void callback(qint8* buf, qint32 len);
+    void callbackPart(qint8* buf, SampleVector& data, unsigned int iBegin, unsigned int iEnd);
 	static int tx_callback(hackrf_transfer* transfer);
 };