VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1172 from srcejon/fix_1161_sdrplay 

SDRplayInput - Ensure decimation length is power of two
This commit is contained in:
Edouard Griffiths 2022-03-03 21:04:55 +01:00 committed by GitHub
parent 36876c053f 84865a6f8e
commit 9a733527bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/samplesource/sdrplayv3/sdrplayv3thread.cpp
View File

@ -22,6 +22,7 @@
#include <thread>
#include "sdrplayv3thread.h"
#include "dsp/samplesinkfifo.h"
#include "util/poweroftwo.h"
#include <QDebug>
@ -34,7 +35,8 @@ SDRPlayV3Thread::SDRPlayV3Thread(sdrplay_api_DeviceT* dev, SampleSinkFifo* sampl
m_samplerate(2000000),
m_log2Decim(0),
m_fcPos(0),
m_iqOrder(true)
m_iqOrder(true),
m_iqCount(0)
{
}
@ -134,27 +136,37 @@ void SDRPlayV3Thread::callbackHelper(short *xi, short *xq, sdrplay_api_StreamCbP
(void) params;
(void) reset;
SDRPlayV3Thread* thread = (SDRPlayV3Thread*) ctx;
qint16 iq[8192];
if (params->rfChanged)
thread->m_rfChanged = params->rfChanged;
if (thread->m_running)
{
if (numSamples > 8192)
qCritical() << "SDRPlayV3Thread::callbackHelper: IQ buffer too small: " << numSamples;
// Interleave samples
for (int i = 0; i < (int)numSamples; i++)
{
iq[i*2] = xi[i];
iq[i*2+1] = xq[i];
thread->m_iq[thread->m_iqCount+i*2] = xi[i];
thread->m_iq[thread->m_iqCount+i*2+1] = xq[i];
}
thread->m_iqCount += numSamples * 2;
if (thread->m_iqCount > 8192) {
qCritical() << "SDRPlayV3Thread::callbackHelper: IQ buffer too small: " << numSamples;
}
// Decimators require length to be a power of 2
int iqLen = lowerPowerOfTwo(thread->m_iqCount);
if (thread->m_iqOrder) {
thread->callbackIQ(iq, numSamples*2);
thread->callbackIQ(thread->m_iq, iqLen);
} else {
thread->callbackQI(iq, numSamples*2);
thread->callbackQI(thread->m_iq, iqLen);
}
// Shuffle buffer up
int iqRemaining = thread->m_iqCount - iqLen;
memmove(thread->m_iq, &thread->m_iq[iqLen], iqRemaining * sizeof(qint16));
thread->m_iqCount = iqRemaining;
}
}

3
plugins/samplesource/sdrplayv3/sdrplayv3thread.h
View File

@ -60,6 +60,9 @@ private:
int m_fcPos;
bool m_iqOrder;
qint16 m_iq[8192];
int m_iqCount;
int m_rfChanged;
static const unsigned int m_rfChangedTimeout = 500;