mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-18 13:33:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Allow Network Optimizations with multitrack video

Browse Source 
"Enable network optimizations" in the Advanced Settings is referred to
as `NewSocketLoop` in the code. This feature was incompatible with
multitrack video but now works properly. Remove it from the
incompatible settings check.
This commit is contained in:
Ruwen Hahn
2024-08-02 14:18:43 +02:00
committed by Ryan Foster
parent 0576182f96
commit 9bba6e52ff
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/utility/MultitrackVideoOutput.cpp
View File

@@ -545,7 +545,7 @@ void MultitrackVideoOutput::StopStreaming()
}
bool MultitrackVideoOutput::HandleIncompatibleSettings(QWidget *parent, config_t *config, obs_service_t *service,
bool &enableNewSocketLoop, bool &enableDynBitrate)
bool &enableDynBitrate)
{
QString incompatible_settings;
QString where_to_disable;
@@ -570,10 +570,6 @@ bool MultitrackVideoOutput::HandleIncompatibleSettings(QWidget *parent, config_t
num += 1;
};
#ifdef _WIN32
check_setting(enableNewSocketLoop, "Basic.Settings.Advanced.Network.EnableNewSocketLoop",
"Basic.Settings.Advanced.Network");
#endif
check_setting(enableDynBitrate, "Basic.Settings.Output.DynamicBitrate.Beta", "Basic.Settings.Advanced.Network");
if (incompatible_settings.isEmpty())
@@ -609,13 +605,9 @@ bool MultitrackVideoOutput::HandleIncompatibleSettings(QWidget *parent, config_t
incompatible_settings_list.toUtf8().constData(), action);
if (mb.clickedButton() == this_stream || mb.clickedButton() == all_streams) {
enableNewSocketLoop = false;
enableDynBitrate = false;
if (mb.clickedButton() == all_streams) {
#ifdef _WIN32
config_set_bool(config, "Output", "NewSocketLoopEnable", false);
#endif
config_set_bool(config, "Output", "DynamicBitrate", false);
}