ryzerth/sdrpp
1
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2026-04-20 15:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

More work

Browse Source
This commit is contained in:
AlexandreRouma
2022-06-21 17:24:48 +02:00
parent 834890b69a
commit f7c566f652
17 changed files with 519 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
core/src/dsp/demod/am.h
View File

@@ -2,10 +2,14 @@
#include "../processor.h"
#include "../loop/agc.h"
#include "../correction/dc_blocker.h"
#include "../convert/mono_to_stereo.h"
#include "../filter/fir.h"
#include "../taps/low_pass.h"
namespace dsp::demod {
class AM : public Processor<dsp::complex_t, float> {
using base_type = Processor<dsp::complex_t, float>;
template <class T>
class AM : public Processor<dsp::complex_t, T> {
using base_type = Processor<dsp::complex_t, T>;
public:
enum AGCMode {
CARRIER,
@@ -14,17 +18,30 @@ namespace dsp::demod {
AM() {}
AM(stream<complex_t>* in, AGCMode agcMode, double agcAttack, double agcDecay, double dcBlockRate) { init(in, agcMode, agcAttack, agcDecay, dcBlockRate); }
AM(stream<complex_t>* in, AGCMode agcMode, double bandwidth, double agcAttack, double agcDecay, double dcBlockRate, double samplerate) { init(in, agcMode, bandwidth, agcAttack, agcDecay, dcBlockRate, samplerate); }
void init(stream<complex_t>* in, AGCMode agcMode, double agcAttack, double agcDecay, double dcBlockRate) {
~AM() {
if (!base_type::_block_init) { return; }
base_type::stop();
taps::free(lpfTaps);
}
void init(stream<complex_t>* in, AGCMode agcMode, double bandwidth, double agcAttack, double agcDecay, double dcBlockRate, double samplerate) {
_agcMode = agcMode;
_bandwidth = bandwidth;
_samplerate = samplerate;
carrierAgc.init(NULL, 1.0, agcAttack, agcDecay, 10e6, 10.0);
audioAgc.init(NULL, 1.0, agcAttack, agcDecay, 10e6, 10.0);
dcBlock.init(NULL, dcBlockRate);
lpfTaps = taps::lowPass(bandwidth / 2.0, (bandwidth / 2.0) * 0.1, samplerate);
lpf.init(NULL, lpfTaps);
audioAgc.out.free();
if constexpr (std::is_same_v<T, float>) {
audioAgc.out.free();
}
dcBlock.out.free();
lpf.out.free();
base_type::init(in);
}
@@ -38,6 +55,17 @@ namespace dsp::demod {
base_type::tempStart();
}
void setBandwidth(double bandwidth) {
assert(base_type::_block_init);
std::lock_guard<std::recursive_mutex> lck(base_type::ctrlMtx);
if (bandwidth == _bandwidth) { return; }
_bandwidth = bandwidth;
std::lock_guard<std::mutex> lck2(lpfMtx);
taps::free(lpfTaps);
lpfTaps = taps::lowPass(_bandwidth / 2.0, (_bandwidth / 2.0) * 0.1, _samplerate);
lpf.setTaps(lpfTaps);
}
void setAGCAttack(double attack) {
assert(base_type::_block_init);
std::lock_guard<std::recursive_mutex> lck(base_type::ctrlMtx);
@@ -58,6 +86,8 @@ namespace dsp::demod {
dcBlock.setRate(rate);
}
// TODO: Implement setSamplerate
void reset() {
assert(base_type::_block_init);
std::lock_guard<std::recursive_mutex> lck(base_type::ctrlMtx);
@@ -68,20 +98,35 @@ namespace dsp::demod {
base_type::tempStart();
}
int process(int count, complex_t* in, float* out) {
int process(int count, complex_t* in, T* out) {
// Apply carrier AGC if needed
if (_agcMode == AGCMode::CARRIER) {
carrierAgc.process(count, in, carrierAgc.out.writeBuf);
in = carrierAgc.out.writeBuf;
}
// Get magnitude of each sample and remove DC (TODO: use block instead)
volk_32fc_magnitude_32f(out, (lv_32fc_t*)in, count);
dcBlock.process(count, out, out);
// Apply audio AGC if needed
if (_agcMode == AGCMode::AUDIO) {
audioAgc.process(count, out, out);
if constexpr (std::is_same_v<T, float>) {
volk_32fc_magnitude_32f(out, (lv_32fc_t*)in, count);
dcBlock.process(count, out, out);
if (_agcMode == AGCMode::AUDIO) {
audioAgc.process(count, out, out);
}
{
std::lock_guard<std::mutex> lck(lpfMtx);
lpf.process(count, out, out);
}
}
if constexpr (std::is_same_v<T, stereo_t>) {
volk_32fc_magnitude_32f(audioAgc.out.writeBuf, (lv_32fc_t*)in, count);
dcBlock.process(count, audioAgc.out.writeBuf, audioAgc.out.writeBuf);
if (_agcMode == AGCMode::AUDIO) {
audioAgc.process(count, audioAgc.out.writeBuf, audioAgc.out.writeBuf);
}
{
std::lock_guard<std::mutex> lck(lpfMtx);
lpf.process(count, audioAgc.out.writeBuf, audioAgc.out.writeBuf);
}
convert::MonoToStereo::process(count, audioAgc.out.writeBuf, out);
}
return count;
@@ -101,9 +146,15 @@ namespace dsp::demod {
protected:
AGCMode _agcMode;
double _samplerate;
double _bandwidth;
loop::AGC<complex_t> carrierAgc;
loop::AGC<float> audioAgc;
correction::DCBlocker<float> dcBlock;
tap<float> lpfTaps;
filter::FIR<float, float> lpf;
std::mutex lpfMtx;
};
}