izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add webui config for following client HDR settings

Browse Source
This commit is contained in:
Yukino Song
2024-09-07 01:06:33 +08:00
parent c2aefb2a2f
commit f9b9a76639
7 changed files with 81 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.cpp
View File

@@ -327,6 +327,7 @@ namespace config {
video_t video {
false, // headless_mode
false, // follow_client_hdr
28, // qp
0, // hevc_mode
@@ -950,6 +951,7 @@ namespace config {
}
bool_f(vars, "headless_mode", video.headless_mode);
bool_f(vars, "follow_client_hdr", video.follow_client_hdr);
int_f(vars, "qp", video.qp);
int_f(vars, "min_threads", video.min_threads);
int_between_f(vars, "hevc_mode", video.hevc_mode, { 0, 3 });

1
src/config.h
View File

@@ -16,6 +16,7 @@
namespace config {
struct video_t {
bool headless_mode;
bool follow_client_hdr;
// ffmpeg params
int qp; // higher == more compression and less quality

29
src/process.cpp
View File

@@ -370,9 +370,9 @@ namespace proc {
#ifdef _WIN32
auto resetHDRThread = std::thread([this, enable_hdr = launch_session->enable_hdr]{
std::this_thread::sleep_for(1s);
// Windows doesn't seem to be able to set HDR correctly when a display is just connected,
// so we have tooggle HDR for the virtual display manually.
// so we have tooggle HDR for the virtual display manually after a delay.
std::this_thread::sleep_for(1s);
// We should have got the actual streaming display by now
std::string currentDisplay = this->display_name;
if (!currentDisplay.empty()) {
@@ -380,15 +380,24 @@ namespace proc {
this->initial_display = currentDisplay;
this->initial_hdr = VDISPLAY::getDisplayHDRByName(currentDisplayW);
if (!VDISPLAY::setDisplayHDRByName(currentDisplayW, false)) {
return;
}
if (enable_hdr) {
if (VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
BOOST_LOG(info) << "HDR enabled for display " << currentDisplay;
if (config::video.follow_client_hdr) {
if (!VDISPLAY::setDisplayHDRByName(currentDisplayW, false)) {
return;
}
if (enable_hdr) {
if (VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
BOOST_LOG(info) << "HDR enabled for display " << currentDisplay;
} else {
BOOST_LOG(info) << "HDR enable failed for display " << currentDisplay;
}
}
} else if (this->initial_hdr) {
if (VDISPLAY::setDisplayHDRByName(currentDisplayW, false) && VDISPLAY::setDisplayHDRByName(currentDisplayW, true)) {
BOOST_LOG(info) << "HDR toggled successfully for display " << currentDisplay;
} else {
BOOST_LOG(info) << "HDR enable failed for display " << currentDisplay;
BOOST_LOG(info) << "HDR toggle failed for display " << currentDisplay;
}
}
}
@@ -473,7 +482,7 @@ namespace proc {
_pipe.reset();
#ifdef _WIN32
if (!this->initial_display.empty()) {
if (config::video.follow_client_hdr && !this->initial_display.empty()) {
if (VDISPLAY::setDisplayHDRByName(platf::from_utf8(this->initial_display).c_str(), this->initial_hdr)) {
BOOST_LOG(info) << "HDR restored successfully for display " << this->initial_display;
} else {