mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-20 10:09:15 +00:00
Merge 039f54d759
into edcda5a825
This commit is contained in:
commit
d145a4a424
|
@ -850,7 +850,19 @@ void SimpleOutput::Update()
|
||||||
audioSettings);
|
audioSettings);
|
||||||
|
|
||||||
if (!enforceBitrate) {
|
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(videoSettings, "bitrate", videoBitrate);
|
||||||
obs_data_set_int(audioSettings, "bitrate", audioBitrate);
|
obs_data_set_int(audioSettings, "bitrate", audioBitrate);
|
||||||
}
|
}
|
||||||
|
@ -1818,8 +1830,20 @@ void AdvancedOutput::UpdateStreamSettings()
|
||||||
obs_service_apply_encoder_settings(main->GetService(), settings,
|
obs_service_apply_encoder_settings(main->GetService(), settings,
|
||||||
nullptr);
|
nullptr);
|
||||||
if (!enforceBitrate) {
|
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,
|
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);
|
obs_data_set_int(settings, "bitrate", bitrate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue