Still image video source.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -493,10 +493,12 @@ file(GLOB MAIN_SOURCES
     Source/CommonFramework/VideoPipeline/VideoSource.h
     Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp
     Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h
-    Source/CommonFramework/VideoPipeline/VideoSource_Camera.cpp
-    Source/CommonFramework/VideoPipeline/VideoSource_Camera.h
-    Source/CommonFramework/VideoPipeline/VideoSource_Null.cpp
-    Source/CommonFramework/VideoPipeline/VideoSource_Null.h
+    Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.cpp
+    Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h
+    Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.cpp
+    Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h
+    Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp
+    Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h
     Source/CommonFramework/Windows/ButtonDiagram.cpp
     Source/CommonFramework/Windows/ButtonDiagram.h
     Source/CommonFramework/Windows/DpiScaler.cpp

SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp

@@ -17,9 +17,9 @@
 #include "AudioSelectorWidget.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -105,7 +105,7 @@ AudioSelectorWidget::AudioSelectorWidget(QWidget& parent, AudioSession& session)
             if (index <= 0 || index >= (int)m_input_audios.size() + 2){
                 m_session.clear_audio_input();
             }else if (index == 1){
-                std::string path = QFileDialog::getOpenFileName(this, tr("Open audio file"), ".", "*.wav *.mp3").toStdString();
+                std::string path = QFileDialog::getOpenFileName(this, "Open audio file", ".", "*.wav *.mp3").toStdString();
                 if (path.empty()){
                     m_session.clear_audio_input();
                 }else{

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

@@ -91,7 +91,8 @@ CameraVideoSource::CameraVideoSource(
     const CameraInfo& info,
     Resolution desired_resolution
 )
-    : m_logger(logger)
+    : VideoSource(true)
+    , m_logger(logger)
     , m_last_image_timestamp(WallClock::min())
     , m_stats_conversion("ConvertFrame", "ms", 1000, std::chrono::seconds(10))
     , m_last_frame_seqnum(0)
@@ -205,15 +206,6 @@ void CameraVideoSource::set_video_output(QGraphicsVideoItem& item){
 
 
 
-Resolution CameraVideoSource::current_resolution() const{
-    //  No to lock since it doesn't change after construction.
-    return m_resolution;
-}
-std::vector<Resolution> CameraVideoSource::supported_resolutions() const{
-    //  No to lock since it doesn't change after construction.
-    return m_resolutions;
-}
-
 VideoSnapshot CameraVideoSource::snapshot(){
     //  This will be coming in from random threads. (not the main thread)
     //  So we efficiently grab the last frame to unblock the main thread.
@@ -263,7 +255,7 @@ VideoSnapshot CameraVideoSource::snapshot(){
     return VideoSnapshot(m_last_image, m_last_image_timestamp);
 }
 
-QWidget* CameraVideoSource::make_QtWidget(QWidget* parent){
+QWidget* CameraVideoSource::make_display_QtWidget(QWidget* parent){
     return new CameraVideoDisplay(parent, *this);
 }
 

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

@@ -109,12 +109,16 @@ class CameraVideoSource : public QObject, public VideoSource{
         Resolution desired_resolution
     );
 
-    virtual Resolution current_resolution() const override;
-    virtual std::vector<Resolution> supported_resolutions() const override;
+    virtual Resolution current_resolution() const override{
+        return m_resolution;
+    }
+    virtual const std::vector<Resolution>& supported_resolutions() const override{
+        return m_resolutions;
+    }
 
     virtual VideoSnapshot snapshot() override;
 
-    virtual QWidget* make_QtWidget(QWidget* parent) override;
+    virtual QWidget* make_display_QtWidget(QWidget* parent) override;
 
 private:
     void set_video_output(QGraphicsVideoItem& item);

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

@@ -84,7 +84,8 @@ CameraVideoSource::CameraVideoSource(
     const CameraInfo& info,
     Resolution desired_resolution
 )
-    : m_logger(logger)
+    : VideoSource(true)
+    , m_logger(logger)
     , m_last_image_timestamp(WallClock::min())
     , m_stats_conversion("ConvertFrame", "ms", 1000, std::chrono::seconds(10))
     , m_last_frame_seqnum(0)
@@ -174,15 +175,6 @@ CameraVideoSource::CameraVideoSource(
     m_camera->start();
 }
 
-Resolution CameraVideoSource::current_resolution() const{
-    //  No to lock since it doesn't change after construction.
-    return m_resolution;
-}
-std::vector<Resolution> CameraVideoSource::supported_resolutions() const{
-    //  No to lock since it doesn't change after construction.
-    return m_resolutions;
-}
-
 VideoSnapshot CameraVideoSource::snapshot(){
     //  Prevent multiple concurrent screenshots from entering here.
     std::lock_guard<std::mutex> lg(m_snapshot_lock);
@@ -229,7 +221,7 @@ VideoSnapshot CameraVideoSource::snapshot(){
     return VideoSnapshot(m_last_image, m_last_image_timestamp);
 }
 
-QWidget* CameraVideoSource::make_QtWidget(QWidget* parent){
+QWidget* CameraVideoSource::make_display_QtWidget(QWidget* parent){
     return new CameraVideoDisplay(parent, *this);
 }
 

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

@@ -56,12 +56,16 @@ class CameraVideoSource : public QObject, public VideoSource{
         Resolution desired_resolution
     );
 
-    virtual Resolution current_resolution() const override;
-    virtual std::vector<Resolution> supported_resolutions() const override;
+    virtual Resolution current_resolution() const override{
+        return m_resolution;
+    }
+    virtual const std::vector<Resolution>& supported_resolutions() const override{
+        return m_resolutions;
+    }
 
     virtual VideoSnapshot snapshot() override;
 
-    virtual QWidget* make_QtWidget(QWidget* parent) override;
+    virtual QWidget* make_display_QtWidget(QWidget* parent) override;
 
 private:
 //    void set_video_output(QGraphicsVideoItem& item);

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp

@@ -42,7 +42,7 @@ VideoDisplayWidget::VideoDisplayWidget(
 
     VideoSource* source = video_session.current_source();
     if (source){
-        m_video = source->make_QtWidget(this);
+        m_video = source->make_display_QtWidget(this);
         this->add_widget(*m_video);
     }
 
@@ -136,7 +136,7 @@ void VideoDisplayWidget::clear_video_source(){
 void VideoDisplayWidget::post_startup(VideoSource* source){
     clear_video_source();
     if (source){
-        m_video = source->make_QtWidget(this);
+        m_video = source->make_display_QtWidget(this);
         this->add_widget(*m_video);
         set_aspect_ratio(source->current_resolution().aspect_ratio());
         m_overlay->raise();

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp

@@ -12,8 +12,9 @@
 #include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
 #include "VideoSourceSelectorWidget.h"
 
-#include "CommonFramework/VideoPipeline/VideoSource_Null.h"
-#include "CommonFramework/VideoPipeline/VideoSource_Camera.h"
+#include "CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h"
+#include "CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h"
+#include "CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h"
 
 //#include <iostream>
 //using std::cout;
@@ -55,6 +56,7 @@ VideoSourceSelectorWidget::VideoSourceSelectorWidget(Logger& logger, VideoSessio
         m_sources_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
         this, [this](int index){
             if (0 <= index && index < (int)m_sources.size()){
+                m_sources[index]->run_post_select();
                 m_session.set_source(m_sources[index]);
             }else{
                 m_session.set_source(std::make_unique<VideoSourceDescriptor_Null>());
@@ -90,8 +92,16 @@ void VideoSourceSelectorWidget::update_source_list(){
     m_sources.clear();
 
     std::shared_ptr<const VideoSourceDescriptor> current_descriptor = m_session.descriptor();
-    m_sources.emplace_back(std::make_unique<VideoSourceDescriptor_Null>());
 
+    //  Add all the static options.
+    {
+        VideoSourceOption option;
+        m_session.get(option);
+        m_sources.emplace_back(option.get_descriptor_from_cache(VideoSourceType::None));
+        m_sources.emplace_back(option.get_descriptor_from_cache(VideoSourceType::StillImage));
+    }
+
+    //  Now add all the cameras.
     for (const CameraInfo& info : get_all_cameras()){
         m_sources.emplace_back(std::make_unique<VideoSourceDescriptor_Camera>(info));
     }

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h

@@ -39,7 +39,7 @@ class VideoSourceSelectorWidget : public QWidget, public VideoSession::StateList
     QComboBox* m_resolution_box;
     QPushButton* m_reset_button;
 
-    std::vector<std::shared_ptr<const VideoSourceDescriptor>> m_sources;
+    std::vector<std::shared_ptr<VideoSourceDescriptor>> m_sources;
     std::vector<Resolution> m_resolutions;
 
 };

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp

@@ -9,7 +9,7 @@
 #include "CommonFramework/GlobalServices.h"
 #include "CommonFramework/VideoPipeline/VideoPipelineOptions.h"
 #include "Backends/VideoFrameQt.h"
-#include "VideoSource_Null.h"
+#include "VideoSources/VideoSource_Null.h"
 #include "VideoSession.h"
 
 //#include <iostream>
@@ -119,7 +119,7 @@ void VideoSession::reset(){
         );
     });
 }
-void VideoSession::set_source(const std::shared_ptr<const VideoSourceDescriptor>& device){
+void VideoSession::set_source(const std::shared_ptr<VideoSourceDescriptor>& device){
     m_logger.log("Changing video...", COLOR_GREEN);
     dispatch_to_main_thread([this, device]{
         std::lock_guard<std::mutex> lg0(m_reset_lock);
@@ -225,7 +225,7 @@ void VideoSession::on_rendered_frame(WallClock timestamp){
 void VideoSession::on_watchdog_timeout(){
     {
         ReadSpinLock lg(m_state_lock);
-        if (!m_video_source){
+        if (!m_video_source || !m_video_source->allow_watchdog_reset()){
             return;
         }
     }