jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix cases where wizard bitrate is not capped 

Fixes some cases where the maximum bitrate might not be capped by the
service selection as it's supposed to be.
master
jp9000 2017-05-17 22:31:02 -07:00
parent 4aea3ce7da
commit 8dff07ad46
1 changed files with 25 additions and 1 deletions
Show Stats 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 */ /* apply settings */
obs_service_update(service, service_settings);
obs_service_apply_encoder_settings(service, obs_service_apply_encoder_settings(service,
vencoder_settings, aencoder_settings); vencoder_settings, aencoder_settings);
obs_encoder_update(vencoder, vencoder_settings); obs_encoder_update(vencoder, vencoder_settings);
obs_encoder_update(aencoder, aencoder_settings); obs_encoder_update(aencoder, aencoder_settings);
obs_service_update(service, service_settings);
obs_output_update(output, output_settings); obs_output_update(output, output_settings);
/* -----------------------------------*/ /* -----------------------------------*/
@ -885,6 +885,30 @@ void AutoConfigTestPage::FinalizeResults()
}; };
if (wiz->type != AutoConfig::Type::Recording) { 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) if (!wiz->customServer)
form->addRow( form->addRow(
newLabel("Basic.AutoConfig.StreamPage.Service"), newLabel("Basic.AutoConfig.StreamPage.Service"),