mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2024-09-27 15:56:48 -04:00
FFTDataDistributor "lines per second" rate control
This commit is contained in:
parent
0802f7b756
commit
8494ce3f18
@ -719,7 +719,7 @@ void AppFrame::OnTimer(wxTimerEvent& event) {
|
|||||||
} else {
|
} else {
|
||||||
fftDistrib.setFFTSize(DEFAULT_FFT_SIZE);
|
fftDistrib.setFFTSize(DEFAULT_FFT_SIZE);
|
||||||
}
|
}
|
||||||
|
fftDistrib.setLinesPerSecond(15);
|
||||||
fftDistrib.run();
|
fftDistrib.run();
|
||||||
|
|
||||||
wproc->setView(waterfallCanvas->getViewState());
|
wproc->setView(waterfallCanvas->getViewState());
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "VisualProcessor.h"
|
#include "VisualProcessor.h"
|
||||||
#include "DemodDefs.h"
|
#include "DemodDefs.h"
|
||||||
#include "fftw3.h"
|
#include "fftw3.h"
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
class SpectrumVisualData : public ReferenceCounter {
|
class SpectrumVisualData : public ReferenceCounter {
|
||||||
public:
|
public:
|
||||||
@ -67,10 +68,17 @@ private:
|
|||||||
|
|
||||||
class FFTDataDistributor : public VisualProcessor<DemodulatorThreadIQData, DemodulatorThreadIQData> {
|
class FFTDataDistributor : public VisualProcessor<DemodulatorThreadIQData, DemodulatorThreadIQData> {
|
||||||
public:
|
public:
|
||||||
|
FFTDataDistributor() : linesPerSecond(30) {
|
||||||
|
}
|
||||||
|
|
||||||
void setFFTSize(int fftSize) {
|
void setFFTSize(int fftSize) {
|
||||||
this->fftSize = fftSize;
|
this->fftSize = fftSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setLinesPerSecond(int lines) {
|
||||||
|
this->linesPerSecond = lines;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void process() {
|
void process() {
|
||||||
while (!input->empty()) {
|
while (!input->empty()) {
|
||||||
@ -79,14 +87,31 @@ protected:
|
|||||||
}
|
}
|
||||||
DemodulatorThreadIQData *inp;
|
DemodulatorThreadIQData *inp;
|
||||||
input->pop(inp);
|
input->pop(inp);
|
||||||
|
|
||||||
|
// number of milliseconds contained in input
|
||||||
|
double inputTime = (double)inp->data.size() / (double)inp->sampleRate;
|
||||||
|
// number of lines in input
|
||||||
|
int inputLines = floor((double)inp->data.size()/(double)fftSize);
|
||||||
|
|
||||||
|
// ratio required to achieve the desired rate
|
||||||
|
double lineRateStep = ((double)linesPerSecond * inputTime)/(double)inputLines;
|
||||||
|
|
||||||
if (inp) {
|
if (inp) {
|
||||||
if (inp->data.size() >= fftSize) {
|
if (inp->data.size() >= fftSize) {
|
||||||
for (int i = 0, iMax = inp->data.size()-fftSize; i < iMax; i += fftSize) {
|
for (int i = 0, iMax = inp->data.size()-fftSize; i < iMax; i += fftSize) {
|
||||||
DemodulatorThreadIQData *outp = outputBuffers.getBuffer();
|
lineRateAccum += lineRateStep;
|
||||||
outp->frequency = inp->frequency;
|
|
||||||
outp->sampleRate = inp->sampleRate;
|
if (lineRateAccum >= 1.0) {
|
||||||
outp->data.assign(inp->data.begin()+i,inp->data.begin()+i+fftSize);
|
DemodulatorThreadIQData *outp = outputBuffers.getBuffer();
|
||||||
distribute(outp);
|
outp->frequency = inp->frequency;
|
||||||
|
outp->sampleRate = inp->sampleRate;
|
||||||
|
outp->data.assign(inp->data.begin()+i,inp->data.begin()+i+fftSize);
|
||||||
|
distribute(outp);
|
||||||
|
|
||||||
|
while (lineRateAccum > 1.0) {
|
||||||
|
lineRateAccum -= 1.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
inp->decRefCount();
|
inp->decRefCount();
|
||||||
@ -96,4 +121,6 @@ protected:
|
|||||||
|
|
||||||
ReBuffer<DemodulatorThreadIQData> outputBuffers;
|
ReBuffer<DemodulatorThreadIQData> outputBuffers;
|
||||||
int fftSize;
|
int fftSize;
|
||||||
|
int linesPerSecond;
|
||||||
|
double lineRateAccum;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user