VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

RTL-SDR: corrected bit shifts for 8 bit samples and corrected RTL-SDR unsigned to signed conversion

Browse Source
This commit is contained in:
f4exb 2018-01-15 23:37:26 +01:00
parent 39b20bb71f
commit 18fa3b6156
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/samplesource/rtlsdr/rtlsdrthread.cpp
View File

@ -88,7 +88,7 @@ void RTLSDRThread::run()
} }
// Decimate according to specified log2 (ex: log2=4 => decim=16) // Decimate according to specified log2 (ex: log2=4 => decim=16)
void RTLSDRThread::callback(const quint8* buf, qint32 len) void RTLSDRThread::callback(const qint8* buf, qint32 len)
{ {
SampleVector::iterator it = m_convertBuffer.begin(); SampleVector::iterator it = m_convertBuffer.begin();
@ -178,6 +178,9 @@ void RTLSDRThread::callback(const quint8* buf, qint32 len)
void RTLSDRThread::callbackHelper(unsigned char* buf, uint32_t len, void* ctx) void RTLSDRThread::callbackHelper(unsigned char* buf, uint32_t len, void* ctx)
{ {
RTLSDRThread* thread = (RTLSDRThread*)ctx; RTLSDRThread* thread = (RTLSDRThread*)ctx;
thread->callback(buf, len); for (unsigned int i = 0; i < len; i++) {
buf[i] = buf[i] - 127;
}
thread->callback((qint8 *) buf, len);
} }

4
plugins/samplesource/rtlsdr/rtlsdrthread.h
View File

@ -52,10 +52,10 @@ private:
unsigned int m_log2Decim; unsigned int m_log2Decim;
int m_fcPos; int m_fcPos;
Decimators<quint8, SDR_SAMP_SZ, 8> m_decimators; Decimators<qint8, SDR_SAMP_SZ, 8> m_decimators;
void run(); void run();
void callback(const quint8* buf, qint32 len); void callback(const qint8* buf, qint32 len);
static void callbackHelper(unsigned char* buf, uint32_t len, void* ctx); static void callbackHelper(unsigned char* buf, uint32_t len, void* ctx);
}; };

14
sdrbase/dsp/decimators.h
View File

@ -83,18 +83,18 @@ struct decimation_shifts<16, 12>
template<> template<>
struct decimation_shifts<16, 8> struct decimation_shifts<16, 8>
{ {
static const uint pre1 = 7; static const uint pre1 = 8;
static const uint pre2 = 6; static const uint pre2 = 7;
static const uint post2 = 0; static const uint post2 = 0;
static const uint pre4 = 5; static const uint pre4 = 6;
static const uint post4 = 0; static const uint post4 = 0;
static const uint pre8 = 4; static const uint pre8 = 5;
static const uint post8 = 0; static const uint post8 = 0;
static const uint pre16 = 3; static const uint pre16 = 4;
static const uint post16 = 0; static const uint post16 = 0;
static const uint pre32 = 2; static const uint pre32 = 3;
static const uint post32 = 0; static const uint post32 = 0;
static const uint pre64 = 1; static const uint pre64 = 2;
static const uint post64 = 0; static const uint post64 = 0;
}; };