VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

M17 demod: updated threading model. Part of #1346

This commit is contained in:
f4exb 2022-10-14 21:31:54 +02:00
parent 2eeaaef3dc
commit 90199aa5ac
3 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
plugins/channelrx/demodm17/m17demod.cpp
View File

@ -54,17 +54,13 @@ const int M17Demod::m_udpBlockSize = 512;
M17Demod::M17Demod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_thread(nullptr),
m_basebandSink(nullptr),
m_running(false),
m_basebandSampleRate(0)
{
qDebug("M17Demod::M17Demod");
setObjectName(m_channelId);
m_thread = new QThread(this);
m_basebandSink = new M17DemodBaseband();
m_basebandSink->setChannel(this);
m_basebandSink->setDemodInputMessageQueue(&m_inputMessageQueue);
m_basebandSink->moveToThread(m_thread);
applySettings(m_settings, QList<QString>(), true);
m_deviceAPI->addChannelSink(this);
@ -83,6 +79,7 @@ M17Demod::M17Demod(DeviceAPI *deviceAPI) :
this,
&M17Demod::handleIndexInDeviceSetChanged
);
start();
}
M17Demod::~M17Demod()
@ -96,8 +93,7 @@ M17Demod::~M17Demod()
delete m_networkManager;
m_deviceAPI->removeChannelSinkAPI(this);
m_deviceAPI->removeChannelSink(this);
delete m_basebandSink;
delete m_thread;
stop();
}
void M17Demod::setDeviceAPI(DeviceAPI *deviceAPI)
@ -120,12 +116,27 @@ uint32_t M17Demod::getNumberOfDeviceStreams() const
void M17Demod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
{
(void) firstOfBurst;
m_basebandSink->feed(begin, end);
if (m_running) {
m_basebandSink->feed(begin, end);
}
}
void M17Demod::start()
{
if (m_running) {
return;
}
qDebug() << "M17Demod::start";
m_thread = new QThread(this);
m_basebandSink = new M17DemodBaseband();
m_basebandSink->setChannel(this);
m_basebandSink->setDemodInputMessageQueue(&m_inputMessageQueue);
m_basebandSink->moveToThread(m_thread);
QObject::connect(m_thread, &QThread::finished, m_basebandSink, &QObject::deleteLater);
QObject::connect(m_thread, &QThread::finished, m_thread, &QThread::deleteLater);
if (m_basebandSampleRate != 0) {
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
@ -133,11 +144,21 @@ void M17Demod::start()
m_basebandSink->reset();
m_thread->start();
M17DemodBaseband::MsgConfigureM17DemodBaseband *msg = M17DemodBaseband::MsgConfigureM17DemodBaseband::create(m_settings, QStringList(), true);
m_basebandSink->getInputMessageQueue()->push(msg);
m_running = true;
}
void M17Demod::stop()
{
if (!m_running) {
return;
}
qDebug() << "M17Demod::stop";
m_running = false;
m_thread->exit();
m_thread->wait();
}
@ -158,10 +179,15 @@ bool M17Demod::handleMessage(const Message& cmd)
{
DSPSignalNotification& notif = (DSPSignalNotification&) cmd;
m_basebandSampleRate = notif.getSampleRate();
// Forward to the sink
DSPSignalNotification* rep = new DSPSignalNotification(notif); // make a copy
qDebug() << "M17Demod::handleMessage: DSPSignalNotification";
m_basebandSink->getInputMessageQueue()->push(rep);
// Forward to the sink
if (m_running)
{
DSPSignalNotification* rep = new DSPSignalNotification(notif); // make a copy
m_basebandSink->getInputMessageQueue()->push(rep);
}
// Forward to GUI if any
if (getMessageQueueToGUI()) {
getMessageQueueToGUI()->push(new DSPSignalNotification(notif));
@ -258,8 +284,11 @@ void M17Demod::applySettings(const M17DemodSettings& settings, const QList<QStri
}
}
M17DemodBaseband::MsgConfigureM17DemodBaseband *msg = M17DemodBaseband::MsgConfigureM17DemodBaseband::create(settings, settingsKeys, force);
m_basebandSink->getInputMessageQueue()->push(msg);
if (m_running)
{
M17DemodBaseband::MsgConfigureM17DemodBaseband *msg = M17DemodBaseband::MsgConfigureM17DemodBaseband::create(settings, settingsKeys, force);
m_basebandSink->getInputMessageQueue()->push(msg);
}
if (settingsKeys.contains("m_useReverseAPI"))
{
@ -538,6 +567,10 @@ void M17Demod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
void M17Demod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
{
if (!m_running) {
return;
}
double magsqAvg, magsqPeak;
int nbMagsqSamples;
getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples);
@ -707,7 +740,7 @@ void M17Demod::networkManagerFinished(QNetworkReply *reply)
void M17Demod::handleIndexInDeviceSetChanged(int index)
{
if (index < 0) {
if (!m_running || (index < 0)) {
return;
}

33
plugins/channelrx/demodm17/m17demod.h
View File

@ -209,12 +209,22 @@ public:
SWGSDRangel::SWGChannelSettings& response);
uint32_t getNumberOfDeviceStreams() const;
void setScopeXYSink(BasebandSampleSink* sampleSink) { m_basebandSink->setScopeXYSink(sampleSink); }
void configureMyPosition(float myLatitude, float myLongitude) { m_basebandSink->configureMyPosition(myLatitude, myLongitude); }
double getMagSq() { return m_basebandSink->getMagSq(); }
bool getSquelchOpen() const { return m_basebandSink->getSquelchOpen(); }
void getMagSqLevels(double& avg, double& peak, int& nbSamples) { m_basebandSink->getMagSqLevels(avg, peak, nbSamples); }
int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); }
void setScopeXYSink(BasebandSampleSink* sampleSink) { if (m_running) { m_basebandSink->setScopeXYSink(sampleSink); } }
void configureMyPosition(float myLatitude, float myLongitude) { if (m_running) { m_basebandSink->configureMyPosition(myLatitude, myLongitude); } }
double getMagSq() { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
void getMagSqLevels(double& avg, double& peak, int& nbSamples)
{
if (m_running) {
m_basebandSink->getMagSqLevels(avg, peak, nbSamples);
} else {
avg = 0.0; peak = 0.0; nbSamples = 1;
}
}
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
bool isRunning() { return m_running; }
void getDiagnostics(
bool& dcd,
@ -251,15 +261,15 @@ public:
void resetPRBS() { m_basebandSink->resetPRBS(); }
uint32_t getLSFCount() const { return m_basebandSink->getLSFCount(); }
uint32_t getLSFCount() const { return m_running ? m_basebandSink->getLSFCount() : 0; }
const QString& getSrcCall() const { return m_basebandSink->getSrcCall(); }
const QString& getDestcCall() const { return m_basebandSink->getDestcCall(); }
const QString& getTypeInfo() const { return m_basebandSink->getTypeInfo(); }
const std::array<uint8_t, 14>& getMeta() const { return m_basebandSink->getMeta(); }
bool getHasGNSS() const { return m_basebandSink->getHasGNSS(); }
bool getStreamElsePacket() const { return m_basebandSink->getStreamElsePacket(); }
uint16_t getCRC() const { return m_basebandSink->getCRC(); }
int getStdPacketProtocol() const { return m_basebandSink->getStdPacketProtocol(); }
bool getHasGNSS() const { return m_running && m_basebandSink->getHasGNSS(); }
bool getStreamElsePacket() const { return m_running && m_basebandSink->getStreamElsePacket(); }
uint16_t getCRC() const { return m_running ? m_basebandSink->getCRC() : 0; }
int getStdPacketProtocol() const { return m_running ? m_basebandSink->getStdPacketProtocol() : 0; }
static const char* const m_channelIdURI;
static const char* const m_channelId;
@ -268,6 +278,7 @@ private:
DeviceAPI *m_deviceAPI;
QThread *m_thread;
M17DemodBaseband *m_basebandSink;
bool m_running;
M17DemodSettings m_settings;
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink

2
plugins/channelrx/demodm17/m17demodgui.cpp
View File

@ -689,7 +689,7 @@ void M17DemodGUI::tick()
m_squelchOpen = squelchOpen;
}
if (m_tickCount % 10 == 0)
if (m_m17Demod->isRunning() && (m_tickCount % 10 == 0))
{
bool dcd;
float evm;