Process events while waiting for camera thread to spin up. Cleanup.

Author: Mysticial

Common/Qt/SpinWaitWithEvents.h

@@ -0,0 +1,46 @@
+/*  SpinWaitWithEvents
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SpinWaitWithEvents_H
+#define PokemonAutomation_SpinWaitWithEvents_H
+
+#include <atomic>
+#include <QApplication>
+#include "Common/Cpp/Concurrency/SpinPause.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+class SpinWaitWithEvents{
+public:
+    SpinWaitWithEvents()
+        : m_finished(false)
+    {}
+    void process_events_while_waiting() const{
+        if (m_finished.load(std::memory_order_acquire)){
+            return;
+        }
+        do{
+            QApplication::processEvents();
+            pause();
+        }while (!m_finished.load(std::memory_order_acquire));
+    }
+    void signal(){
+        m_finished.store(true, std::memory_order_release);
+    }
+
+private:
+    std::atomic<bool> m_finished;
+};
+
+
+
+}
+#endif

SerialPrograms/CMakeLists.txt

@@ -272,6 +272,7 @@ file(GLOB MAIN_SOURCES
     ../Common/Qt/Options/TimeExpressionWidget.h
     ../Common/Qt/Redispatch.cpp
     ../Common/Qt/Redispatch.h
+    ../Common/Qt/SpinWaitWithEvents.h
     ../Common/Qt/StringToolsQt.cpp
     ../Common/Qt/StringToolsQt.h
     ../Common/Qt/TimeQt.cpp

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp

@@ -148,11 +148,8 @@ CameraVideoSource::CameraVideoSource(
     m_logger.log("Resolution: " + m_resolution.to_string());
 
     m_camera.reset(new QCameraThread(m_logger, *device, *format));
-//    m_camera.reset(new QCamera(*device));
-//    m_camera->setCameraFormat(*format);
 
     m_capture_session.reset(new QMediaCaptureSession());
-//    m_capture_session->setCamera(m_camera.get());
     m_capture_session->setCamera(&m_camera->camera());
 
 #if 0
@@ -188,8 +185,7 @@ void CameraVideoSource::set_video_output(QGraphicsVideoItem& item){
                 return;
             }
             report_source_frame(std::make_shared<VideoFrame>(now, frame));
-        }//,
-//        Qt::DirectConnection
+        }
     );
 }
 

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h

@@ -127,7 +127,6 @@ class CameraVideoSource : public QObject, public VideoSource{
     Logger& m_logger;
     Resolution m_resolution;
 
-//    std::unique_ptr<QCamera> m_camera;
     std::unique_ptr<QCameraThread> m_camera;
     std::unique_ptr<QVideoSink> m_video_sink;
     std::unique_ptr<QMediaCaptureSession> m_capture_session;

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp

@@ -140,11 +140,8 @@ CameraVideoSource::CameraVideoSource(
     m_logger.log("Resolution: " + m_resolution.to_string());
 
     m_camera.reset(new QCameraThread(m_logger, *device, *format));
-//    m_camera.reset(new QCamera(*device));
-//    m_camera->setCameraFormat(*format);
     m_video_sink.reset(new QVideoSink());
     m_capture.reset(new QMediaCaptureSession());
-//    m_capture->setCamera(m_camera.get());
     m_capture->setCamera(&m_camera->camera());
     m_capture->setVideoSink(m_video_sink.get());
 
@@ -167,8 +164,6 @@ CameraVideoSource::CameraVideoSource(
             report_source_frame(std::make_shared<VideoFrame>(now, frame));
         }
     );
-
-//    m_camera->start();
 }
 
 

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h

@@ -86,7 +86,6 @@ class CameraVideoSource : public QObject, public VideoSource{
 
     std::mutex m_snapshot_lock;
 
-//    std::unique_ptr<QCamera> m_camera;
     std::unique_ptr<QCameraThread> m_camera;
     std::unique_ptr<QVideoSink> m_video_sink;
     std::unique_ptr<QMediaCaptureSession> m_capture;

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QCameraThread.h

@@ -10,6 +10,7 @@
 #include <QThread>
 #include <QCamera>
 #include "Common/Cpp/AbstractLogger.h"
+#include "Common/Qt/SpinWaitWithEvents.h"
 
 //#include <iostream>
 //using std::cout;
@@ -19,8 +20,6 @@ namespace PokemonAutomation{
 
 
 class QCameraThread : public QThread{
-    Q_OBJECT
-
 public:
     QCameraThread(
         Logger& logger,
@@ -34,8 +33,7 @@ class QCameraThread : public QThread{
     {
         start();
 
-        std::unique_lock<std::mutex> lg(m_lock);
-        m_cv.wait(lg, [this]{ return m_camera != nullptr; });
+        m_spin_waiter.process_events_while_waiting();
     }
     ~QCameraThread(){
         quit();
@@ -62,10 +60,7 @@ class QCameraThread : public QThread{
 
         camera.start();
 
-        {
-            std::lock_guard<std::mutex> lg(m_lock);
-        }
-        m_cv.notify_all();
+        m_spin_waiter.signal();
 
 //        cout << "start" << endl;
         exec();
@@ -80,9 +75,7 @@ class QCameraThread : public QThread{
     QCameraDevice m_device;
     QCameraFormat m_format;
     QCamera* m_camera;
-
-    std::mutex m_lock;
-    std::condition_variable m_cv;
+    SpinWaitWithEvents m_spin_waiter;
 };