DATV: DATVVideoRender: use atomic instead of plain bool to handle running state

plugins/channelrx/demoddatv/datvideorender.cpp

@@ -33,8 +33,7 @@ DATVideoRender::DATVideoRender(QWidget *parent) : TVScreen(true, parent), m_pare
 {
     installEventFilter(this);
     m_isFullScreen = false;
-    m_running = false;
+    m_running = 0;
-
     m_isFFMPEGInitialized = false;
     m_isOpen = false;
     m_formatCtx = nullptr;
@@ -381,11 +380,6 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
     unsigned char *ptrIOBuffer = nullptr;
     AVIOContext *ioCtx = nullptr;
 
-    if (m_running)
-    {
-        return false;
-    }
-
     if (device == nullptr)
     {
         qDebug() << "DATVideoRender::OpenStream QIODevice is nullptr";
@@ -407,8 +401,8 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
     }
 
     //Only once execution
-    m_running = true;
+    if (m_running.testAndSetOrdered(0,1))
-
+    {
         MetaData.OK_Data = true;
         emit onMetaDataChanged(&MetaData);
 
@@ -417,14 +411,22 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
         if (!m_isFFMPEGInitialized)
         {
             qDebug() << "DATVideoRender::OpenStream FFMPEG not initialized";
-        m_running = false;
+#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";
-        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            m_running.storeRelaxed(0);
+#else
+            m_running.store(0);
+#endif
             return false;
         }
 
@@ -435,7 +437,11 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
         if (m_formatCtx == nullptr)
         {
             qDebug() << "DATVideoRender::OpenStream cannot alloc format FFMPEG context";
-        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            m_running.storeRelaxed(0);
+#else
+            m_running.store(0);
+#endif
             return false;
         }
 
@@ -455,18 +461,32 @@ bool DATVideoRender::OpenStream(DATVideostream *device)
         if (avformat_open_input(&m_formatCtx, nullptr, nullptr, nullptr) < 0)
         {
             qDebug() << "DATVideoRender::OpenStream cannot open stream";
-        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            m_running.storeRelaxed(0);
+#else
+            m_running.store(0);
+#endif
             return false;
         }
 
         if (!PreprocessStream())
         {
-        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            m_running.storeRelaxed(0);
+#else
+            m_running.store(0);
+#endif
             return false;
         }
 
         m_isOpen = true;
-    m_running = false;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        m_running.storeRelaxed(0);
+#else
+        m_running.store(0);
+#endif
+    }
 
     return true;
 }
@@ -483,20 +503,18 @@ bool DATVideoRender::RenderStream()
         return false;
     }
 
-    if (m_running)
-    {
-        return false;
-    }
-
     //Only once execution
-    m_running = true;
+    if (m_running.testAndSetOrdered(0,1))
-
+    {
         //********** Rendering **********
-
         if (av_read_frame(m_formatCtx, &packet) < 0)
         {
             qDebug() << "DATVideoRender::RenderStream reading packet error";
-        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            m_running.storeRelaxed(0);
+#else
+            m_running.store(0);
+#endif
             return false;
         }
 
@@ -548,7 +566,11 @@ bool DATVideoRender::RenderStream()
                         {
                             qDebug() << "DATVideoRender::RenderStream cannont init video data converter";
                             m_swsCtx = nullptr;
-                        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+                            m_running.storeRelaxed(0);
+#else
+                            m_running.store(0);
+#endif
                             return false;
                         }
 
@@ -563,7 +585,11 @@ bool DATVideoRender::RenderStream()
                             qDebug() << "DATVideoRender::RenderStream cannont init video image buffer";
                             sws_freeContext(m_swsCtx);
                             m_swsCtx = nullptr;
-                        m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+                            m_running.storeRelaxed(0);
+#else
+                            m_running.store(0);
+#endif
                             return false;
                         }
 
@@ -587,7 +613,11 @@ 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";
-                    m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+                        m_running.storeRelaxed(0);
+#else
+                        m_running.store(0);
+#endif
                         return false;
                     }
 
@@ -670,10 +700,15 @@ bool DATVideoRender::RenderStream()
         }
 
         av_packet_unref(&packet);
-
         //********** Rendering **********
 
-    m_running = false;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        m_running.storeRelaxed(0);
+#else
+        m_running.store(0);
+#endif
+    }
+
     return true;
 }
 
@@ -714,12 +749,6 @@ void DATVideoRender::setResampler()
 
 bool DATVideoRender::CloseStream(QIODevice *device)
 {
-
-    if (m_running)
-    {
-        return false;
-    }
-
     if (!device)
     {
         qDebug() << "DATVideoRender::CloseStream QIODevice is nullptr";
@@ -739,8 +768,8 @@ bool DATVideoRender::CloseStream(QIODevice *device)
     }
 
     //Only once execution
-    m_running = true;
+    if (m_running.testAndSetOrdered(0,1))
-
+    {
         // maybe done in the avcodec_close
         //    avformat_close_input(&m_formatCtx);
         //    m_formatCtx=nullptr;
@@ -765,13 +794,19 @@ bool DATVideoRender::CloseStream(QIODevice *device)
 
         device->close();
         m_isOpen = false;
-    m_running = false;
         m_currentRenderWidth = -1;
         m_currentRenderHeight = -1;
 
         ResetMetaData();
         emit onMetaDataChanged(&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

@@ -114,7 +114,7 @@ class DATVideoRender : public TVScreen
     Qt::WindowFlags m_originalWindowFlags;
     QSize m_originalSize;
 
-    bool m_running;
+    QAtomicInt m_running;
     bool m_isFullScreen;
 
     bool m_isFFMPEGInitialized;