From 4949e1fd045d70fc703e1f72946cdfe8e993a3c1 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 27 Oct 2019 08:02:08 +0100
Subject: [PATCH] Tx plugins: corrected FIFO begin iterator vs number of
 samples read

---
 .../samplesink/bladerf1output/bladerf1outputthread.cpp    | 2 +-
 .../samplesink/bladerf2output/bladerf2outputthread.cpp    | 2 +-
 plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp    | 2 +-
 plugins/samplesink/limesdroutput/limesdroutputthread.cpp  | 2 +-
 .../samplesink/plutosdroutput/plutosdroutputthread.cpp    | 2 +-
 .../samplesink/soapysdroutput/soapysdroutputthread.cpp    | 8 ++++----
 plugins/samplesink/xtrxoutput/xtrxoutputthread.cpp        | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/samplesink/bladerf1output/bladerf1outputthread.cpp b/plugins/samplesink/bladerf1output/bladerf1outputthread.cpp
index 3fae24c90..d104f8932 100644
--- a/plugins/samplesink/bladerf1output/bladerf1outputthread.cpp
+++ b/plugins/samplesink/bladerf1output/bladerf1outputthread.cpp
@@ -84,7 +84,7 @@ void Bladerf1OutputThread::callback(qint16* buf, qint32 len)
 {
     SampleVector::iterator beginRead;
     m_sampleFifo->readAdvance(beginRead, len/(1<<m_log2Interp));
-    beginRead -= len;
+    beginRead -= len/(1<<m_log2Interp);
 
     if (m_log2Interp == 0)
 	{
diff --git a/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp b/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp
index 9578ef974..a60359e3f 100644
--- a/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp
@@ -203,7 +203,7 @@ void BladeRF2OutputThread::callbackSO(qint16* buf, qint32 len, unsigned int chan
 
         SampleVector::iterator beginRead;
         m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[channel].m_log2Interp);
 
         if (m_channels[channel].m_log2Interp == 0)
         {
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
index 6bb15284e..348b5e136 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
@@ -120,7 +120,7 @@ void HackRFOutputThread::callback(qint8* buf, qint32 len)
 {
     SampleVector::iterator beginRead;
     m_sampleFifo->readAdvance(beginRead, len/(2*(1<<m_log2Interp)));
-    beginRead -= len/2;
+    beginRead -= len/(2*(1<<m_log2Interp));
 
 	if (m_log2Interp == 0)
 	{
diff --git a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp
index 17729e102..25a113260 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp
@@ -110,7 +110,7 @@ void LimeSDROutputThread::callback(qint16* buf, qint32 len)
 {
     SampleVector::iterator beginRead;
     m_sampleFifo->readAdvance(beginRead, len/(1<<m_log2Interp));
-    beginRead -= len;
+    beginRead -= len/(1<<m_log2Interp);
 
     if (m_log2Interp == 0)
     {
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp
index 60bd2db48..34a2c3c3c 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp
@@ -117,7 +117,7 @@ void PlutoSDROutputThread::convert(qint16* buf, qint32 len)
     // pull samples from baseband generator
     SampleVector::iterator beginRead;
     m_sampleFifo->readAdvance(beginRead, len/(2*(1<<m_log2Interp)));
-    beginRead -= len/2;
+    beginRead -= len/(2*(1<<m_log2Interp));
 
     if (m_log2Interp == 0)
     {
diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputthread.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputthread.cpp
index ce54d6846..a54d8354f 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutputthread.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutputthread.cpp
@@ -293,7 +293,7 @@ void SoapySDROutputThread::callbackSO8(qint8* buf, qint32 len, unsigned int chan
 
         SampleVector::iterator beginRead;
         m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[channel].m_log2Interp);
 
         if (m_channels[channel].m_log2Interp == 0)
         {
@@ -346,7 +346,7 @@ void SoapySDROutputThread::callbackSO12(qint16* buf, qint32 len, unsigned int ch
 
         SampleVector::iterator beginRead;
         m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[channel].m_log2Interp);
 
         if (m_channels[channel].m_log2Interp == 0)
         {
@@ -399,7 +399,7 @@ void SoapySDROutputThread::callbackSO16(qint16* buf, qint32 len, unsigned int ch
 
         SampleVector::iterator beginRead;
         m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[channel].m_log2Interp);
 
         if (m_channels[channel].m_log2Interp == 0)
         {
@@ -453,7 +453,7 @@ void SoapySDROutputThread::callbackSOIF(float* buf, qint32 len, unsigned int cha
 
         SampleVector::iterator beginRead;
         m_channels[channel].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[channel].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[channel].m_log2Interp);
 
         if (m_channels[channel].m_log2Interp == 0)
         {
diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputthread.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputthread.cpp
index f72e9ddd8..f13911b28 100644
--- a/plugins/samplesink/xtrxoutput/xtrxoutputthread.cpp
+++ b/plugins/samplesink/xtrxoutput/xtrxoutputthread.cpp
@@ -236,7 +236,7 @@ void XTRXOutputThread::callback(qint16* buf, qint32 len)
 
         SampleVector::iterator beginRead;
         m_channels[m_uniqueChannelIndex].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[m_uniqueChannelIndex].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[m_uniqueChannelIndex].m_log2Interp);
 
         if (m_channels[m_uniqueChannelIndex].m_log2Interp == 0)
         {
@@ -289,7 +289,7 @@ void XTRXOutputThread::callbackSO(qint16* buf, qint32 len)
 
         SampleVector::iterator beginRead;
         m_channels[m_uniqueChannelIndex].m_sampleFifo->readAdvance(beginRead, len/(1<<m_channels[m_uniqueChannelIndex].m_log2Interp));
-        beginRead -= len;
+        beginRead -= len/(1<<m_channels[m_uniqueChannelIndex].m_log2Interp);
 
         if (m_channels[m_uniqueChannelIndex].m_log2Interp == 0)
         {