mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-07-10 11:05:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix + preparations for stereo FM

Browse Source
This commit is contained in:
Ryzerth
2021-07-22 23:30:41 +02:00
parent 2baf607b8c
commit 175e361ccd
8 changed files with 381 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
core/src/dsp/demodulator.h
View File

@ -8,6 +8,8 @@
#include <dsp/pll.h>
#include <dsp/clock_recovery.h>
#include <dsp/math.h>
#include <dsp/convertion.h>
#include <dsp/audio.h>
#define FAST_ATAN2_COEF1 FL_M_PI / 4.0f
#define FAST_ATAN2_COEF2 3.0f * FAST_ATAN2_COEF1
@ -663,4 +665,119 @@ namespace dsp {
float _muGain;
float _omegaRelLimit;
};
class StereoFMDemod : public generic_hier_block<StereoFMDemod> {
public:
StereoFMDemod() {}
StereoFMDemod(stream<float>* input, float sampleRate, float baudRate, float agcRate = 0.02e-3f, float pllLoopBandwidth = (0.06f*0.06f) / 4.0f, int rrcTapCount = 31, float rrcAlpha = 0.6f, float omegaGain = (0.01*0.01) / 4, float muGain = 0.01f, float omegaRelLimit = 0.005f) {
init(input, sampleRate);
}
void init(stream<float>* input, float sampleRate) {
_sampleRate = sampleRate;
r2c.init(input);
split.init(&r2c.out);
split.bindStream(&APlusBIn);
split.bindStream(&AMinusBIn);
split.bindStream(&PilotIn);
APlusBWin.init(0, 17000, 2500, _sampleRate);
AMinusBWin.init(38000, 38000 + 17000, 2500, _sampleRate);
PilotWin.init(18500, 19500, 1500, _sampleRate);
APlusBFir.init(&APlusBIn, &APlusBWin);
AMinusBFir.init(&AMinusBIn, &AMinusBWin);
PilotFir.init(&PilotIn, &PilotWin);
pll.init(&PilotFir.out, 0.1f);
p2s.init(&pll.out);
mixer.init(&AMinusBFir.out, &p2s.out);
c2rAPlusB.init(&APlusBFir.out);
c2rAMinusB.init(&mixer.out);
APlusBSplit.init(&c2rAPlusB.out);
AMinusBSplit.init(&c2rAMinusB.out);
APlusBSplit.bindStream(&AdderAPlusB);
APlusBSplit.bindStream(&SubtractorAPlusB);
AMinusBSplit.bindStream(&AdderAMinusB);
AMinusBSplit.bindStream(&SubtractorAMinusB);
Adder.init(&AdderAPlusB, &AdderAMinusB);
Subtractor.init(&SubtractorAPlusB, &SubtractorAMinusB);
c2s.init(&Adder.out, &Subtractor.out);
out = &c2s.out;
generic_hier_block<StereoFMDemod>::registerBlock(&r2c);
generic_hier_block<StereoFMDemod>::registerBlock(&split);
generic_hier_block<StereoFMDemod>::registerBlock(&APlusBFir);
generic_hier_block<StereoFMDemod>::registerBlock(&AMinusBFir);
generic_hier_block<StereoFMDemod>::registerBlock(&PilotFir);
generic_hier_block<StereoFMDemod>::registerBlock(&pll);
generic_hier_block<StereoFMDemod>::registerBlock(&p2s);
generic_hier_block<StereoFMDemod>::registerBlock(&mixer);
generic_hier_block<StereoFMDemod>::registerBlock(&c2rAPlusB);
generic_hier_block<StereoFMDemod>::registerBlock(&c2rAMinusB);
generic_hier_block<StereoFMDemod>::registerBlock(&APlusBSplit);
generic_hier_block<StereoFMDemod>::registerBlock(&AMinusBSplit);
generic_hier_block<StereoFMDemod>::registerBlock(&Adder);
generic_hier_block<StereoFMDemod>::registerBlock(&Subtractor);
generic_hier_block<StereoFMDemod>::registerBlock(&c2s);
generic_hier_block<StereoFMDemod>::_block_init = true;
}
void setInput(stream<float>* input) {
assert(generic_hier_block<StereoFMDemod>::_block_init);
r2c.setInput(input);
}
stream<stereo_t>* out = NULL;
private:
filter_window::BandPassBlackmanWindow APlusBWin;
filter_window::BandPassBlackmanWindow AMinusBWin;
filter_window::BandPassBlackmanWindow PilotWin;
RealToComplex r2c;
Splitter<complex_t> split;
stream<complex_t> APlusBIn;
stream<complex_t> AMinusBIn;
stream<complex_t> PilotIn;
ComplexFIR APlusBFir;
ComplexFIR AMinusBFir;
ComplexFIR PilotFir;
PLL pll;
BFMPilotToStereo p2s;
Multiply<complex_t> mixer;
ComplexToReal c2rAPlusB;
ComplexToReal c2rAMinusB;
Splitter<float> APlusBSplit;
Splitter<float> AMinusBSplit;
stream<float> AdderAPlusB;
stream<float> AdderAMinusB;
stream<float> SubtractorAPlusB;
stream<float> SubtractorAMinusB;
Add<float> Adder;
Add<float> Subtractor;
ChannelsToStereo c2s;
float _sampleRate;
};
}