Fix load profile not loading resolution.

Author: Mysticial

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

@@ -96,6 +96,8 @@ CameraVideoSource::CameraVideoSource(
     , m_last_frame(logger)
     , m_snapshot_manager(logger, m_last_frame)
 {
+//    cout << "desired_resolution = " << desired_resolution.width << " x " << desired_resolution.height << endl;
+
     if (!info){
         return;
     }

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp

@@ -12,9 +12,9 @@
 #include "VideoSources/VideoSource_Null.h"
 #include "VideoSession.h"
 
-// #include <iostream>
-// using std::cout;
-// using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -86,7 +86,7 @@ void VideoSession::get(VideoSourceOption& option){
     option = m_option;
 }
 void VideoSession::set(const VideoSourceOption& option){
-    set_source(option.descriptor());
+    set_source(option.descriptor(), option.m_resolution);
 }
 
 void VideoSession::reset(){
@@ -119,9 +119,12 @@ void VideoSession::reset(){
         );
     });
 }
-void VideoSession::set_source(const std::shared_ptr<VideoSourceDescriptor>& device){
+void VideoSession::set_source(
+    const std::shared_ptr<VideoSourceDescriptor>& device,
+    Resolution resolution
+){
     m_logger.log("Changing video...", COLOR_GREEN);
-    dispatch_to_main_thread([this, device]{
+    dispatch_to_main_thread([this, device, resolution]{
         std::lock_guard<std::mutex> lg0(m_reset_lock);
         if (*m_descriptor == *device && !m_descriptor->should_reload()){
             return;
@@ -140,7 +143,9 @@ void VideoSession::set_source(const std::shared_ptr<VideoSourceDescriptor>& devi
             m_option.set_descriptor(device);
             m_descriptor = device;
 
-            Resolution desired_resolution = m_option.m_resolution;
+            Resolution desired_resolution = resolution ? resolution : m_option.m_resolution;
+//            cout << "VideoSession::set_source(): " << &m_option << " - " << desired_resolution.width << " x " << desired_resolution.height << endl;
+
             m_video_source = device->make_VideoSource(m_logger, desired_resolution);
 
             if (m_video_source){

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h

@@ -145,7 +145,10 @@ class VideoSession
     //  referenced video source option (aka the VideoSourceOption passed to the
     //  VideoSession constructor).
     //  The change is dispatched to the Qt main thread to execute.
-    void set_source(const std::shared_ptr<VideoSourceDescriptor>& device);
+    void set_source(
+        const std::shared_ptr<VideoSourceDescriptor>& device,
+        Resolution resolution = {}
+    );
     //  Change video resolution.
     //  This will trigger a video source reset.
     //  Change of resolution will be reflected on the internal referenced video

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp

@@ -87,6 +87,7 @@ void VideoSourceOption::load_json(const JsonValue& json){
                     break;
                 }
                 m_resolution = Resolution(width, height);
+//                cout << "VideoSourceOption::load_json(): " << this << " - " << width << " x " << height << endl;
             }while (false);
         }