4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix cases where wizard bitrate is not capped

Browse source 
Fixes some cases where the maximum bitrate might not be capped by the
service selection as it's supposed to be.
This commit is contained in:
jp9000 2017-05-17 22:31:02 -07:00
commit 8dff07ad46
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
UI/window-basic-auto-config-test.cpp
View file

@ -240,12 +240,12 @@ void AutoConfigTestPage::TestBandwidthThread()
/* -----------------------------------*/
/* apply settings */
obs_service_update(service, service_settings);
obs_service_apply_encoder_settings(service,
vencoder_settings, aencoder_settings);
obs_encoder_update(vencoder, vencoder_settings);
obs_encoder_update(aencoder, aencoder_settings);
obs_service_update(service, service_settings);
obs_output_update(output, output_settings);
/* -----------------------------------*/
@ -885,6 +885,30 @@ void AutoConfigTestPage::FinalizeResults()
};
if (wiz->type != AutoConfig::Type::Recording) {
const char *serverType = wiz->customServer
? "rtmp_custom"
: "rtmp_common";
OBSService service = obs_service_create(serverType,
"temp_service", nullptr, nullptr);
obs_service_release(service);
OBSData service_settings = obs_data_create();
OBSData vencoder_settings = obs_data_create();
obs_data_release(service_settings);
obs_data_release(vencoder_settings);
obs_data_set_int(vencoder_settings, "bitrate",
wiz->idealBitrate);
obs_data_set_string(service_settings, "service",
wiz->serviceName.c_str());
obs_service_apply_encoder_settings(service,
vencoder_settings, nullptr);
wiz->idealBitrate = (int)obs_data_get_int(vencoder_settings,
"bitrate");
if (!wiz->customServer)
form->addRow(
newLabel("Basic.AutoConfig.StreamPage.Service"),