From 2cbceba953fbb7c53a0817b89753e80d991d6da2 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Fri, 21 Aug 2026 14:29:44 +0800 Subject: [PATCH] [fix] use screen content defaults for desktop streaming --- src/config_center/config_center.cpp | 12 +++++++----- src/gui/runtime/gui_runtime.cpp | 6 ++++++ submodules/minirtc | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/config_center/config_center.cpp b/src/config_center/config_center.cpp index ee056ba..d025bbf 100644 --- a/src/config_center/config_center.cpp +++ b/src/config_center/config_center.cpp @@ -29,7 +29,11 @@ int ConfigCenter::Load() { return -1; } - bool persist_turn_mode_migration = false; + bool persist_config_migration = false; + persist_config_migration |= ini_.Delete(section_, "video_content_type"); + persist_config_migration |= ini_.Delete(section_, "screen_content"); + persist_config_migration |= + ini_.Delete(section_, "enable_desktop_quality_optimization"); const long language_value = ini_.GetLongValue(section_, "language", static_cast(language_)); @@ -52,7 +56,6 @@ int ConfigCenter::Load() { hardware_video_codec_ = ini_.GetBoolValue(section_, "hardware_video_codec", hardware_video_codec_); - const char* turn_mode_value = ini_.GetValue(section_, "turn_mode", nullptr); if (turn_mode_value != nullptr && strlen(turn_mode_value) > 0) { const long parsed_turn_mode = ini_.GetLongValue( @@ -70,7 +73,7 @@ int ConfigCenter::Load() { turn_mode_ = legacy_enable_turn ? TURN_MODE::AUTO_UDP_TCP : TURN_MODE::DISABLED; ini_.SetLongValue(section_, "turn_mode", static_cast(turn_mode_)); - persist_turn_mode_migration = true; + persist_config_migration = true; } enable_srtp_ = ini_.GetBoolValue(section_, "enable_srtp", enable_srtp_); enable_self_hosted_ = @@ -121,8 +124,7 @@ int ConfigCenter::Load() { file_transfer_save_path_ = ""; } - if (persist_turn_mode_migration && - ini_.SaveFile(config_path_.c_str()) < 0) { + if (persist_config_migration && ini_.SaveFile(config_path_.c_str()) < 0) { return -1; } diff --git a/src/gui/runtime/gui_runtime.cpp b/src/gui/runtime/gui_runtime.cpp index 6bfde6e..b0238e6 100644 --- a/src/gui/runtime/gui_runtime.cpp +++ b/src/gui/runtime/gui_runtime.cpp @@ -111,8 +111,14 @@ int GuiRuntime::CreateConnectionPeer() { : false; params_.turn_mode = static_cast(config_center_->GetTurnMode()); params_.enable_srtp = config_center_->IsEnableSrtp(); + params_.video_content_type = VideoContentType::ScreenContent; params_.video_quality = static_cast(config_center_->GetVideoQuality()); + params_.video_frame_rate = + config_center_->GetVideoFrameRate() == + ConfigCenter::VIDEO_FRAME_RATE::FPS_30 + ? 30 + : 60; params_.on_receive_video_buffer = nullptr; params_.on_receive_audio_buffer = PeerEventHandler::OnReceiveAudioBuffer; params_.on_receive_data_buffer = PeerEventHandler::OnReceiveDataBuffer; diff --git a/submodules/minirtc b/submodules/minirtc index cb1d9fe..f0d3582 160000 --- a/submodules/minirtc +++ b/submodules/minirtc @@ -1 +1 @@ -Subproject commit cb1d9fe118ed2749067f1e33aac5a14eb290d3ff +Subproject commit f0d35828ccf6129d632455af0e63f969315424d7