From aca92c7d326d91e464ab28af92d536ba95ef18d7 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 24 Sep 2019 02:10:58 +0200
Subject: [PATCH] Device MIMO engine fixes

---
 sdrbase/dsp/dspdevicemimoengine.cpp | 10 ++++++++--
 sdrbase/dsp/dspdevicemimoengine.h   |  3 +++
 sdrbase/dsp/samplesinkvector.cpp    | 19 +++++++++++++++++--
 sdrbase/dsp/samplesinkvector.h      |  3 ++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/sdrbase/dsp/dspdevicemimoengine.cpp b/sdrbase/dsp/dspdevicemimoengine.cpp
index 95cf3d6bb..e7e912387 100644
--- a/sdrbase/dsp/dspdevicemimoengine.cpp
+++ b/sdrbase/dsp/dspdevicemimoengine.cpp
@@ -301,13 +301,19 @@ void DSPDeviceMIMOEngine::workSampleSinkFifo(unsigned int sinkIndex)
         std::size_t count = sampleFifo->readBegin(sampleFifo->fill(), &part1begin, &part1end, &part2begin, &part2end);
 
         if (part1begin != part1end) { // first part of FIFO data
-            workSamplePart(part1begin, part1end, sinkIndex);
+            m_vectorBuffer.write(part1begin, part1end, false);
+            //workSamplePart(part1begin, part1end, sinkIndex);
         }
 
         if (part2begin != part2end) { // second part of FIFO data (used when block wraps around)
-            workSamplePart(part2begin, part2end, sinkIndex);
+            m_vectorBuffer.append(part2begin, part2end);
+            //workSamplePart(part2begin, part2end, sinkIndex);
         }
 
+        SampleVector::iterator vbegin, vend;
+        m_vectorBuffer.read(vbegin, vend);
+        workSamplePart(vbegin, vend, sinkIndex);
+
         sampleFifo->readCommit((unsigned int) count); // adjust FIFO pointers
         samplesDone += count;
     }
diff --git a/sdrbase/dsp/dspdevicemimoengine.h b/sdrbase/dsp/dspdevicemimoengine.h
index ec3c39993..e2173e60e 100644
--- a/sdrbase/dsp/dspdevicemimoengine.h
+++ b/sdrbase/dsp/dspdevicemimoengine.h
@@ -22,6 +22,7 @@
 #include <QThread>
 
 #include "dsp/dsptypes.h"
+#include "dsp/samplesinkvector.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
 #include "util/syncmessenger.h"
@@ -377,11 +378,13 @@ private:
     BasebandSampleSink *m_spectrumSink; //!< The spectrum sink
     bool m_spectrumInputSourceElseSink; //!< Source else sink stream to be used as spectrum sink input
     unsigned int m_spectrumInputIndex;  //!< Index of the stream to be used as spectrum sink input
+    SampleSinkVector m_vectorBuffer;
 
   	void run();
     void workSampleSinkFifo(unsigned int sinkIndex); //!< transfer samples of one sink (asynchronously)
     void workSampleSinkVector(unsigned int sinkIndex); //!< same but sample sink vector flavor (TODO: remove if unused)
     void workSamplePart(const SampleVector::iterator& vbegin, const SampleVector::iterator& vend, unsigned int sinkIndex);
+    void workSamplePart(int count);
 
 	State gotoIdle();     //!< Go to the idle state
 	State gotoInit();     //!< Go to the acquisition init state from idle
diff --git a/sdrbase/dsp/samplesinkvector.cpp b/sdrbase/dsp/samplesinkvector.cpp
index 40c3d8dfc..44dfdb1fa 100644
--- a/sdrbase/dsp/samplesinkvector.cpp
+++ b/sdrbase/dsp/samplesinkvector.cpp
@@ -30,7 +30,7 @@ SampleSinkVector::SampleSinkVector(const SampleSinkVector& other) :
 SampleSinkVector::~SampleSinkVector()
 {}
 
-void SampleSinkVector::write(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
+void SampleSinkVector::write(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool signal)
 {
     if (end - begin > m_sampleVector.size()) {
         m_sampleVector.resize(end - begin);
@@ -40,7 +40,22 @@ void SampleSinkVector::write(const SampleVector::const_iterator& begin, const Sa
     m_dataSize = end - begin;
     // m_begin = begin;
     // m_end = end;
-    emit dataReady();
+    if (signal) {
+        emit dataReady();
+    }
+}
+
+void SampleSinkVector::append(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool signal)
+{
+    if ((end - begin) + m_dataSize > m_sampleVector.size()) {
+        m_sampleVector.resize((end - begin) + m_dataSize);
+    }
+
+    std::copy(begin, end, m_sampleVector.begin() + m_dataSize);
+    m_dataSize += (end - begin);
+    if (signal) {
+        emit dataReady();
+    }
 }
 
 void SampleSinkVector::read(SampleVector::iterator& begin, SampleVector::iterator& end)
diff --git a/sdrbase/dsp/samplesinkvector.h b/sdrbase/dsp/samplesinkvector.h
index 887a0b352..33a822a02 100644
--- a/sdrbase/dsp/samplesinkvector.h
+++ b/sdrbase/dsp/samplesinkvector.h
@@ -31,7 +31,8 @@ public:
     SampleSinkVector(const SampleSinkVector& other);
     ~SampleSinkVector();
 
-    void write(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
+    void write(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool signal = true);
+    void append(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool signal = false);
     void read(SampleVector::iterator& begin, SampleVector::iterator& end);
 
 signals: