diff --git a/docs/configuration.md b/docs/configuration.md index 1f31d74c..315ea7e2 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1156,14 +1156,15 @@ editing the `conf` file in a text editor. Use the examples as reference. -### dd_wa_hdr_toggle +### dd_wa_hdr_toggle_delay @@ -1171,13 +1172,13 @@ editing the `conf` file in a text editor. Use the examples as reference.
Description - When using virtual display device as for streaming, it might display incorrect (high-contrast) color. - With this option enabled, Sunshine will try to mitigate this issue. + When using virtual display device (VDD) for streaming, it might incorrectly display HDR color. Sunshine can try to mitigate this issue, by turning HDR off and then on again.
+ If the value is set to 0, the workaround is disabled (default). If the value is between 0 and 3000 milliseconds, Sunshine will turn off HDR, wait for the specified amount of time and then turn HDR on again. The recommended delay time is around 500 milliseconds in most cases.
+ DO NOT use this workaround unless you actually have issues with HDR as it directly impacts stream start time! @note{This option works independently of [dd_hdr_option](#dd_hdr_option)} @note{Applies to Windows only.}
Default @code{} - disabled + 0 @endcode
Example @code{} - dd_wa_hdr_toggle = enabled + dd_wa_hdr_toggle_delay = 500 @endcode
diff --git a/packaging/linux/flatpak/README.md b/packaging/linux/flatpak/README.md index a503a346..684f986e 100644 --- a/packaging/linux/flatpak/README.md +++ b/packaging/linux/flatpak/README.md @@ -1,13 +1,22 @@ -# Overview +
+ +

Sunshine

+

Self-hosted game stream host for Moonlight.

+
-[![Flathub installs](https://img.shields.io/flathub/downloads/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub)](https://flathub.org/apps/dev.lizardbyte.app.Sunshine) -[![Flathub Version](https://img.shields.io/flathub/v/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub)](https://flathub.org/apps/dev.lizardbyte.app.Sunshine) +
+ Flathub installs + Flathub Version +
-LizardByte has the full documentation hosted on [Read the Docs](https://docs.lizardbyte.dev/projects/sunshine). - -## About +## ℹ️ About Sunshine is a self-hosted game stream host for Moonlight. +LizardByte has the full documentation hosted on [Read the Docs](https://docs.lizardbyte.dev/projects/sunshine) + +* [Stable](https://docs.lizardbyte.dev/projects/sunshine/latest/) +* [Beta](https://docs.lizardbyte.dev/projects/sunshine/master/) + This repo is synced from the upstream [Sunshine](https://github.com/LizardByte/Sunshine) repo. Please report issues and contribute to the upstream repo. diff --git a/packaging/linux/flatpak/exceptions.json b/packaging/linux/flatpak/exceptions.json new file mode 100644 index 00000000..957f7384 --- /dev/null +++ b/packaging/linux/flatpak/exceptions.json @@ -0,0 +1,8 @@ +{ + "dev.lizardbyte.app.Sunshine": [ + "appstream-missing-screenshots", + "appstream-screenshots-not-mirrored-in-ostree", + "external-gitmodule-url-found", + "finish-args-flatpak-spawn-access" + ] +} diff --git a/packaging/linux/flatpak/flatpak-lint-baseline_manifest.json b/packaging/linux/flatpak/flatpak-lint-baseline_manifest.json deleted file mode 100644 index f1ff6722..00000000 --- a/packaging/linux/flatpak/flatpak-lint-baseline_manifest.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "errors": [ - "finish-args-flatpak-spawn-access" - ], - "info": [ - "finish-args-flatpak-spawn-access: finish-args has a talk-name access for org.freedesktop.Flatpak" - ], - "message": "Please consult the documentation at https://docs.flathub.org/docs/for-app-authors/linter" -} diff --git a/packaging/linux/flatpak/flatpak-lint-baseline_repo.json b/packaging/linux/flatpak/flatpak-lint-baseline_repo.json deleted file mode 100644 index 92d24feb..00000000 --- a/packaging/linux/flatpak/flatpak-lint-baseline_repo.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "errors": [ - "appstream-missing-screenshots", - "finish-args-flatpak-spawn-access" - ], - "info": [ - "appstream-missing-screenshots: Catalogue file has no screenshots. Please check if screenshot URLs are reachable", - "finish-args-flatpak-spawn-access: finish-args has a talk-name access for org.freedesktop.Flatpak" - ], - "message": "Please consult the documentation at https://docs.flathub.org/docs/for-app-authors/linter" -} diff --git a/src/config.cpp b/src/config.cpp index f5ecb5ae..efdef1dc 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1183,7 +1183,11 @@ namespace config { } bool_f(vars, "dd_config_revert_on_disconnect", video.dd.config_revert_on_disconnect); generic_f(vars, "dd_mode_remapping", video.dd.mode_remapping, dd::mode_remapping_from_view); - bool_f(vars, "dd_wa_hdr_toggle", video.dd.wa.hdr_toggle); + { + int value = 0; + int_between_f(vars, "dd_wa_hdr_toggle_delay", value, {0, 3000}); + video.dd.wa.hdr_toggle_delay = std::chrono::milliseconds {value}; + } int_between_f(vars, "min_fps_factor", video.min_fps_factor, {1, 3}); int_f(vars, "max_bitrate", video.max_bitrate); diff --git a/src/config.h b/src/config.h index 7022134e..d15f773e 100644 --- a/src/config.h +++ b/src/config.h @@ -87,7 +87,7 @@ namespace config { struct dd_t { struct workarounds_t { - bool hdr_toggle; ///< Specify whether to apply HDR high-contrast color workaround. + std::chrono::milliseconds hdr_toggle_delay; ///< Specify whether to apply HDR high-contrast color workaround and what delay to use. }; enum class config_option_e { diff --git a/src/display_device.cpp b/src/display_device.cpp index 7bc71960..2695c1a6 100644 --- a/src/display_device.cpp +++ b/src/display_device.cpp @@ -621,7 +621,7 @@ namespace display_device { std::make_shared(persistence_filepath) ), WinWorkarounds { - .m_hdr_blank_delay = video_config.dd.wa.hdr_toggle ? std::make_optional(500ms) : std::nullopt + .m_hdr_blank_delay = video_config.dd.wa.hdr_toggle_delay != std::chrono::milliseconds::zero() ? std::make_optional(video_config.dd.wa.hdr_toggle_delay) : std::nullopt } ); #else diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html index 16e4d2ac..56d0788b 100644 --- a/src_assets/common/assets/web/config.html +++ b/src_assets/common/assets/web/config.html @@ -200,6 +200,7 @@ "fallback_mode": "", "headless_mode": "disabled", "double_refreshrate": "disabled", + "dd_wa_hdr_toggle_delay": 0, "min_fps_factor": 1, "max_bitrate": 0, }, diff --git a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue index 79a6d117..b59f785d 100644 --- a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue +++ b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue @@ -1,7 +1,6 @@