From 8e52a32112c86e1116da69cba6f2d5d6750e9613 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 1 Nov 2019 10:26:40 +0100
Subject: [PATCH] UpSampleChannelizer: corrected and enhanced debug messages

---
 sdrbase/dsp/upsamplechannelizer.cpp | 34 ++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/sdrbase/dsp/upsamplechannelizer.cpp b/sdrbase/dsp/upsamplechannelizer.cpp
index 0c2dbb25d..065fa8d25 100644
--- a/sdrbase/dsp/upsamplechannelizer.cpp
+++ b/sdrbase/dsp/upsamplechannelizer.cpp
@@ -115,11 +115,11 @@ void UpSampleChannelizer::applyConfiguration()
 
     if (m_outputSampleRate == 0)
     {
-        qDebug() << "UpChannelizer::applyConfiguration: aborting (out=0):"
-                << " out =" << m_outputSampleRate
-                << ", req =" << m_requestedInputSampleRate
-                << ", in =" << m_currentInputSampleRate
-                << ", fc =" << m_currentCenterFrequency;
+        qDebug() << "UpSampleChannelizer::applyConfiguration: aborting (out=0):"
+                << " out:" << m_outputSampleRate
+                << " req:" << m_requestedInputSampleRate
+                << " in:" << m_currentInputSampleRate
+                << " fc:" << m_currentCenterFrequency;
         return;
     }
 
@@ -131,11 +131,11 @@ void UpSampleChannelizer::applyConfiguration()
 
     m_currentInputSampleRate = m_outputSampleRate / (1 << m_filterStages.size());
 
-    qDebug() << "UpChannelizer::applyConfiguration:"
-            << " out=" << m_outputSampleRate
-            << ", req=" << m_requestedInputSampleRate
-            << ", in=" << m_currentInputSampleRate
-            << ", fc=" << m_currentCenterFrequency;
+    qDebug() << "UpSampleChannelizer::applyConfiguration: done: "
+            << " out:" << m_outputSampleRate
+            << " req:" << m_requestedInputSampleRate
+            << " in:" << m_currentInputSampleRate
+            << " fc:" << m_currentCenterFrequency;
 }
 
 void UpSampleChannelizer::applyConfiguration(int requestedSampleRate, qint64 requestedCenterFrequency)
@@ -163,9 +163,10 @@ void UpSampleChannelizer::setInterpolation(unsigned int log2Interp, unsigned int
     m_currentInputSampleRate = m_outputSampleRate / (1 << m_filterStages.size());
     m_requestedInputSampleRate = m_currentInputSampleRate;
 
-	qDebug() << "UpChannelizer::applySetting in=" << m_outputSampleRate
-			<< ", out=" << m_currentInputSampleRate
-			<< ", fc=" << m_currentCenterFrequency;
+	qDebug() << "UpSampleChannelizer::setInterpolation: done:"
+            << " in:" << m_outputSampleRate
+			<< " out:" << m_currentInputSampleRate
+			<< " fc:" << m_currentCenterFrequency;
 }
 
 #ifdef USE_SSE4_1
@@ -297,22 +298,29 @@ double UpSampleChannelizer::setFilterChain(const std::vector<unsigned int>& stag
             m_filterStages.push_back(new FilterStage(FilterStage::ModeLowerHalf));
             m_stageSamples.push_back(s);
             ofs -= ofs_stage;
+            qDebug("UpSampleChannelizer::setFilterChain: lower half: ofs: %f", ofs);
         }
         else if (*rit == 1)
         {
             m_filterStages.push_back(new FilterStage(FilterStage::ModeCenter));
             m_stageSamples.push_back(s);
+            qDebug("UpSampleChannelizer::setFilterChain: center: ofs: %f", ofs);
         }
         else if (*rit == 2)
         {
             m_filterStages.push_back(new FilterStage(FilterStage::ModeUpperHalf));
             m_stageSamples.push_back(s);
             ofs += ofs_stage;
+            qDebug("UpSampleChannelizer::setFilterChain: upper half: ofs: %f", ofs);
         }
 
         ofs_stage /= 2;
     }
 
+    qDebug() << "UpSampleChannelizer::setFilterChain: complete:"
+            << " #stages: " << m_filterStages.size()
+            << " ofs: " << ofs;
+
     return ofs;
 }