From 61a16eade96445db68cdd87a4395d30623e34a67 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 22 Jan 2018 10:46:57 +0100
Subject: [PATCH] Use always 16 bit DSP on Tx side

---
 sdrbase/dsp/interpolators.h   | 13 -------------
 sdrbase/dsp/upchannelizer.cpp | 21 ---------------------
 sdrbase/dsp/upchannelizer.h   |  9 ---------
 3 files changed, 43 deletions(-)

diff --git a/sdrbase/dsp/interpolators.h b/sdrbase/dsp/interpolators.h
index 42e7640f3..d64619f40 100644
--- a/sdrbase/dsp/interpolators.h
+++ b/sdrbase/dsp/interpolators.h
@@ -18,15 +18,11 @@
 #define INCLUDE_GPL_DSP_INTERPOLATORS_H_
 
 #include "dsp/dsptypes.h"
-#ifdef SDR_TX_SAMPLE_24BIT
-#include "dsp/inthalfbandfilterdb.h"
-#else
 #ifdef USE_SSE4_1
 #include "dsp/inthalfbandfiltereo1.h"
 #else
 #include "dsp/inthalfbandfilterdb.h"
 #endif
-#endif
 
 #define INTERPOLATORS_HB_FILTER_ORDER_FIRST  64
 #define INTERPOLATORS_HB_FILTER_ORDER_SECOND 32
@@ -118,14 +114,6 @@ public:
 	void interpolate64_cen(SampleVector::iterator* it, T* buf, qint32 len);
 
 private:
-#ifdef SDR_TX_SAMPLE_24BIT
-    IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_FIRST> m_interpolator2;  // 1st stages
-    IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_SECOND> m_interpolator4;  // 2nd stages
-    IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator8;  // 3rd stages
-    IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator16; // 4th stages
-    IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator32; // 5th stages
-    IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator64; // 6th stages
-#else
 #ifdef USE_SSE4_1
     IntHalfbandFilterEO1<INTERPOLATORS_HB_FILTER_ORDER_FIRST> m_interpolator2;  // 1st stages
     IntHalfbandFilterEO1<INTERPOLATORS_HB_FILTER_ORDER_SECOND> m_interpolator4;  // 2nd stages
@@ -141,7 +129,6 @@ private:
 	IntHalfbandFilterDB<qint32, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator32; // 5th stages
 	IntHalfbandFilterDB<qint32, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator64; // 6th stages
 #endif
-#endif
 };
 
 template<typename T, uint SdrBits, uint OutputBits>
diff --git a/sdrbase/dsp/upchannelizer.cpp b/sdrbase/dsp/upchannelizer.cpp
index fa1e26b52..a59db9ad2 100644
--- a/sdrbase/dsp/upchannelizer.cpp
+++ b/sdrbase/dsp/upchannelizer.cpp
@@ -207,26 +207,6 @@ void UpChannelizer::applyConfiguration()
     }
 }
 
-#ifdef SDR_TX_SAMPLE_24BIT
-UpChannelizer::FilterStage::FilterStage(Mode mode) :
-    m_filter(new IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>),
-    m_workFunction(0)
-{
-    switch(mode) {
-        case ModeCenter:
-            m_workFunction = &IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateCenter;
-            break;
-
-        case ModeLowerHalf:
-            m_workFunction = &IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateLowerHalf;
-            break;
-
-        case ModeUpperHalf:
-            m_workFunction = &IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>::workInterpolateUpperHalf;
-            break;
-    }
-}
-#else
 #ifdef USE_SSE4_1
 UpChannelizer::FilterStage::FilterStage(Mode mode) :
     m_filter(new IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>),
@@ -266,7 +246,6 @@ UpChannelizer::FilterStage::FilterStage(Mode mode) :
     }
 }
 #endif
-#endif
 
 UpChannelizer::FilterStage::~FilterStage()
 {
diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h
index dc6bb3015..3b15f7a96 100644
--- a/sdrbase/dsp/upchannelizer.h
+++ b/sdrbase/dsp/upchannelizer.h
@@ -23,15 +23,11 @@
 #include <QMutex>
 #include "util/export.h"
 #include "util/message.h"
-#ifdef SDR_TX_SAMPLE_24BIT
-#include "dsp/inthalfbandfilterdb.h"
-#else
 #ifdef USE_SSE4_1
 #include "dsp/inthalfbandfiltereo1.h"
 #else
 #include "dsp/inthalfbandfilterdb.h"
 #endif
-#endif
 
 #define UPCHANNELIZER_HB_FILTER_ORDER 96
 
@@ -87,17 +83,12 @@ protected:
             ModeUpperHalf
         };
 
-#ifdef SDR_TX_SAMPLE_24BIT
-        typedef bool (IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
-        IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
-#else
 #ifdef USE_SSE4_1
         typedef bool (IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
         IntHalfbandFilterEO1<UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
 #else
         typedef bool (IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
         IntHalfbandFilterDB<qint32, UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
-#endif
 #endif
         WorkFunction m_workFunction;