fix: vdd 就绪检测放宽

Author: qiin2333

src/display_device/parsed_config.cpp

@@ -538,11 +538,23 @@ namespace display_device {
   boost::optional<parsed_config_t>
   make_parsed_config(const config::video_t &config, const rtsp_stream::launch_session_t &session, bool is_reconfigure) {
     parsed_config_t parsed_config;
-    parsed_config.device_id = config.output_name;
+    
+    // 优先使用客户端指定的显示器名称，如果没有则使用全局配置
+    std::string device_id_to_use = config.output_name;
+    if (auto it = session.env.find("SUNSHINE_CLIENT_DISPLAY_NAME"); it != session.env.end()) {
+      const std::string client_display_name = it->to_string();
+      if (!client_display_name.empty()) {
+        device_id_to_use = client_display_name;
+        BOOST_LOG(debug) << "使用客户端指定的显示器: " << device_id_to_use;
+      }
+    }
+    
+    parsed_config.device_id = device_id_to_use;
     parsed_config.device_prep = static_cast<parsed_config_t::device_prep_e>(config.display_device_prep);
     parsed_config.change_hdr_state = parse_hdr_option(config, session);
 
     const int custom_screen_mode = session.custom_screen_mode;
+    
     // 客户端自定义屏幕模式
     if (custom_screen_mode != -1) {
       BOOST_LOG(debug) << "客户端自定义屏幕模式: "sv << custom_screen_mode;
@@ -577,9 +589,9 @@ namespace display_device {
                      << "\n刷新率: "sv << (parsed_config.refresh_rate ? to_string(*parsed_config.refresh_rate) : "不变")
                      << "\n"sv;
 
-    // 检查是否需要使用VDD
-    const auto requested_device_id = display_device::find_one_of_the_available_devices(config.output_name);
-    const bool is_vdd_device = (display_device::get_display_friendly_name(config.output_name) == ZAKO_NAME);
+    // 检查是否需要使用VDD（使用解析后的 device_id，可能是客户端指定的显示器）
+    const auto requested_device_id = display_device::find_one_of_the_available_devices(parsed_config.device_id);
+    const bool is_vdd_device = (display_device::get_display_friendly_name(parsed_config.device_id) == ZAKO_NAME);
 
     // 如果会话不需要VDD且指定设备存在且不是VDD设备，则跳过VDD准备
     if (!session.use_vdd && !requested_device_id.empty() && !is_vdd_device) {

src/display_device/session.cpp

@@ -150,6 +150,12 @@ namespace display_device {
   session_t::clear_vdd_state() {
     current_vdd_client_id.clear();
     last_vdd_setting.clear();
+    // 恢复原始的 output_name，避免下一个会话使用已销毁的 VDD 设备 ID
+    if (!original_output_name.empty()) {
+      config::video.output_name = original_output_name;
+      original_output_name.clear();
+      BOOST_LOG(debug) << "已恢复原始 output_name: " << config::video.output_name;
+    }
   }
 
   void
@@ -182,17 +188,12 @@ namespace display_device {
     }
 
     /**
-     * @brief Wait for VDD device to initialize and be fully ready.
+     * @brief Wait for VDD device to be available (active or inactive).
      * @param device_zako Output parameter for the device ID.
      * @param max_attempts Maximum number of retry attempts.
      * @param initial_delay Initial delay between retries.
      * @param max_delay Maximum delay between retries.
-     * @return true if device was found and is ready, false otherwise.
-     *
-     * This function checks multiple conditions to ensure the VDD device is fully ready:
-     * 1. Device can be found by friendly name
-     * 2. Device is in the active device list
-     * 3. Device has a valid source mode (can be queried for display configuration)
+     * @return true if device was found (active or inactive), false otherwise.
      */
     bool
     wait_for_vdd_device(std::string &device_zako, int max_attempts,
@@ -202,26 +203,19 @@ namespace display_device {
         [&device_zako]() {
           device_zako = display_device::find_device_by_friendlyname(ZAKO_NAME);
           if (device_zako.empty()) {
+            BOOST_LOG(debug) << "VDD device not found by friendly name";
             return false;
           }
 
-          const auto display_data = w_utils::query_display_config(w_utils::ACTIVE_ONLY_DEVICES);
-          if (!display_data) {
-            return false;
-          }
-
-          const auto path = w_utils::get_active_path(device_zako, display_data->paths);
-          if (!path) {
-            return false;
-          }
-
-          const auto source_index = w_utils::get_source_index(*path, display_data->modes);
-          return source_index && w_utils::get_source_mode(source_index, display_data->modes);
+          // Device found by friendly name - that's all we need
+          // It can be activated later during display configuration
+          BOOST_LOG(debug) << "VDD device found: " << device_zako;
+          return true;
         },
         { .max_attempts = max_attempts,
           .initial_delay = initial_delay,
           .max_delay = max_delay,
-          .context = "等待VDD设备初始化并完全就绪" });
+          .context = "Waiting for VDD device availability" });
     }
 
     /**
@@ -388,7 +382,7 @@ namespace display_device {
     if (device_zako.empty()) {
       BOOST_LOG(info) << "创建虚拟显示器...";
       vdd_utils::create_vdd_monitor(current_client_id, hdr_brightness, physical_size);
-      std::this_thread::sleep_for(233ms);
+      std::this_thread::sleep_for(500ms);
     }
 
     // Wait for device to be ready
@@ -408,6 +402,11 @@ namespace display_device {
       return;
     }
 
+    if (original_output_name.empty()) {
+      original_output_name = config::video.output_name;
+      BOOST_LOG(debug) << "保存原始 output_name: " << original_output_name;
+    }
+
     // Update configuration and state
     config.device_id = device_zako;
     config::video.output_name = device_zako;

src/display_device/session.h

@@ -231,6 +231,7 @@ namespace display_device {
     std::mutex mutex; /**< A mutex for ensuring thread-safety. */
     std::string last_vdd_setting; /**< Last VDD resolution and refresh rate setting. */
     std::string current_vdd_client_id; /**< Current client ID associated with VDD monitor. */
+    std::string original_output_name; /**< Original output_name value before VDD device ID was set. */
 
     /**
      * @brief An instance of StateRetryTimer.