feat: 重构新版VDD模式 by Yundi339 · Pull Request #530 · qiin2333/foundation-sunshine

Yundi339 · 2026-03-15T08:04:45Z

No description provided.

Reverts commit 5c8d464 换了驱动会变坏，回退到之前的版本

Copilot

Pull request overview

This PR refactors the Windows “VDD mode” flow by unifying display preparation options (VDD + physical) under display_device_prep, adding a new ensure_secondary mode, and introducing a grace-period mechanism to keep VDD alive briefly for same-client reuse. It also updates the web UI + translations accordingly and adds/updates bundled Windows VDD driver assets.

Changes:

Unify VDD/physical display preparation into display_device_prep (remove vdd_prep and custom_vdd_screen_mode plumbing).
Add VDD deferred-restore (“grace period”) logic and mapping helpers between unified prep and internal VDD/physical behaviors.
Update web UI (Setup Wizard + Display Device Options) and i18n strings; add driver catalog/INF assets.

Reviewed changes

Copilot reviewed 32 out of 36 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
src_assets/windows/misc/vdd/driver/zakovdd.cat	Adds driver catalog asset for ZakoVDD package.
src_assets/windows/misc/vdd/driver/ZakoVDD.inf	Adds driver INF describing UMDF display adapter install.
src_assets/common/assets/web/public/assets/locale/zh_TW.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/zh.json	Update display prep strings and VDD reuse description; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/uk.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/tr.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/sv.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/ru.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/pt_BR.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/pt.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/pl.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/ko.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/ja.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/it.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/fr.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/es.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/en_US.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/en_GB.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/en.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/de.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/cs.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/public/assets/locale/bg.json	Update display prep strings; remove legacy VDD layout strings.
src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue	Remove VDD-specific UI split; add unified prep + ensure_secondary and dynamic descriptions.
src_assets/common/assets/web/composables/useConfig.js	Remove default `vdd_prep` from web config defaults.
src_assets/common/assets/web/components/SetupWizard.vue	Reorder steps and unify display prep selection UI (add ensure_secondary).
src/rtsp.h	Remove `custom_vdd_screen_mode` from launch session struct.
src/process.cpp	Remove `SUNSHINE_CLIENT_CUSTOM_VDD_SCREEN_MODE` env propagation.
src/nvhttp.cpp	Remove parsing/export of `customVddScreenMode` and related env.
src/display_device/session.h	Add deferred restore state and new `execute_deferred_restore()` declaration.
src/display_device/session.cpp	Implement grace-period deferred restore + unified prep mapping in restore flow; add shutdown VDD cleanup.
src/display_device/parsed_config.h	Add `ensure_secondary` and mapping helpers declarations.
src/display_device/parsed_config.cpp	Implement unified prep → VDD/physical mapping; remove `vdd_prep` config usage.
src/config.h	Remove `vdd_prep` from video config struct.
src/config.cpp	Remove `vdd_prep` default + parsing from config loader.
.gitignore	Remove `_dev_notes/` ignore entry.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

src/display_device/session.cpp

+    // 兜底：退出时如果 VDD 仍存在且 vdd_keep_enabled=false，直接销毁
+    // 不调用完整的 restore_state()，因为析构时 boost::log/timer 可能已被销毁
+    // 仅执行 VDD 销毁（写管道命令，不依赖日志和定时器）
+    if (!config::video.vdd_keep_enabled) {
+      auto vdd_id = display_device::find_device_by_friendlyname(ZAKO_NAME);
+      if (!vdd_id.empty()) {
+        vdd_utils::destroy_vdd_monitor();
+      }


src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue

          <div
            id="panelsStayOpen-collapseOne"
-            class="accordion-collapse collapse"
+            class="accordion-collapse collapse show"
            aria-labelledby="panelsStayOpen-headingOne"
          >


src/nvhttp.cpp

@@ -400,7 +400,6 @@ namespace nvhttp {
    launch_session->enable_hdr = util::from_view(get_arg(args, "hdrMode", "0"));
    launch_session->use_vdd = util::from_view(get_arg(args, "useVdd", "0"));
    launch_session->custom_screen_mode = util::from_view(get_arg(args, "customScreenMode", "-1"));


src/display_device/session.cpp

+      if (vdd_already_exists) {
+        execute_deferred_restore(deferred_restore_reason_);
+      }


src/display_device/session.cpp

+    if (!vdd_id.empty() && !is_keep_enabled && is_vdd_mode && has_persistent) {
+      BOOST_LOG(info) << "VDD 延迟恢复：启动 grace period，等待可能的同客户端新串流复用 VDD";
+      deferred_restore_ = true;
+      deferred_restore_reason_ = reason;
+      deferred_client_id_ = current_vdd_client_id;
+
+      timer->setup_timer([this]() {
+        // Grace period 到期，没有新的 configure_display 到来，执行真正的 restore
+        BOOST_LOG(info) << "VDD grace period 到期，执行延迟恢复";
+        deferred_restore_ = false;
+        deferred_client_id_.clear();
+        execute_deferred_restore(deferred_restore_reason_);
+        return true;  // 一次性执行，不重试
+      });
+      return;


src/config.cpp

@@ -1195,7 +1194,6 @@ namespace config {
    }
 #endif


src/process.cpp

@@ -188,7 +188,6 @@ namespace proc {
    _env["SUNSHINE_CLIENT_ENABLE_SOPS"] = launch_session->enable_sops ? "true" : "false";
    _env["SUNSHINE_CLIENT_ENABLE_MIC"] = launch_session->enable_mic ? "true" : "false";
    _env["SUNSHINE_CLIENT_CUSTOM_SCREEN_MODE"] = std::to_string(launch_session->custom_screen_mode);


src/display_device/parsed_config.cpp

+    switch (unified) {
+      case device_prep_e::ensure_secondary:
+        return device_prep_e::ensure_active;  // In physical mode, activate as secondary
+      default:
+        return unified;  // All other values map 1:1
+    }


src_assets/common/assets/web/components/SetupWizard.vue

      } else if (this.currentStep === 2) {
-        return this.selectedDisplay !== null
-      } else if (this.currentStep === 3) {
        return this.selectedAdapter !== null


Yundi339 added 5 commits March 11, 2026 14:47

feat: 优化显示屏幕组合

10e68db

feat: 更改新手引导步骤

a119edf

revert: 回退虚拟显示器驱动更新 (5c8d464)

4d50aeb

Reverts commit 5c8d464 换了驱动会变坏，回退到之前的版本

feat: 重构新版VDD模式

5e97f83

Merge remote-tracking branch 'origin/master' into fix_vddcheckcheck

fea51f4

Yundi339 requested a review from Copilot March 15, 2026 08:11

Copilot started reviewing on behalf of Yundi339 March 15, 2026 08:11 View session

Copilot AI reviewed Mar 15, 2026

View reviewed changes

Yundi339 added 2 commits March 15, 2026 18:08

refactor:从会话管理中删除延迟恢复逻辑和相关变量

653f23a

fix: add id attribute to accordion header for accessibility

fdb5a85

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: 重构新版VDD模式#530

feat: 重构新版VDD模式#530
Yundi339 wants to merge 7 commits intomasterfrom
fix_vddcheckcheck

Yundi339 commented Mar 15, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

Yundi339 commented Mar 15, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants