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

FileSink: fixes crash on interpolation change. Revamped GUI interface to match TestSink. Complements #1864

Browse Source
This commit is contained in:
f4exb
2026-01-04 21:59:18 +01:00
parent 6ee3044cb0
commit 90de3777a6
10 changed files with 181 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/fileoutput/fileoutputworker.cpp
+27 -2
View File
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2016-2017, 2019-2020 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
// Copyright (C) 2016-2017, 2019-2026 Edouard Griffiths, F4EXB //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
@@ -21,6 +21,7 @@
#include <QDebug>
#include "dsp/samplesourcefifo.h"
#include "dsp/basebandsamplesink.h"
#include "fileoutputworker.h"
FileOutputWorker::FileOutputWorker(std::ofstream *samplesStream, SampleSourceFifo* sampleFifo, QObject* parent) :
@@ -180,7 +181,9 @@ void FileOutputWorker::callbackPart(SampleVector& data, unsigned int iBegin, uns
if (m_log2Interpolation == 0)
{
m_ofstream->write(reinterpret_cast<char*>(&(*beginRead)), chunkSize*sizeof(Sample));
m_interpolators.interpolate1(&beginRead, m_buf, 2*chunkSize);
m_ofstream->write(reinterpret_cast<char*>(m_buf), chunkSize*2*sizeof(int16_t));
feedSpectrum(m_buf, 2*chunkSize);
}
else
{
@@ -209,5 +212,27 @@ void FileOutputWorker::callbackPart(SampleVector& data, unsigned int iBegin, uns
}
m_ofstream->write(reinterpret_cast<char*>(m_buf), chunkSize*(1<<m_log2Interpolation)*2*sizeof(int16_t));
feedSpectrum(m_buf, 2*chunkSize*(1<<m_log2Interpolation));
}
}
void FileOutputWorker::feedSpectrum(int16_t *buf, unsigned int bufSize)
{
if (!m_spectrumSink) {
return;
}
m_samplesVector.allocate(bufSize/2);
Sample16 *s16Buf = (Sample16*) buf;
std::transform(
s16Buf,
s16Buf + (bufSize/2),
m_samplesVector.m_vector.begin(),
[](Sample16 s) -> Sample {
return Sample{s.m_real, s.m_imag};
}
);
m_spectrumSink->feed(m_samplesVector.m_vector.begin(), m_samplesVector.m_vector.begin() + (bufSize/2), false);
}