DATV: fixed DATVideoRender crash at close time when active: DATVDemodBaseband delete later

plugins/channelrx/demoddatv/datvdemod.cpp

@@ -35,9 +35,8 @@ DATVDemod::DATVDemod(DeviceAPI *deviceAPI) :
 {
     qDebug("DATVDemod::DATVDemod");
     setObjectName("DATVDemod");
-    m_thread = new QThread(this);
     m_basebandSink = new DATVDemodBaseband();
-    m_basebandSink->moveToThread(m_thread);
+    m_basebandSink->moveToThread(&m_thread);
 
     applySettings(m_settings, true);
 
@@ -51,8 +50,12 @@ DATVDemod::~DATVDemod()
     qDebug("DATVDemod::~DATVDemod");
     m_deviceAPI->removeChannelSinkAPI(this);
     m_deviceAPI->removeChannelSink(this);
-    delete m_basebandSink;
+
-    delete m_thread;
+    if (m_basebandSink->isRunning()) {
+        stop();
+    }
+
+    m_basebandSink->deleteLater();
 }
 
 void DATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
@@ -70,14 +73,19 @@ void DATVDemod::start()
     }
 
     m_basebandSink->reset();
-    m_thread->start();
+    m_basebandSink->startWork();
+    m_thread.start();
+
+    DATVDemodBaseband::MsgConfigureDATVDemodBaseband *msg = DATVDemodBaseband::MsgConfigureDATVDemodBaseband::create(m_settings, true);
+    m_basebandSink->getInputMessageQueue()->push(msg);
 }
 
 void DATVDemod::stop()
 {
     qDebug("DATVDemod::stop");
-	m_thread->exit();
+	m_basebandSink->stopWork();
-	m_thread->wait();
+	m_thread.quit();
+	m_thread.wait();
 }
 
 bool DATVDemod::handleMessage(const Message& cmd)

plugins/channelrx/demoddatv/datvdemod.h

@@ -22,6 +22,8 @@
 
 class DeviceAPI;
 
+#include <QThread>
+
 #include "channel/channelapi.h"
 #include "dsp/basebandsamplesink.h"
 #include "dsp/devicesamplesource.h"
@@ -30,7 +32,6 @@ class DeviceAPI;
 
 #include "datvdemodbaseband.h"
 
-
 class DATVDemod : public BasebandSampleSink, public ChannelAPI
 {
 	Q_OBJECT
@@ -115,7 +116,7 @@ public:
 
 private:
     DeviceAPI* m_deviceAPI;
-    QThread *m_thread;
+    QThread m_thread;
     DATVDemodBaseband* m_basebandSink;
     DATVDemodSettings m_settings;
     int m_basebandSampleRate; //!< stored from device message used when starting baseband sink

plugins/channelrx/demoddatv/datvdemodbaseband.cpp

@@ -27,21 +27,12 @@ MESSAGE_CLASS_DEFINITION(DATVDemodBaseband::MsgConfigureDATVDemodBaseband, Messa
 MESSAGE_CLASS_DEFINITION(DATVDemodBaseband::MsgConfigureChannelizer, Message)
 
 DATVDemodBaseband::DATVDemodBaseband() :
+    m_running(false),
     m_mutex(QMutex::Recursive)
 {
     qDebug("DATVDemodBaseband::DATVDemodBaseband");
     m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000));
     m_channelizer = new DownChannelizer(&m_sink);
-
-    QObject::connect(
-        &m_sampleFifo,
-        &SampleSinkFifo::dataReady,
-        this,
-        &DATVDemodBaseband::handleData,
-        Qt::QueuedConnection
-    );
-
-    connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
 }
 
 DATVDemodBaseband::~DATVDemodBaseband()
@@ -55,6 +46,33 @@ void DATVDemodBaseband::reset()
     m_sampleFifo.reset();
 }
 
+void DATVDemodBaseband::startWork()
+{
+    QMutexLocker mutexLocker(&m_mutex);
+    QObject::connect(
+        &m_sampleFifo,
+        &SampleSinkFifo::dataReady,
+        this,
+        &DATVDemodBaseband::handleData,
+        Qt::QueuedConnection
+    );
+    connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
+    m_running = true;
+}
+
+void DATVDemodBaseband::stopWork()
+{
+    QMutexLocker mutexLocker(&m_mutex);
+    disconnect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
+    QObject::disconnect(
+        &m_sampleFifo,
+        &SampleSinkFifo::dataReady,
+        this,
+        &DATVDemodBaseband::handleData
+    );
+    m_running = false;
+}
+
 void DATVDemodBaseband::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
 {
     m_sampleFifo.write(begin, end);

plugins/channelrx/demoddatv/datvdemodbaseband.h

@@ -81,6 +81,8 @@ public:
     DATVDemodBaseband();
     ~DATVDemodBaseband();
     void reset();
+    void startWork();
+    void stopWork();
     void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
     MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
     int getChannelSampleRate() const;
@@ -102,6 +104,7 @@ public:
     int getModcodModulation() const { return m_sink.getModcodModulation(); }
     int getModcodCodeRate() const { return m_sink.getModcodCodeRate(); }
     bool isCstlnSetByModcod() const { return m_sink.isCstlnSetByModcod(); }
+    bool isRunning() const { return m_running; }
 
 private:
     SampleSinkFifo m_sampleFifo;
@@ -109,6 +112,7 @@ private:
     DATVDemodSink m_sink;
 	MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
     DATVDemodSettings m_settings;
+    bool m_running;
     QMutex m_mutex;
 
     bool handleMessage(const Message& cmd);

plugins/channelrx/demoddatv/datvdemodsink.cpp

@@ -75,9 +75,8 @@ DATVDemodSink::~DATVDemodSink()
         {
             m_objRenderThread->stopRendering();
             m_objRenderThread->quit();
+            m_objRenderThread->wait();
         }
-
-        m_objRenderThread->wait(2000);
     }
 
     CleanUpDATVFramework();

plugins/channelrx/demoddatv/datvideorender.cpp

@@ -33,7 +33,6 @@ DATVideoRender::DATVideoRender(QWidget *parent) : TVScreen(true, parent), m_pare
 {
     installEventFilter(this);
     m_isFullScreen = false;
-    m_running = 0;
     m_isFFMPEGInitialized = false;
     m_isOpen = false;
     m_formatCtx = nullptr;
@@ -69,6 +68,8 @@ DATVideoRender::DATVideoRender(QWidget *parent) : TVScreen(true, parent), m_pare
 
 DATVideoRender::~DATVideoRender()
 {
+    qDebug("DATVideoRender::~DATVideoRender");
+
     if (m_audioSWR) {
         swr_free(&m_audioSWR);
     }
@@ -387,9 +388,6 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
         return false;
     }
 
-    //Only once execution
-    if (m_running.testAndSetOrdered(0,1))
-    {
     m_metaData.OK_Data = true;
     emit onMetaDataChanged(new DataTSMetaData2(m_metaData));
 
@@ -398,22 +396,12 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
     if (!m_isFFMPEGInitialized)
     {
         qDebug() << "DATVideoRender::OpenStream FFMPEG not initialized";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            m_running.storeRelaxed(0);
-#else
-            m_running.store(0);
-#endif
         return false;
     }
 
     if (!device->open(QIODevice::ReadOnly))
     {
         qDebug() << "DATVideoRender::OpenStream cannot open QIODevice";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            m_running.storeRelaxed(0);
-#else
-            m_running.store(0);
-#endif
         return false;
     }
 
@@ -424,23 +412,20 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
     if (m_formatCtx == nullptr)
     {
         qDebug() << "DATVideoRender::OpenStream cannot alloc format FFMPEG context";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            m_running.storeRelaxed(0);
-#else
-            m_running.store(0);
-#endif
         return false;
     }
 
     ptrIOBuffer = (unsigned char *)av_malloc(ioBufferSize + AV_INPUT_BUFFER_PADDING_SIZE);
 
-        ioCtx = avio_alloc_context(ptrIOBuffer,
+    ioCtx = avio_alloc_context(
+        ptrIOBuffer,
         ioBufferSize,
         0,
         reinterpret_cast<void *>(device),
         &ReadFunction,
         nullptr,
-                                    &SeekFunction);
+        &SeekFunction
+    );
 
     m_formatCtx->pb = ioCtx;
     m_formatCtx->flags |= AVFMT_FLAG_CUSTOM_IO;
@@ -448,33 +433,17 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
     if (avformat_open_input(&m_formatCtx, nullptr, nullptr, nullptr) < 0)
     {
         qDebug() << "DATVideoRender::OpenStream cannot open stream";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            m_running.storeRelaxed(0);
-#else
-            m_running.store(0);
-#endif
         return false;
     }
 
     if (!PreprocessStream())
     {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            m_running.storeRelaxed(0);
-#else
-            m_running.store(0);
-#endif
         return false;
     }
 
+    qDebug("DATVideoRender::OpenStream: successful");
     m_isOpen = true;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-        m_running.storeRelaxed(0);
-#else
-        m_running.store(0);
-#endif
-    }
-
     return true;
 }
 
@@ -490,18 +459,10 @@ bool DATVideoRender::RenderStream()
         return false;
     }
 
-    //Only once execution
-    if (m_running.testAndSetOrdered(0,1))
-    {
     //********** Rendering **********
     if (av_read_frame(m_formatCtx, &packet) < 0)
     {
         qDebug() << "DATVideoRender::RenderStream reading packet error";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-            m_running.storeRelaxed(0);
-#else
-            m_running.store(0);
-#endif
         return false;
     }
 
@@ -553,11 +514,6 @@ bool DATVideoRender::RenderStream()
                     {
                         qDebug() << "DATVideoRender::RenderStream cannont init video data converter";
                         m_swsCtx = nullptr;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-                            m_running.storeRelaxed(0);
-#else
-                            m_running.store(0);
-#endif
                         return false;
                     }
 
@@ -572,11 +528,6 @@ bool DATVideoRender::RenderStream()
                         qDebug() << "DATVideoRender::RenderStream cannont init video image buffer";
                         sws_freeContext(m_swsCtx);
                         m_swsCtx = nullptr;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-                            m_running.storeRelaxed(0);
-#else
-                            m_running.store(0);
-#endif
                         return false;
                     }
 
@@ -600,11 +551,6 @@ bool DATVideoRender::RenderStream()
                 if (sws_scale(m_swsCtx, m_frame->data, m_frame->linesize, 0, m_frame->height, m_pbytDecodedData, m_pintDecodedLineSize) < 0)
                 {
                     qDebug() << "DATVideoRender::RenderStream error converting video frame to RGB";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-                        m_running.storeRelaxed(0);
-#else
-                        m_running.store(0);
-#endif
                     return false;
                 }
 
@@ -651,7 +597,7 @@ bool DATVideoRender::RenderStream()
                 });
                 int ret = m_audioFifo->write((const quint8*) &audioBuffer[0], samples_per_channel);
                 if (ret < samples_per_channel) {
-                        qDebug("DATVideoRender::RenderStream: audio samples missing %d/%d written", ret, samples_per_channel);
+                    // qDebug("DATVideoRender::RenderStream: audio samples missing %d/%d written", ret, samples_per_channel);
                 }
 
                 // buffered writing:
@@ -688,13 +634,6 @@ bool DATVideoRender::RenderStream()
     av_packet_unref(&packet);
     //********** Rendering **********
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-        m_running.storeRelaxed(0);
-#else
-        m_running.store(0);
-#endif
-    }
-
     return true;
 }
 
@@ -735,6 +674,8 @@ void DATVideoRender::setResampler()
 
 bool DATVideoRender::CloseStream(QIODevice *device)
 {
+    qDebug("DATVideoRender::CloseStream");
+
     if (!device)
     {
         qDebug() << "DATVideoRender::CloseStream QIODevice is nullptr";
@@ -753,9 +694,6 @@ bool DATVideoRender::CloseStream(QIODevice *device)
         return false;
     }
 
-    //Only once execution
-    if (m_running.testAndSetOrdered(0,1))
-    {
     // maybe done in the avcodec_close
     //    avformat_close_input(&m_formatCtx);
     //    m_formatCtx=nullptr;
@@ -784,14 +722,6 @@ bool DATVideoRender::CloseStream(QIODevice *device)
     m_currentRenderHeight = -1;
 
     ResetMetaData();
-        emit onMetaDataChanged(new DataTSMetaData2(m_metaData));
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-        m_running.storeRelaxed(0);
-#else
-        m_running.store(0);
-#endif
-    }
 
     return true;
 }

plugins/channelrx/demoddatv/datvideorender.h

@@ -119,7 +119,6 @@ class DATVideoRender : public TVScreen
     Qt::WindowFlags m_originalWindowFlags;
     QSize m_originalSize;
 
-    QAtomicInt m_running;
     bool m_isFullScreen;
 
     bool m_isFFMPEGInitialized;
@@ -188,32 +187,32 @@ class DATVideoRenderThread : public QThread
 
     void setStreamAndRenderer(DATVideoRender *renderer, DATVideostream *stream)
     {
+        m_renderingVideo = false;
         m_renderer = renderer;
         m_stream = stream;
-        m_renderingVideo = false;
     }
 
     void run()
     {
-        if (m_renderingVideo)
+        if (m_renderingVideo) {
-        {
             return;
         }
 
-        if ((m_renderer == nullptr) || (m_stream == nullptr))
+        if ((m_renderer == nullptr) || (m_stream == nullptr)) {
-        {
             return;
         }
 
         m_renderingVideo = m_renderer->OpenStream(m_stream);
 
-        if (!m_renderingVideo)
+        if (!m_renderingVideo) {
-        {
             return;
         }
 
-        while ((m_renderer->RenderStream()) && (m_renderingVideo == true))
+        while (m_renderingVideo == true)
         {
+            if (!m_renderer->RenderStream()) {
+                break;
+            }
         }
 
         m_renderer->CloseStream(m_stream);