1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00

24 bit DSP: use a different define for Tx chain so that it can stay on 16 bit DSP

This commit is contained in:
f4exb 2018-01-22 03:00:08 +01:00
parent 732561152b
commit bacc6659b0
3 changed files with 5 additions and 5 deletions

View File

@ -18,7 +18,7 @@
#define INCLUDE_GPL_DSP_INTERPOLATORS_H_
#include "dsp/dsptypes.h"
#ifdef SDR_SAMPLE_24BIT
#ifdef SDR_TX_SAMPLE_24BIT
#include "dsp/inthalfbandfilterdb.h"
#else
#ifdef USE_SSE4_1
@ -118,7 +118,7 @@ public:
void interpolate64_cen(SampleVector::iterator* it, T* buf, qint32 len);
private:
#ifdef SDR_SAMPLE_24BIT
#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

View File

@ -207,7 +207,7 @@ void UpChannelizer::applyConfiguration()
}
}
#ifdef SDR_SAMPLE_24BIT
#ifdef SDR_TX_SAMPLE_24BIT
UpChannelizer::FilterStage::FilterStage(Mode mode) :
m_filter(new IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>),
m_workFunction(0)

View File

@ -23,7 +23,7 @@
#include <QMutex>
#include "util/export.h"
#include "util/message.h"
#ifdef SDR_SAMPLE_24BIT
#ifdef SDR_TX_SAMPLE_24BIT
#include "dsp/inthalfbandfilterdb.h"
#else
#ifdef USE_SSE4_1
@ -87,7 +87,7 @@ protected:
ModeUpperHalf
};
#ifdef SDR_SAMPLE_24BIT
#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