VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-10 01:32:26 -04:00
Code Issues Projects Releases Wiki Activity

AM demod: use MagAGC for synchronous AM

Browse Source
This commit is contained in:
f4exb 2018-05-14 00:34:37 +02:00
parent 21840c5dd3
commit 85d4d8029c
2 changed files with 330 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/channelrx/demodam/amdemod.cpp
View File

@ -54,6 +54,7 @@ AMDemod::AMDemod(DeviceSourceAPI *deviceAPI) :
m_magsqPeak(0.0f), m_magsqPeak(0.0f),
m_magsqCount(0), m_magsqCount(0),
m_volumeAGC(0.003), m_volumeAGC(0.003),
m_syncAMAGC(12000, 0.1, 1e-2),
m_audioFifo(48000), m_audioFifo(48000),
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {
@ -68,6 +69,8 @@ AMDemod::AMDemod(DeviceSourceAPI *deviceAPI) :
m_audioSampleRate = DSPEngine::instance()->getAudioDeviceManager()->getOutputSampleRate(); m_audioSampleRate = DSPEngine::instance()->getAudioDeviceManager()->getOutputSampleRate();
DSBFilter = new fftfilt((2.0f * m_settings.m_rfBandwidth) / m_audioSampleRate, 2 * 1024); DSBFilter = new fftfilt((2.0f * m_settings.m_rfBandwidth) / m_audioSampleRate, 2 * 1024);
SSBFilter = new fftfilt(0.0f, m_settings.m_rfBandwidth / m_audioSampleRate, 1024); SSBFilter = new fftfilt(0.0f, m_settings.m_rfBandwidth / m_audioSampleRate, 1024);
m_syncAMAGC.setThresholdEnable(false);
m_syncAMAGC.resize(12000, 6000, 0.1);
applyChannelSettings(m_inputSampleRate, m_inputFrequencyOffset, true); applyChannelSettings(m_inputSampleRate, m_inputFrequencyOffset, true);
applySettings(m_settings, true); applySettings(m_settings, true);
@ -251,6 +254,8 @@ void AMDemod::applyAudioSampleRate(int sampleRate)
m_volumeAGC.resizeNew(sampleRate/10, 0.003); m_volumeAGC.resizeNew(sampleRate/10, 0.003);
} }
m_syncAMAGC.resize(sampleRate/4, sampleRate/8, 0.1);
m_settingsMutex.unlock(); m_settingsMutex.unlock();
m_audioSampleRate = sampleRate; m_audioSampleRate = sampleRate;
} }
@ -308,7 +313,7 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force)
if ((m_settings.m_squelch != settings.m_squelch) || force) if ((m_settings.m_squelch != settings.m_squelch) || force)
{ {
m_squelchLevel = pow(10.0, settings.m_squelch / 10.0); m_squelchLevel = CalcDb::powerFromdB(settings.m_squelch);
} }
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force) if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)

633
plugins/channelrx/demodam/amdemod.h
View File

@ -1,309 +1,324 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2015 Edouard Griffiths, F4EXB. // // Copyright (C) 2015 Edouard Griffiths, F4EXB. //
// // // //
// This program is free software; you can redistribute it and/or modify // // 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 // // it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or // // the Free Software Foundation as version 3 of the License, or //
// // // //
// This program is distributed in the hope that it will be useful, // // This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of // // but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. // // GNU General Public License V3 for more details. //
// // // //
// You should have received a copy of the GNU General Public License // // You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_AMDEMOD_H #ifndef INCLUDE_AMDEMOD_H
#define INCLUDE_AMDEMOD_H #define INCLUDE_AMDEMOD_H
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/basebandsamplesink.h" #include "dsp/basebandsamplesink.h"
#include "channel/channelsinkapi.h" #include "channel/channelsinkapi.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "util/movingaverage.h" #include "util/movingaverage.h"
#include "dsp/agc.h" #include "dsp/agc.h"
#include "dsp/bandpass.h" #include "dsp/bandpass.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
#include "dsp/phaselockcomplex.h" #include "dsp/phaselockcomplex.h"
#include "dsp/fftfilt.h" #include "dsp/fftfilt.h"
#include "audio/audiofifo.h" #include "audio/audiofifo.h"
#include "util/message.h" #include "util/message.h"
#include "util/doublebufferfifo.h" #include "util/doublebufferfifo.h"
#include "amdemodsettings.h" #include "util/stepfunctions.h"
class DeviceSourceAPI; #include "amdemodsettings.h"
class DownChannelizer;
class ThreadedBasebandSampleSink; class DeviceSourceAPI;
class DownChannelizer;
class AMDemod : public BasebandSampleSink, public ChannelSinkAPI { class ThreadedBasebandSampleSink;
Q_OBJECT
public: class AMDemod : public BasebandSampleSink, public ChannelSinkAPI {
class MsgConfigureAMDemod : public Message { Q_OBJECT
MESSAGE_CLASS_DECLARATION public:
class MsgConfigureAMDemod : public Message {
public: MESSAGE_CLASS_DECLARATION
const AMDemodSettings& getSettings() const { return m_settings; }
bool getForce() const { return m_force; } public:
const AMDemodSettings& getSettings() const { return m_settings; }
static MsgConfigureAMDemod* create(const AMDemodSettings& settings, bool force) bool getForce() const { return m_force; }
{
return new MsgConfigureAMDemod(settings, force); static MsgConfigureAMDemod* create(const AMDemodSettings& settings, bool force)
} {
return new MsgConfigureAMDemod(settings, force);
private: }
AMDemodSettings m_settings;
bool m_force; private:
AMDemodSettings m_settings;
MsgConfigureAMDemod(const AMDemodSettings& settings, bool force) : bool m_force;
Message(),
m_settings(settings), MsgConfigureAMDemod(const AMDemodSettings& settings, bool force) :
m_force(force) Message(),
{ } m_settings(settings),
}; m_force(force)
{ }
class MsgConfigureChannelizer : public Message { };
MESSAGE_CLASS_DECLARATION
class MsgConfigureChannelizer : public Message {
public: MESSAGE_CLASS_DECLARATION
int getSampleRate() const { return m_sampleRate; }
int getCenterFrequency() const { return m_centerFrequency; } public:
int getSampleRate() const { return m_sampleRate; }
static MsgConfigureChannelizer* create(int sampleRate, int centerFrequency) int getCenterFrequency() const { return m_centerFrequency; }
{
return new MsgConfigureChannelizer(sampleRate, centerFrequency); static MsgConfigureChannelizer* create(int sampleRate, int centerFrequency)
} {
return new MsgConfigureChannelizer(sampleRate, centerFrequency);
private: }
int m_sampleRate;
int m_centerFrequency; private:
int m_sampleRate;
MsgConfigureChannelizer(int sampleRate, int centerFrequency) : int m_centerFrequency;
Message(),
m_sampleRate(sampleRate), MsgConfigureChannelizer(int sampleRate, int centerFrequency) :
m_centerFrequency(centerFrequency) Message(),
{ } m_sampleRate(sampleRate),
}; m_centerFrequency(centerFrequency)
{ }
AMDemod(DeviceSourceAPI *deviceAPI); };
~AMDemod();
virtual void destroy() { delete this; } AMDemod(DeviceSourceAPI *deviceAPI);
~AMDemod();
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po); virtual void destroy() { delete this; }
virtual void start();
virtual void stop(); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
virtual bool handleMessage(const Message& cmd); virtual void start();
virtual void stop();
virtual void getIdentifier(QString& id) { id = objectName(); } virtual bool handleMessage(const Message& cmd);
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual QByteArray serialize() const; virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
virtual bool deserialize(const QByteArray& data);
virtual QByteArray serialize() const;
virtual int webapiSettingsGet( virtual bool deserialize(const QByteArray& data);
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage); virtual int webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response,
virtual int webapiSettingsPutPatch( QString& errorMessage);
bool force,
const QStringList& channelSettingsKeys, virtual int webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response, bool force,
QString& errorMessage); const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response,
virtual int webapiReportGet( QString& errorMessage);
SWGSDRangel::SWGChannelReport& response,
QString& errorMessage); virtual int webapiReportGet(
SWGSDRangel::SWGChannelReport& response,
uint32_t getAudioSampleRate() const { return m_audioSampleRate; } QString& errorMessage);
double getMagSq() const { return m_magsq; }
bool getSquelchOpen() const { return m_squelchOpen; } uint32_t getAudioSampleRate() const { return m_audioSampleRate; }
bool getPllLocked() const { return m_settings.m_pll && m_pll.locked(); } double getMagSq() const { return m_magsq; }
bool getSquelchOpen() const { return m_squelchOpen; }
void getMagSqLevels(double& avg, double& peak, int& nbSamples) bool getPllLocked() const { return m_settings.m_pll && m_pll.locked(); }
{
avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; void getMagSqLevels(double& avg, double& peak, int& nbSamples)
peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak; {
nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount; avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount;
m_magsqSum = 0.0f; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak;
m_magsqPeak = 0.0f; nbSamples = m_magsqCount == 0 ? 1 : m_magsqCount;
m_magsqCount = 0; m_magsqSum = 0.0f;
} m_magsqPeak = 0.0f;
m_magsqCount = 0;
static const QString m_channelIdURI; }
static const QString m_channelId;
static const QString m_channelIdURI;
private: static const QString m_channelId;
enum RateState {
RSInitialFill, private:
RSRunning enum RateState {
}; RSInitialFill,
RSRunning
DeviceSourceAPI *m_deviceAPI; };
ThreadedBasebandSampleSink* m_threadedChannelizer;
DownChannelizer* m_channelizer; DeviceSourceAPI *m_deviceAPI;
ThreadedBasebandSampleSink* m_threadedChannelizer;
int m_inputSampleRate; DownChannelizer* m_channelizer;
int m_inputFrequencyOffset;
AMDemodSettings m_settings; int m_inputSampleRate;
uint32_t m_audioSampleRate; int m_inputFrequencyOffset;
bool m_running; AMDemodSettings m_settings;
uint32_t m_audioSampleRate;
NCO m_nco; bool m_running;
Interpolator m_interpolator;
Real m_interpolatorDistance; NCO m_nco;
Real m_interpolatorDistanceRemain; Interpolator m_interpolator;
Real m_interpolatorDistance;
Real m_squelchLevel; Real m_interpolatorDistanceRemain;
uint32_t m_squelchCount;
bool m_squelchOpen; Real m_squelchLevel;
DoubleBufferFIFO<Real> m_squelchDelayLine; uint32_t m_squelchCount;
double m_magsq; bool m_squelchOpen;
double m_magsqSum; DoubleBufferFIFO<Real> m_squelchDelayLine;
double m_magsqPeak; double m_magsq;
int m_magsqCount; double m_magsqSum;
double m_magsqPeak;
MovingAverageUtil<Real, double, 16> m_movingAverage; int m_magsqCount;
SimpleAGC<4800> m_volumeAGC;
Bandpass<Real> m_bandpass; MovingAverageUtil<Real, double, 16> m_movingAverage;
Lowpass<std::complex<float> > m_pllFilt; SimpleAGC<4800> m_volumeAGC;
PhaseLockComplex m_pll; Bandpass<Real> m_bandpass;
fftfilt* DSBFilter; Lowpass<std::complex<float> > m_pllFilt;
fftfilt* SSBFilter; PhaseLockComplex m_pll;
Real m_syncAMBuff[2*1024]; fftfilt* DSBFilter;
uint32_t m_syncAMBuffIndex; fftfilt* SSBFilter;
Real m_syncAMBuff[2*1024];
AudioVector m_audioBuffer; uint32_t m_syncAMBuffIndex;
uint32_t m_audioBufferFill; MagAGC m_syncAMAGC;
AudioFifo m_audioFifo;
AudioVector m_audioBuffer;
static const int m_udpBlockSize; uint32_t m_audioBufferFill;
AudioFifo m_audioFifo;
QMutex m_settingsMutex;
static const int m_udpBlockSize;
void applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force = false);
void applySettings(const AMDemodSettings& settings, bool force = false); QMutex m_settingsMutex;
void applyAudioSampleRate(int sampleRate);
void webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const AMDemodSettings& settings); void applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force = false);
void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response); void applySettings(const AMDemodSettings& settings, bool force = false);
void applyAudioSampleRate(int sampleRate);
void processOneSample(Complex &ci) void webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const AMDemodSettings& settings);
{ void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response);
Real re = ci.real() / SDR_RX_SCALEF;
Real im = ci.imag() / SDR_RX_SCALEF; void processOneSample(Complex &ci)
Real magsq = re*re + im*im; {
m_movingAverage(magsq); Real re = ci.real() / SDR_RX_SCALEF;
m_magsq = m_movingAverage.asDouble(); Real im = ci.imag() / SDR_RX_SCALEF;
m_magsqSum += magsq; Real magsq = re*re + im*im;
m_movingAverage(magsq);
if (magsq > m_magsqPeak) m_magsq = m_movingAverage.asDouble();
{ m_magsqSum += magsq;
m_magsqPeak = magsq;
} if (magsq > m_magsqPeak)
{
m_magsqCount++; m_magsqPeak = magsq;
}
m_squelchDelayLine.write(magsq);
m_magsqCount++;
if (m_magsq < m_squelchLevel)
{ m_squelchDelayLine.write(magsq);
if (m_squelchCount > 0) {
m_squelchCount--; if (m_magsq < m_squelchLevel)
} {
} if (m_squelchCount > 0) {
else m_squelchCount--;
{ }
if (m_squelchCount < m_audioSampleRate / 10) { }
m_squelchCount++; else
} {
} if (m_squelchCount < m_audioSampleRate / 10) {
m_squelchCount++;
qint16 sample; }
}
m_squelchOpen = (m_squelchCount >= m_audioSampleRate / 20);
qint16 sample;
if (m_squelchOpen && !m_settings.m_audioMute)
{ m_squelchOpen = (m_squelchCount >= m_audioSampleRate / 20);
Real demod;
if (m_squelchOpen && !m_settings.m_audioMute)
if (m_settings.m_pll) {
{ Real demod;
std::complex<float> s(re, im);
s = m_pllFilt.filter(s); if (m_settings.m_pll)
m_pll.feed(s.real(), s.imag()); {
float yr = re * m_pll.getImag() - im * m_pll.getReal(); std::complex<float> s(re, im);
float yi = re * m_pll.getReal() + im * m_pll.getImag(); s = m_pllFilt.filter(s);
m_pll.feed(s.real(), s.imag());
fftfilt::cmplx *sideband; float yr = re * m_pll.getImag() - im * m_pll.getReal();
std::complex<float> cs(yr, yi); float yi = re * m_pll.getReal() + im * m_pll.getImag();
int n_out;
fftfilt::cmplx *sideband;
if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMDSB) { std::complex<float> cs(yr, yi);
n_out = DSBFilter->runDSB(cs, &sideband, false); int n_out;
} else {
n_out = SSBFilter->runSSB(cs, &sideband, m_settings.m_syncAMOperation == AMDemodSettings::SyncAMUSB, false); if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMDSB) {
} n_out = DSBFilter->runDSB(cs, &sideband, false);
} else {
for (int i = 0; i < n_out; i++) n_out = SSBFilter->runSSB(cs, &sideband, m_settings.m_syncAMOperation == AMDemodSettings::SyncAMUSB, false);
{ }
if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMDSB) {
m_syncAMBuff[i] = (sideband[i].real() + sideband[i].imag())/2.0f; for (int i = 0; i < n_out; i++)
} else if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMUSB) { {
m_syncAMBuff[i] = (sideband[i].real() + sideband[i].imag()); float agcVal = m_syncAMAGC.feedAndGetValue(sideband[i]);
} else { fftfilt::cmplx z = sideband[i] * agcVal; // * m_syncAMAGC.getStepValue();
m_syncAMBuff[i] = (sideband[i].real() + sideband[i].imag());
} if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMDSB) {
m_syncAMBuff[i] = (z.real() + z.imag())/2.0f;
m_syncAMBuffIndex = 0; } else if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMUSB) {
} m_syncAMBuff[i] = (z.real() + z.imag());
} else {
m_syncAMBuffIndex = m_syncAMBuffIndex < 2*1024 ? m_syncAMBuffIndex : 0; m_syncAMBuff[i] = (z.real() + z.imag());
demod = m_syncAMBuff[m_syncAMBuffIndex++]*(SDR_RX_SCALEF/602.0f); }
m_volumeAGC.feed(demod);
demod /= (10.0*m_volumeAGC.getValue()); // if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMDSB) {
} // m_syncAMBuff[i] = (sideband[i].real() + sideband[i].imag())/2.0f;
else // } else if (m_settings.m_syncAMOperation == AMDemodSettings::SyncAMUSB) {
{ // m_syncAMBuff[i] = (sideband[i].real() + sideband[i].imag());
demod = sqrt(m_squelchDelayLine.readBack(m_audioSampleRate/20)); // } else {
m_volumeAGC.feed(demod); // m_syncAMBuff[i] = (sideband[i].real() + sideband[i].imag());
demod = (demod - m_volumeAGC.getValue()) / m_volumeAGC.getValue(); // }
}
m_syncAMBuffIndex = 0;
if (m_settings.m_bandpassEnable) }
{
demod = m_bandpass.filter(demod); m_syncAMBuffIndex = m_syncAMBuffIndex < 2*1024 ? m_syncAMBuffIndex : 0;
demod /= 301.0f; demod = m_syncAMBuff[m_syncAMBuffIndex++]*4.0f; // mos pifometrico
} // demod = m_syncAMBuff[m_syncAMBuffIndex++]*(SDR_RX_SCALEF/602.0f);
// m_volumeAGC.feed(demod);
Real attack = (m_squelchCount - 0.05f * m_audioSampleRate) / (0.05f * m_audioSampleRate); // demod /= (10.0*m_volumeAGC.getValue());
sample = demod * attack * (m_audioSampleRate/24) * m_settings.m_volume; }
} else
else {
{ demod = sqrt(m_squelchDelayLine.readBack(m_audioSampleRate/20));
sample = 0; m_volumeAGC.feed(demod);
} demod = (demod - m_volumeAGC.getValue()) / m_volumeAGC.getValue();
}
m_audioBuffer[m_audioBufferFill].l = sample;
m_audioBuffer[m_audioBufferFill].r = sample; if (m_settings.m_bandpassEnable)
++m_audioBufferFill; {
demod = m_bandpass.filter(demod);
if (m_audioBufferFill >= m_audioBuffer.size()) demod /= 301.0f;
{ }
uint res = m_audioFifo.write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 10);
Real attack = (m_squelchCount - 0.05f * m_audioSampleRate) / (0.05f * m_audioSampleRate);
if (res != m_audioBufferFill) sample = demod * StepFunctions::smootherstep(attack) * (m_audioSampleRate/24) * m_settings.m_volume;
{ }
qDebug("AMDemod::processOneSample: %u/%u audio samples written", res, m_audioBufferFill); else
m_audioFifo.clear(); {
} sample = 0;
}
m_audioBufferFill = 0;
} m_audioBuffer[m_audioBufferFill].l = sample;
} m_audioBuffer[m_audioBufferFill].r = sample;
++m_audioBufferFill;
};
if (m_audioBufferFill >= m_audioBuffer.size())
#endif // INCLUDE_AMDEMOD_H {
uint res = m_audioFifo.write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 10);
if (res != m_audioBufferFill)
{
qDebug("AMDemod::processOneSample: %u/%u audio samples written", res, m_audioBufferFill);
m_audioFifo.clear();
}
m_audioBufferFill = 0;
}
}
};
#endif // INCLUDE_AMDEMOD_H