additional code review changes. remove API method, implement platform init on a separate thread with 2 sec delay

Author: gilpazintel

src/core/device-interface.h

@@ -70,8 +70,6 @@ class device_interface
 
     virtual bool contradicts( const stream_profile_interface * a,
                               const std::vector< stream_profile > & others ) const = 0;
-
-    virtual void initialize() = 0;
 };
 
 

src/device.h

@@ -89,8 +89,6 @@ class device
     bool device_changed_notifications_on() const { return _device_change_subscription.is_active(); }
 
     format_conversion get_format_conversion() const;
-    
-    virtual void initialize() override {};
 
 protected:
     int add_sensor(const std::shared_ptr<sensor_interface>& sensor_base);

src/ds/d400/d400-fw-update-device.h

@@ -19,7 +19,6 @@ namespace librealsense
         virtual bool check_fw_compatibility(const std::vector<uint8_t>& image) const override;
 
         float compute_progress(float progress, float start, float end, float threshold) const override;
-        virtual void initialize() override {};
     private:
         std::string parse_serial_number(const std::vector<uint8_t>& buffer) const;
     };

src/ds/d500/d500-fw-update-device.h

@@ -20,7 +20,6 @@ namespace librealsense
             std::chrono::seconds timeout_seconds, rs2_update_progress_callback_sptr update_progress_callback) const;
         virtual void dfu_manifest_phase(const platform::rs_usb_messenger& messenger, rs2_update_progress_callback_sptr update_progress_callback) const override;
         float compute_progress(float progress, float start, float end, float threshold) const override;
-        virtual void initialize() override {};
 
     private:
         std::string parse_serial_number(const std::vector<uint8_t>& buffer) const;

src/media/playback/playback_device.h

@@ -61,7 +61,6 @@ namespace librealsense
 
         bool compress_while_record() const override { return true; }
         bool contradicts(const stream_profile_interface* a, const std::vector<stream_profile>& others) const override { return false; }
-        virtual void initialize() override {};
 
     private:
         void update_time_base(device_serializer::nanoseconds base_timestamp);

src/media/record/record_device.h

@@ -49,7 +49,6 @@ namespace librealsense
         void tag_profiles(stream_profiles profiles) const override { m_device->tag_profiles(profiles); }
         bool compress_while_record() const override { return true; }
         bool contradicts(const stream_profile_interface* a, const std::vector<stream_profile>& others) const override { return m_device->contradicts(a, others); }
-        virtual void initialize() override {};
 
     private:
         template <typename T> void write_device_extension_changes(const T& ext);

src/platform-camera.cpp

@@ -64,6 +64,30 @@ class platform_camera_sensor : public synthetic_sensor
 
 }  // namespace
 
+void platform_camera::initialize()
+{
+    auto const n_sensors = get_sensors_count();
+    for (auto i = 0; i < n_sensors; ++i)
+    {
+        if (auto sensor = dynamic_cast<platform_camera_sensor*>(&(get_sensor(i))))
+        {
+            if (sensor->get_device().get_info(RS2_CAMERA_INFO_NAME) == "Platform Camera")
+            {
+                sensor->try_register_pu(RS2_OPTION_BACKLIGHT_COMPENSATION);
+                sensor->try_register_pu(RS2_OPTION_BRIGHTNESS);
+                sensor->try_register_pu(RS2_OPTION_CONTRAST);
+                sensor->try_register_pu(RS2_OPTION_EXPOSURE);
+                sensor->try_register_pu(RS2_OPTION_GAMMA);
+                sensor->try_register_pu(RS2_OPTION_HUE);
+                sensor->try_register_pu(RS2_OPTION_SATURATION);
+                sensor->try_register_pu(RS2_OPTION_SHARPNESS);
+                sensor->try_register_pu(RS2_OPTION_WHITE_BALANCE);
+                sensor->try_register_pu(RS2_OPTION_ENABLE_AUTO_EXPOSURE);
+                sensor->try_register_pu(RS2_OPTION_ENABLE_AUTO_WHITE_BALANCE);
+            }
+        }
+    }
+}
 
 platform_camera::platform_camera( std::shared_ptr< const device_info > const & dev_info,
                                   const std::vector< platform::uvc_device_info > & uvc_infos,
@@ -117,34 +141,14 @@ platform_camera::platform_camera( std::shared_ptr< const device_info > const & d
     // For consistent (msec) measurements use "time of arrival" metadata attribute
     color_ep->register_metadata( RS2_FRAME_METADATA_FRAME_TIMESTAMP,
                                  make_uvc_header_parser( &platform::uvc_header::timestamp ) );
-}
 
-void platform_camera::initialize()
-{
-    auto const n_sensors = get_sensors_count();
-    for (auto i = 0; i < n_sensors; ++i)
-    {
-        if (auto sensor = dynamic_cast<platform_camera_sensor*>(&(get_sensor(i))))
-        {
-            if (sensor->get_device().get_info(RS2_CAMERA_INFO_NAME) == "Platform Camera")
-            {
-                sensor->try_register_pu(RS2_OPTION_BACKLIGHT_COMPENSATION);
-                sensor->try_register_pu(RS2_OPTION_BRIGHTNESS);
-                sensor->try_register_pu(RS2_OPTION_CONTRAST);
-                sensor->try_register_pu(RS2_OPTION_EXPOSURE);
-                sensor->try_register_pu(RS2_OPTION_GAMMA);
-                sensor->try_register_pu(RS2_OPTION_HUE);
-                sensor->try_register_pu(RS2_OPTION_SATURATION);
-                sensor->try_register_pu(RS2_OPTION_SHARPNESS);
-                sensor->try_register_pu(RS2_OPTION_WHITE_BALANCE);
-                sensor->try_register_pu(RS2_OPTION_ENABLE_AUTO_EXPOSURE);
-                sensor->try_register_pu(RS2_OPTION_ENABLE_AUTO_WHITE_BALANCE);
-            }
-        }
-    }
+    // Create a thread to call initialize after a delay
+    std::thread([this]() {
+    std::this_thread::sleep_for(std::chrono::seconds(2)); // Delay for 2 seconds
+    this->initialize();
+    }).detach(); // Detach the thread to let it run independently
 }
 
-
 std::vector< tagged_profile > platform_camera::get_profiles_tags() const
 {
     std::vector< tagged_profile > markers;

src/platform-camera.h

@@ -19,9 +19,10 @@ class platform_camera : public backend_device
 
     virtual rs2_intrinsics get_intrinsics( unsigned int, const stream_profile & ) const { return rs2_intrinsics{}; }
 
-    virtual void initialize() override;
-
     std::vector< tagged_profile > get_profiles_tags() const override;
+
+private:
+    void initialize();
 };
 
 

tools/realsense-viewer/realsense-viewer.cpp

@@ -19,7 +19,6 @@
 #include <mutex>
 #include <set>
 #include <regex>
-#include <api.h>
 
 #include <imgui_internal.h>
 
@@ -135,8 +134,6 @@ void refresh_devices(std::mutex& m,
     context& ctx,
     device_changes& devices_connection_changes,
     std::vector<device>& current_connected_devices,
-    std::vector<device>& future_initialization_devices,
-    bool allow_future_initialization,
     std::vector<std::pair<std::string, std::string>>& device_names,
     device_models_list& device_models,
     viewer_model& viewer_model,
@@ -145,29 +142,7 @@ void refresh_devices(std::mutex& m,
 
     event_information info({}, {});
     if (!devices_connection_changes.try_get_next_changes(info))
-    {
-        if (allow_future_initialization)
-        {
-            auto dev_itr = begin(future_initialization_devices);
-            while (dev_itr != end(future_initialization_devices))
-            {
-                auto &dev = *dev_itr;
-                const std::shared_ptr<rs2_device>& device_shared_ptr = dev.get();
-                const rs2_device* p_rs2_device = device_shared_ptr.get();
-
-                auto add_controls_task = [p_rs2_device]() {
-                    p_rs2_device->device->initialize();
-                };
-
-                std::thread add_controls_thread(add_controls_task);
-                add_controls_thread.detach();
-
-                dev_itr = future_initialization_devices.erase(dev_itr);
-            }
-        }
-
-        return;
-    }
+        return ;
     try
     {
         //Remove disconnected
@@ -244,10 +219,6 @@ void refresh_devices(std::mutex& m,
                                                 << " was selected as a default device" );
                     added = true;
                 }
-                else if(std::string(dev.get_info(RS2_CAMERA_INFO_NAME)) == "Platform Camera")
-                { 
-                    future_initialization_devices.push_back(dev);
-                }
 
                 if (!initial_refresh)
                 {
@@ -347,9 +318,7 @@ int main(int argc, const char** argv) try
     update_viewer_configuration(viewer_model);
 
     std::vector<device> connected_devs;
-    std::vector<device> future_initialization_devices;
     std::mutex m;
-    bool allow_future_initialization = false;
 
 #ifdef BUILD_EASYLOGGINGPP
     std::weak_ptr<notifications_model> notifications = viewer_model.not_model;
@@ -396,15 +365,15 @@ int main(int argc, const char** argv) try
 
     window.on_load = [&]()
     {
-        refresh_devices(m, ctx, devices_connection_changes, connected_devs, future_initialization_devices, allow_future_initialization,
+        refresh_devices(m, ctx, devices_connection_changes, connected_devs,
             device_names, *device_models, viewer_model, error_message);
         return true;
     };
 
     // Closing the window
     while (window)
     {
-        refresh_devices(m, ctx, devices_connection_changes, connected_devs, future_initialization_devices, allow_future_initialization,
+        refresh_devices(m, ctx, devices_connection_changes, connected_devs,
             device_names, *device_models, viewer_model, error_message);
 
         auto output_height = viewer_model.get_output_height();
@@ -650,8 +619,7 @@ int main(int argc, const char** argv) try
 
         // Fetch and process frames from queue
         viewer_model.handle_ready_frames(viewer_rect, window, static_cast<int>(device_models->size()), error_message);
-        allow_future_initialization = true;
-    }
+        }
 
     // Stopping post processing filter rendering thread
     viewer_model.ppf.stop();