From e3575d5f5fe99a789f4f01e9f2f1c0d44443b279 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 14 Jan 2018 04:43:24 +0100
Subject: [PATCH] TestSource: fixes

---
 .../testsource/testsourcethread.cpp           | 53 +++++++++----------
 .../testsource/testsourcethread.h             | 18 ++++---
 2 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/plugins/samplesource/testsource/testsourcethread.cpp b/plugins/samplesource/testsource/testsourcethread.cpp
index 4e1b138a1..03433e00f 100644
--- a/plugins/samplesource/testsource/testsourcethread.cpp
+++ b/plugins/samplesource/testsource/testsourcethread.cpp
@@ -30,6 +30,7 @@ TestSourceThread::TestSourceThread(SampleSinkFifo* sampleFifo, QObject* parent)
     m_chunksize(0),
 	m_convertBuffer(TESTSOURCE_BLOCKSIZE),
 	m_sampleFifo(sampleFifo),
+	m_frequencyShift(0),
 	m_samplerate(48000),
 	m_log2Decim(4),
 	m_fcPos(0),
@@ -39,10 +40,9 @@ TestSourceThread::TestSourceThread(SampleSinkFifo* sampleFifo, QObject* parent)
 	m_frequency(435*1000),
 	m_fcPosShift(0),
     m_throttlems(TESTSOURCE_THROTTLE_MS),
-    m_throttleToggle(false)
+    m_throttleToggle(false),
+    m_mutex(QMutex::Recursive)
 {
-    m_chunksize = (m_samplerate * 4 * m_throttlems) / 1000;
-    setBuffers(m_chunksize);
 }
 
 TestSourceThread::~TestSourceThread()
@@ -52,7 +52,6 @@ TestSourceThread::~TestSourceThread()
 
 void TestSourceThread::startWork()
 {
-    qDebug("TestSourceThread::startWork");
 	m_startWaitMutex.lock();
 	m_elapsedTimer.start();
 	start();
@@ -63,16 +62,18 @@ void TestSourceThread::startWork()
 
 void TestSourceThread::stopWork()
 {
-    qDebug("TestSourceThread::stopWork");
 	m_running = false;
 	wait();
 }
 
 void TestSourceThread::setSamplerate(int samplerate)
 {
+    QMutexLocker mutexLocker(&m_mutex);
+
 	m_samplerate = samplerate;
-	m_chunksize = (m_samplerate * 4 * m_throttlems) / 1000;
-	setBuffers(m_chunksize);
+    m_chunksize = 4 * ((m_samplerate * (m_throttlems+(m_throttleToggle ? 1 : 0))) / 1000);
+    m_throttleToggle = !m_throttleToggle;
+	m_nco.setFreq(m_frequencyShift, m_samplerate);
 }
 
 void TestSourceThread::setLog2Decimation(unsigned int log2_decim)
@@ -120,15 +121,11 @@ void TestSourceThread::run()
     m_running = true;
     m_startWaiter.wakeAll();
 
-    qDebug("TestSourceThread::run: starting");
-
     while (m_running) // actual work is in the tick() function
     {
         sleep(1);
     }
 
-    qDebug("TestSourceThread::run: ending");
-
     m_running = false;
 }
 
@@ -140,43 +137,41 @@ void TestSourceThread::setBuffers(quint32 chunksize)
 
         if (m_buf == 0)
         {
-            qDebug() << "TestSourceThread::setBuffer: Allocate buffer";
-            m_buf = (quint8*) malloc(m_bufsize);
+            qDebug() << "TestSourceThread::setBuffer: Allocate buffer:    "
+                    << " size: " << m_bufsize << " bytes"
+                    << " #samples: " << (m_bufsize/4);
+            m_buf = (qint16*) malloc(m_bufsize);
         }
         else
         {
-            qDebug() << "TestSourceThread::setBuffer: Re-allocate buffer";
-            quint8 *buf = m_buf;
-            m_buf = (quint8*) realloc((void*) m_buf, m_bufsize);
-            if (!m_buf) free(buf);
+            qDebug() << "TestSourceThread::setBuffer: Re-allocate buffer: "
+                    << " size: " << m_bufsize << " bytes"
+                    << " #samples: " << (m_bufsize/4);
+            free(m_buf);
+            m_buf = (qint16*) malloc(m_bufsize);
         }
 
         m_convertBuffer.resize(chunksize/4);
-
-        qDebug() << "TestSourceThread::setBuffer: size: " << m_bufsize
-                << " #samples: " << (m_bufsize/4);
     }
 }
 
 void TestSourceThread::generate(quint32 chunksize)
 {
-    quint32 n = chunksize / 2;
-    qint16 *buf = (qint16*) m_buf;
+    int n = chunksize / 2;
+    setBuffers(chunksize);
 
-    for (unsigned int i = 0; i < n;)
+    for (int i = 0; i < n-1;)
     {
         Complex c = m_nco.nextIQ();
-        buf[i] = c.real() * (1<<m_bitShift);
-        i++;
-        buf[i] = c.imag() * (1<<m_bitShift);
-        i++;
+        m_buf[i++] = (int16_t) (c.real() * (float) m_amplitudeBits);
+        m_buf[i++] = (int16_t) (c.imag() * (float) m_amplitudeBits);
     }
 
     callback(m_buf, n);
 }
 
 //  call appropriate conversion (decimation) routine depending on the number of sample bits
-void TestSourceThread::callback(const quint8* buf, qint32 len)
+void TestSourceThread::callback(const qint16* buf, qint32 len)
 {
 	SampleVector::iterator it = m_convertBuffer.begin();
 
@@ -211,10 +206,10 @@ void TestSourceThread::tick()
 
         if (throttlems != m_throttlems)
         {
+            QMutexLocker mutexLocker(&m_mutex);
             m_throttlems = throttlems;
             m_chunksize = 4 * ((m_samplerate * (m_throttlems+(m_throttleToggle ? 1 : 0))) / 1000);
             m_throttleToggle = !m_throttleToggle;
-            setBuffers(m_chunksize);
         }
 
         generate(m_chunksize);
diff --git a/plugins/samplesource/testsource/testsourcethread.h b/plugins/samplesource/testsource/testsourcethread.h
index 13bc17333..56c039ae4 100644
--- a/plugins/samplesource/testsource/testsourcethread.h
+++ b/plugins/samplesource/testsource/testsourcethread.h
@@ -53,12 +53,13 @@ private:
 	QWaitCondition m_startWaiter;
 	bool m_running;
 
-	quint8  *m_buf;
+	qint16  *m_buf;
     quint32 m_bufsize;
     quint32 m_chunksize;
 	SampleVector m_convertBuffer;
 	SampleSinkFifo* m_sampleFifo;
 	NCOF m_nco;
+	int m_frequencyShift;
 
 	int m_samplerate;
     unsigned int m_log2Decim;
@@ -73,18 +74,19 @@ private:
     int m_throttlems;
     QElapsedTimer m_elapsedTimer;
     bool m_throttleToggle;
+    QMutex m_mutex;
 
-	Decimators<quint8, SDR_SAMP_SZ, 8> m_decimators_8;
-    Decimators<quint8, SDR_SAMP_SZ, 12> m_decimators_12;
-    Decimators<quint8, SDR_SAMP_SZ, 16> m_decimators_16;
+	Decimators<qint16, SDR_SAMP_SZ, 8> m_decimators_8;
+    Decimators<qint16, SDR_SAMP_SZ, 12> m_decimators_12;
+    Decimators<qint16, SDR_SAMP_SZ, 16> m_decimators_16;
 
 	void run();
-	void callback(const quint8* buf, qint32 len);
+	void callback(const qint16* buf, qint32 len);
 	void setBuffers(quint32 chunksize);
     void generate(quint32 chunksize);
 
 	//  Decimate according to specified log2 (ex: log2=4 => decim=16)
-	inline void convert_8(SampleVector::iterator* it, const quint8* buf, qint32 len)
+	inline void convert_8(SampleVector::iterator* it, const qint16* buf, qint32 len)
 	{
 	    if (m_log2Decim == 0) {
 	        m_decimators_8.decimate1(it, buf, len);
@@ -162,7 +164,7 @@ private:
 	    }
 	}
 
-	void convert_12(SampleVector::iterator* it, const quint8* buf, qint32 len)
+	void convert_12(SampleVector::iterator* it, const qint16* buf, qint32 len)
     {
         if (m_log2Decim == 0) {
             m_decimators_12.decimate1(it, buf, len);
@@ -240,7 +242,7 @@ private:
         }
     }
 
-	void convert_16(SampleVector::iterator* it, const quint8* buf, qint32 len)
+	void convert_16(SampleVector::iterator* it, const qint16* buf, qint32 len)
     {
         if (m_log2Decim == 0) {
             m_decimators_16.decimate1(it, buf, len);