VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-03-03 05:40:05 -05:00
Code Issues Projects Releases Wiki Activity

SigMF file sink: replaced interpolator by centered half band decimator

Browse Source
This commit is contained in:
f4exb 2020-07-19 00:56:59 +02:00
parent 9aa03715d8
commit 52178ee2b4
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp
View File

@ -85,23 +85,20 @@ void SigMFFileSinkSink::feed(const SampleVector::const_iterator& begin, const Sa
{
for (SampleVector::const_iterator it = begin; it < end; ++it)
{
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
if (m_interpolatorDistance == 1)
{
m_sampleBuffer.push_back(Sample(c.real(), c.imag()));
}
else
{
if (m_decimator.getDecim() == 1)
{
m_sampleBuffer.push_back(*it);
}
else
{
Complex c(it->real(), it->imag());
c *= m_nco.nextIQ();
Complex ci;
if (m_interpolator.decimate(&m_interpolatorDistanceRemain, c, &ci))
{
if (m_decimator.decimate(c, ci)) {
m_sampleBuffer.push_back(Sample(ci.real(), ci.imag()));
m_interpolatorDistanceRemain += m_interpolatorDistance;
}
}
}
}
if (!m_record && (m_settings.m_preRecordTime != 0)) {
@ -186,9 +183,19 @@ void SigMFFileSinkSink::applyChannelSettings(
if ((m_channelSampleRate != channelSampleRate)
|| (m_sinkSampleRate != sinkSampleRate) || force)
{
m_interpolator.create(16, channelSampleRate, channelSampleRate / 2.0f);
m_interpolatorDistanceRemain = 0;
m_interpolatorDistance = (Real) channelSampleRate / (Real) sinkSampleRate;
int decim = channelSampleRate / sinkSampleRate;
for (int i = 0; i < 7; i++) // find log2 beween 0 and 6
{
if (decim & 1 == 1)
{
qDebug() << "SigMFFileSinkSink::applyChannelSettings: log2decim: " << i;
m_decimator.setLog2Decim(i);
break;
}
decim >>= 1;
}
}
if ((m_centerFrequency != centerFrequency)

6
plugins/channelrx/sigmffilesink/sigmffilesinksink.h
View File

@ -20,7 +20,7 @@
#include "dsp/channelsamplesink.h"
#include "dsp/sigmffilerecord.h"
#include "dsp/interpolator.h"
#include "dsp/decimatorc.h"
#include "dsp/samplesimplefifo.h"
#include "dsp/ncof.h"
@ -63,9 +63,7 @@ private:
int m_sinkSampleRate;
int64_t m_centerFrequency;
NCOF m_nco;
Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_interpolatorDistanceRemain;
DecimatorC m_decimator;
SampleVector m_sampleBuffer;
SigMFFileSinkSettings m_settings;
SigMFFileRecord m_fileSink;