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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yukino Song
2025-01-14 23:43:50 +08:00
parent 7d0456e85e 820180c9e7
commit 1dc6465f12
91 changed files with 6764 additions and 2374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/nvhttp.cpp
View File

@@ -22,6 +22,7 @@
// local includes
#include "config.h"
#include "crypto.h"
#include "display_device.h"
#include "file_handler.h"
#include "globals.h"
#include "httpcommon.h"
@@ -985,12 +986,17 @@ namespace nvhttp {
print_req<SunshineHTTPS>(request);
pt::ptree tree;
bool revert_display_configuration { false };
auto g = util::fail_guard([&]() {
std::ostringstream data;
pt::write_xml(data, tree);
response->write(data.str());
response->close_connection_after_response = true;
if (revert_display_configuration) {
display_device::revert_configuration();
}
});
auto named_cert_p = get_verified_cert(request);
@@ -1078,6 +1084,9 @@ namespace nvhttp {
tree.put("root.gamesession", 1);
rtsp_stream::launch_session_raise(launch_session);
// Stream was started successfully, we will revert the config when the app or session terminates
revert_display_configuration = false;
}
void
@@ -1124,7 +1133,21 @@ namespace nvhttp {
return;
}
if (rtsp_stream::session_count() == 0) {
// Newer Moonlight clients send localAudioPlayMode on /resume too,
// so we should use it if it's present in the args and there are
// no active sessions we could be interfering with.
const bool no_active_sessions { rtsp_stream::session_count() == 0 };
if (no_active_sessions && args.find("localAudioPlayMode"s) != std::end(args)) {
host_audio = util::from_view(get_arg(args, "localAudioPlayMode"));
}
auto launch_session = make_launch_session(host_audio, 0, args, named_cert_p);
if (no_active_sessions) {
// We want to prepare display only if there are no active sessions at
// the moment. This should be done before probing encoders as it could
// change the active displays.
display_device::configure_display(config::video, *launch_session);
// Probe encoders again before streaming to ensure our chosen
// encoder matches the active GPU (which could have changed
// due to hotplugging, driver crash, primary monitor change,
@@ -1136,17 +1159,8 @@ namespace nvhttp {
return;
}
// Newer Moonlight clients send localAudioPlayMode on /resume too,
// so we should use it if it's present in the args and there are
// no active sessions we could be interfering with.
if (args.find("localAudioPlayMode"s) != std::end(args)) {
host_audio = util::from_view(get_arg(args, "localAudioPlayMode"));
}
}
auto launch_session = make_launch_session(host_audio, 0, args, named_cert_p);
auto encryption_mode = net::encryption_mode_for_address(request->remote_endpoint().address());
if (!launch_session->rtsp_cipher && encryption_mode == config::ENCRYPTION_MODE_MANDATORY) {
BOOST_LOG(error) << "Rejecting client that cannot comply with mandatory encryption requirement"sv;
@@ -1203,6 +1217,9 @@ namespace nvhttp {
if (proc::proc.running() > 0) {
proc::proc.terminate();
}
// The config needs to be reverted regardless of whether "proc::proc.terminate()" was called or not.
display_device::revert_configuration();
}
void