1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00

Removed 24/16 bit differentiation on Decimator instantiation where possible

This commit is contained in:
f4exb
2018-05-01 23:57:12 +02:00
parent 4924e3edbd
commit 19c32b4354
9 changed files with 119 additions and 153 deletions
@@ -55,11 +55,7 @@ private:
int m_fcPos;
static AirspyThread *m_this;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
void callback(const qint16* buf, qint32 len);
@@ -51,11 +51,7 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
void callback(const qint16* buf, qint32 len);
@@ -54,11 +54,7 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint8, SDR_RX_SAMP_SZ, 8> m_decimators;
#else
Decimators<qint32, qint8, SDR_RX_SAMP_SZ, 8> m_decimators;
#endif
void run();
void callback(const qint8* buf, qint32 len);
@@ -55,11 +55,7 @@ private:
unsigned int m_log2Decim; // soft decimation
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
void callback(const qint16* buf, qint32 len);
@@ -59,11 +59,7 @@ private:
int m_fcPos;
float m_phasor;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
void convert(const qint16* buf, qint32 len);
@@ -52,11 +52,7 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
void callback(const qint16* buf, qint32 len);
@@ -99,15 +99,9 @@ private:
bool m_throttleToggle;
QMutex m_mutex;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 8> m_decimators_8;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators_12;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 16> m_decimators_16;
#else
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 8> m_decimators_8;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators_12;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 16> m_decimators_16;
#endif
void run();
void callback(const qint16* buf, qint32 len);