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

Differentiate Rx and Tx DSP sample sizes

This commit is contained in:
f4exb
2018-01-22 08:46:05 +01:00
parent bacc6659b0
commit 2ddcb8c358
45 changed files with 136 additions and 132 deletions
+3 -3
View File
@@ -55,10 +55,10 @@ private:
int m_fcPos;
static AirspyThread *m_this;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 12> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 12> m_decimators;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
@@ -53,10 +53,10 @@ private:
unsigned int m_log2Decim;
static AirspyHFThread *m_this;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 16> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 16> m_decimators;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 16> m_decimators;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 16> m_decimators;
#endif
void run();
@@ -51,10 +51,10 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 12> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 12> m_decimators;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
@@ -54,10 +54,10 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint8, SDR_SAMP_SZ, 8> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint8, SDR_RX_SAMP_SZ, 8> m_decimators;
#else
Decimators<qint32, qint8, SDR_SAMP_SZ, 8> m_decimators;
Decimators<qint32, qint8, SDR_RX_SAMP_SZ, 8> m_decimators;
#endif
void run();
@@ -55,10 +55,10 @@ private:
unsigned int m_log2Decim; // soft decimation
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 12> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 12> m_decimators;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
@@ -59,10 +59,10 @@ private:
int m_fcPos;
float m_phasor;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 12> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 12> m_decimators;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
+3 -3
View File
@@ -52,10 +52,10 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_SAMPLE_24BIT
DecimatorsU<qint64, quint8, SDR_SAMP_SZ, 8, 127> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
DecimatorsU<qint64, quint8, SDR_RX_SAMP_SZ, 8, 127> m_decimators;
#else
DecimatorsU<qint32, quint8, SDR_SAMP_SZ, 8, 127> m_decimators;
DecimatorsU<qint32, quint8, SDR_RX_SAMP_SZ, 8, 127> m_decimators;
#endif
void run();
+3 -3
View File
@@ -52,10 +52,10 @@ private:
unsigned int m_log2Decim;
int m_fcPos;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 12> m_decimators;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 12> m_decimators;
Decimators<qint32, qint16, SDR_RX_SAMP_SZ, 12> m_decimators;
#endif
void run();
@@ -85,14 +85,14 @@ private:
bool m_throttleToggle;
QMutex m_mutex;
#ifdef SDR_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_SAMP_SZ, 8> m_decimators_8;
Decimators<qint64, qint16, SDR_SAMP_SZ, 12> m_decimators_12;
Decimators<qint64, qint16, SDR_SAMP_SZ, 16> m_decimators_16;
#ifdef SDR_RX_SAMPLE_24BIT
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 8> m_decimators_8;
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 12> m_decimators_12;
Decimators<qint64, qint16, SDR_RX_SAMP_SZ, 16> m_decimators_16;
#else
Decimators<qint32, qint16, SDR_SAMP_SZ, 8> m_decimators_8;
Decimators<qint32, qint16, SDR_SAMP_SZ, 12> m_decimators_12;
Decimators<qint32, qint16, SDR_SAMP_SZ, 16> m_decimators_16;
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();