Merge pull request #1292 from srcejon/bfm_demod_analyzer

Broadcast FM Demod send audio to Demod Analyzer

plugins/channelrx/demodbfm/bfmdemod.cpp

@@ -59,6 +59,7 @@ BFMDemod::BFMDemod(DeviceAPI *deviceAPI) :
     m_thread = new QThread(this);
     m_basebandSink = new BFMDemodBaseband();
     m_basebandSink->setSpectrumSink(&m_spectrumVis);
+    m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(m_thread);
 
 	applySettings(m_settings, true);

plugins/channelrx/demodbfm/bfmdemodbaseband.cpp

@@ -69,6 +69,11 @@ void BFMDemodBaseband::feed(const SampleVector::const_iterator& begin, const Sam
     m_sampleFifo.write(begin, end);
 }
 
+void BFMDemodBaseband::setChannel(ChannelAPI *channel)
+{
+    m_sink.setChannel(channel);
+}
+
 void BFMDemodBaseband::handleData()
 {
     QMutexLocker mutexLocker(&m_mutex);

plugins/channelrx/demodbfm/bfmdemodbaseband.h

@@ -65,6 +65,7 @@ public:
     int getChannelSampleRate() const;
     void setBasebandSampleRate(int sampleRate);
     void setSpectrumSink(SpectrumVis* spectrumSink) { m_spectrumVis = spectrumSink; m_sink.setSpectrumSink((BasebandSampleSink*) spectrumSink); }
+    void setChannel(ChannelAPI *channel);
     void setMessageQueueToGUI(MessageQueue *messageQueue) { m_messageQueueToGUI = messageQueue; }
 
     int getAudioSampleRate() const { return m_sink.getAudioSampleRate(); }

plugins/channelrx/demodbfm/bfmdemodsink.cpp

@@ -27,7 +27,10 @@
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "dsp/basebandsamplesink.h"
+#include "dsp/datafifo.h"
+#include "pipes/datapipes.h"
 #include "util/db.h"
+#include "maincore.h"
 
 #include "rdsparser.h"
 #include "bfmdemodsink.h"
@@ -36,6 +39,7 @@ const Real BFMDemodSink::default_deemphasis = 50.0; // 50 us
 const int  BFMDemodSink::default_excursion = 750000; // +/- 75 kHz
 
 BFMDemodSink::BFMDemodSink() :
+    m_channel(nullptr),
     m_channelSampleRate(48000),
     m_channelFrequencyOffset(0),
     m_audioSampleRate(48000),
@@ -75,6 +79,9 @@ BFMDemodSink::BFMDemodSink() :
 	m_audioBuffer.resize(1<<14);
 	m_audioBufferFill = 0;
 
+    m_demodBuffer.resize(1<<13);
+    m_demodBufferFill = 0;
+
 	applySettings(m_settings, true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
 }
@@ -211,6 +218,9 @@ void BFMDemodSink::feed(const SampleVector::const_iterator& begin, const SampleV
 					m_audioBuffer[m_audioBufferFill].r = sample;
 				}
 
+                m_demodBuffer[m_demodBufferFill++] = m_audioBuffer[m_audioBufferFill].l;
+                m_demodBuffer[m_demodBufferFill++] = m_audioBuffer[m_audioBufferFill].r;
+
 				++m_audioBufferFill;
 
 				if (m_audioBufferFill >= m_audioBuffer.size())
@@ -224,6 +234,28 @@ void BFMDemodSink::feed(const SampleVector::const_iterator& begin, const SampleV
 					m_audioBufferFill = 0;
 				}
 
+                if (m_demodBufferFill >= m_demodBuffer.size())
+                {
+                    QList<ObjectPipe*> dataPipes;
+                    MainCore::instance()->getDataPipes().getDataPipes(m_channel, "demod", dataPipes);
+
+                    if (dataPipes.size() > 0)
+                    {
+                        QList<ObjectPipe*>::iterator it = dataPipes.begin();
+
+                        for (; it != dataPipes.end(); ++it)
+                        {
+                            DataFifo *fifo = qobject_cast<DataFifo*>((*it)->m_element);
+
+                            if (fifo) {
+                                fifo->write((quint8*) &m_demodBuffer[0], m_demodBuffer.size() * sizeof(qint16), DataFifo::DataTypeCI16);
+                            }
+                        }
+                    }
+
+                    m_demodBufferFill = 0;
+                }
+
 				m_interpolatorDistanceRemain += m_interpolatorDistance;
 			}
 		}

plugins/channelrx/demodbfm/bfmdemodsink.h

@@ -20,6 +20,8 @@
 
 #include <vector>
 
+#include <QVector>
+
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
@@ -36,6 +38,7 @@
 #include "rdsdemod.h"
 #include "bfmdemodsettings.h"
 
+class ChannelAPI;
 class BasebandSampleSink;
 
 class BFMDemodSink : public ChannelSampleSink {
@@ -46,6 +49,7 @@ public:
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
 
     void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_spectrumSink = spectrumSink; }
+    void setChannel(ChannelAPI *channel) { m_channel = channel; }
 
 	double getMagSq() const { return m_magsq; }
 
@@ -103,6 +107,7 @@ private:
 		RSRunning
 	};
 
+    ChannelAPI *m_channel;
     int m_channelSampleRate;
     int m_channelFrequencyOffset;
 	BFMDemodSettings m_settings;
@@ -158,6 +163,9 @@ private:
 	PhaseDiscriminators m_phaseDiscri;
 
     BasebandSampleSink *m_spectrumSink;
+
+    QVector<qint16> m_demodBuffer;
+    int m_demodBufferFill;
 };
 
 #endif // INCLUDE_BFMDEMODSINK_H

plugins/feature/demodanalyzer/demodanalyzersettings.cpp

@@ -27,6 +27,7 @@ const QStringList DemodAnalyzerSettings::m_channelTypes = {
     QStringLiteral("AISMod"),
     QStringLiteral("AMDemod"),
     QStringLiteral("AMMod"),
+    QStringLiteral("BFMDemod"),
     QStringLiteral("DABDemod"),
     QStringLiteral("DSDDemod"),
     QStringLiteral("NFMDemod"),
@@ -45,6 +46,7 @@ const QStringList DemodAnalyzerSettings::m_channelURIs = {
     QStringLiteral("sdrangel.channel.modais"),
     QStringLiteral("sdrangel.channel.amdemod"),
     QStringLiteral("sdrangel.channeltx.modam"),
+    QStringLiteral("sdrangel.channel.bfm"),
     QStringLiteral("sdrangel.channel.dabdemod"),
     QStringLiteral("sdrangel.channel.dsddemod"),
     QStringLiteral("sdrangel.channel.nfmdemod"),