From 3c20b026023ecd25a7b5bb5a31c3a27b9bc87dc2 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 8 Sep 2017 08:45:24 +0200
Subject: [PATCH] PlutoSDR input: simplify convert method parameters

---
 .../plutosdrinput/plutosdrinputthread.cpp     | 42 +++++++++----------
 .../plutosdrinput/plutosdrinputthread.h       |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp
index 274e14198..2747eadcc 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp
@@ -95,7 +95,7 @@ void PlutoSDRInputThread::run()
 
             if (is == ((1<<m_log2Decim) - 1))
             {
-                convert(m_buf, 2*(1<<m_log2Decim)); // I+Q -> 2
+                convert(); // I+Q -> 2
                 is = 0;
             }
             else
@@ -109,11 +109,11 @@ void PlutoSDRInputThread::run()
 }
 
 //  Decimate according to specified log2 (ex: log2=4 => decim=16)
-void PlutoSDRInputThread::convert(const qint16* buf, qint32 len)
+void PlutoSDRInputThread::convert()
 {
     if (m_log2Decim == 0)
     {
-        m_decimators.decimate1(&m_convertIt, buf, len);
+        m_decimators.decimate1(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
     }
     else
     {
@@ -122,22 +122,22 @@ void PlutoSDRInputThread::convert(const qint16* buf, qint32 len)
             switch (m_log2Decim)
             {
             case 1:
-                m_decimators.decimate2_inf(&m_convertIt, buf, len);
+                m_decimators.decimate2_inf(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 2:
-                m_decimators.decimate4_inf(&m_convertIt, buf, len);
+                m_decimators.decimate4_inf(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 3:
-                m_decimators.decimate8_inf(&m_convertIt, buf, len);
+                m_decimators.decimate8_inf(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 4:
-                m_decimators.decimate16_inf(&m_convertIt, buf, len);
+                m_decimators.decimate16_inf(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 5:
-                m_decimators.decimate32_inf(&m_convertIt, buf, len);
+                m_decimators.decimate32_inf(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 6:
-                m_decimators.decimate64_inf(&m_convertIt, buf, len);
+                m_decimators.decimate64_inf(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             default:
                 break;
@@ -148,22 +148,22 @@ void PlutoSDRInputThread::convert(const qint16* buf, qint32 len)
             switch (m_log2Decim)
             {
             case 1:
-                m_decimators.decimate2_sup(&m_convertIt, buf, len);
+                m_decimators.decimate2_sup(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 2:
-                m_decimators.decimate4_sup(&m_convertIt, buf, len);
+                m_decimators.decimate4_sup(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 3:
-                m_decimators.decimate8_sup(&m_convertIt, buf, len);
+                m_decimators.decimate8_sup(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 4:
-                m_decimators.decimate16_sup(&m_convertIt, buf, len);
+                m_decimators.decimate16_sup(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 5:
-                m_decimators.decimate32_sup(&m_convertIt, buf, len);
+                m_decimators.decimate32_sup(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 6:
-                m_decimators.decimate64_sup(&m_convertIt, buf, len);
+                m_decimators.decimate64_sup(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             default:
                 break;
@@ -174,22 +174,22 @@ void PlutoSDRInputThread::convert(const qint16* buf, qint32 len)
             switch (m_log2Decim)
             {
             case 1:
-                m_decimators.decimate2_cen(&m_convertIt, buf, len);
+                m_decimators.decimate2_cen(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 2:
-                m_decimators.decimate4_cen(&m_convertIt, buf, len);
+                m_decimators.decimate4_cen(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 3:
-                m_decimators.decimate8_cen(&m_convertIt, buf, len);
+                m_decimators.decimate8_cen(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 4:
-                m_decimators.decimate16_cen(&m_convertIt, buf, len);
+                m_decimators.decimate16_cen(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 5:
-                m_decimators.decimate32_cen(&m_convertIt, buf, len);
+                m_decimators.decimate32_cen(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             case 6:
-                m_decimators.decimate64_cen(&m_convertIt, buf, len);
+                m_decimators.decimate64_cen(&m_convertIt, m_buf, 2*(1<<m_log2Decim));
                 break;
             default:
                 break;
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputthread.h b/plugins/samplesource/plutosdrinput/plutosdrinputthread.h
index 0f3fc5662..3233f683b 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputthread.h
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputthread.h
@@ -60,7 +60,7 @@ private:
     Decimators<qint16, SDR_SAMP_SZ, 12> m_decimators;
 
     void run();
-    void convert(const qint16* buf, qint32 len);
+    void convert();
 
 };