OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-03 01:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 039f54d759 into 9d67bf2662

Browse source
This commit is contained in:
prgmitchell 2024-06-27 11:04:08 +02:00 committed by GitHub
parent 9d67bf2662 039f54d759
commit 2f51ef4243
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
UI/window-basic-main-outputs.cpp
View file

@ -850,7 +850,19 @@ void SimpleOutput::Update()
audioSettings);
if (!enforceBitrate) {
blog(LOG_INFO, "User is ignoring service bitrate limits.");
int MaxVBitrate, MaxABitrate;
obs_service_get_max_bitrate(main->GetService(), &MaxVBitrate,
&MaxABitrate);
std::string videoBitrateStr =
MaxVBitrate > 0 ? std::to_string(MaxVBitrate) : "None";
std::string audioBitrateStr =
MaxABitrate > 0 ? std::to_string(MaxABitrate) : "None";
blog(LOG_INFO,
"User is ignoring service bitrate limits.\nService Recommendations:\n\tvideo bitrate: %s\n\taudio bitrate: %s",
videoBitrateStr.c_str(), audioBitrateStr.c_str());
obs_data_set_int(videoSettings, "bitrate", videoBitrate);
obs_data_set_int(audioSettings, "bitrate", audioBitrate);
}
@ -1818,8 +1830,20 @@ void AdvancedOutput::UpdateStreamSettings()
obs_service_apply_encoder_settings(main->GetService(), settings,
nullptr);
if (!enforceBitrate) {
int MaxVBitrate, MaxABitrate;
obs_service_get_max_bitrate(main->GetService(),
&MaxVBitrate, &MaxABitrate);
std::string videoBitrateStr =
MaxVBitrate > 0 ? std::to_string(MaxVBitrate)
: "None";
std::string audioBitrateStr =
MaxABitrate > 0 ? std::to_string(MaxABitrate)
: "None";
blog(LOG_INFO,
"User is ignoring service bitrate limits.");
"User is ignoring service bitrate limits.\nService Recommendations:\n\tvideo bitrate: %s\n\taudio bitrate: %s",
videoBitrateStr.c_str(), audioBitrateStr.c_str());
obs_data_set_int(settings, "bitrate", bitrate);
}