etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-14 07:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoders/ffmpeg/nvenc: Allow OBS to detect or override bitrate

Browse source 
We won't allow OBS to override everything, just the bare minimum necessary for Replay Buffer, Dynamic Bitrate and generic Streaming.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-12-03 08:22:08 +01:00
parent 567620a6ad
commit 2505b193c8
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
source/encoders/handlers/nvenc_shared.cpp
View file

@ -547,6 +547,10 @@ void nvenc::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* c
switch (rc) { switch (rc) {
case ratecontrolmode::CQP: case ratecontrolmode::CQP:
have_qp = true; have_qp = true;
{ // Support for OBS Studio
obs_data_set_string(settings, "rate_control", "CQP");
}
break; break;
case ratecontrolmode::INVALID: case ratecontrolmode::INVALID:
case ratecontrolmode::CBR: case ratecontrolmode::CBR:
@ -557,6 +561,10 @@ void nvenc::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* c
if (!context->internal) { if (!context->internal) {
av_opt_set_int(context->priv_data, "cbr", 1, AV_OPT_SEARCH_CHILDREN); av_opt_set_int(context->priv_data, "cbr", 1, AV_OPT_SEARCH_CHILDREN);
} }
{ // Support for OBS Studio
obs_data_set_string(settings, "rate_control", "CBR");
}
break; break;
case ratecontrolmode::VBR: case ratecontrolmode::VBR:
case ratecontrolmode::VBR_HQ: case ratecontrolmode::VBR_HQ:
@ -565,6 +573,10 @@ void nvenc::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* c
have_quality = true; have_quality = true;
have_qp = true; have_qp = true;
have_qp_limits = true; have_qp_limits = true;
{ // Support for OBS Studio
obs_data_set_string(settings, "rate_control", "VBR");
}
break; break;
} }
@ -599,22 +611,33 @@ void nvenc::update(obs_data_t* settings, const AVCodec* codec, AVCodecContext* c
if (have_bitrate) { if (have_bitrate) {
int64_t v = obs_data_get_int(settings, ST_KEY_RATECONTROL_LIMITS_BITRATE_TARGET); int64_t v = obs_data_get_int(settings, ST_KEY_RATECONTROL_LIMITS_BITRATE_TARGET);
if (v > -1)
context->bit_rate = static_cast<int>(v * 1000);
// Support for Replay Buffer // Allow OBS to specify a maximum allowed bitrate.
obs_data_set_int(settings, "bitrate", v); if (obs_data_get_int(settings, "bitrate") != obs_data_get_default_int(settings, "bitrate")) {
// obs_data_has_user_value(X, Y) is also true if obs_data_set_Z(X, Y, obs_data_get_Z(X, Y))
v = std::clamp<int64_t>(v, -1, obs_data_get_int(settings, "bitrate"));
}
if (v > -1) {
context->bit_rate = static_cast<int>(v * 1000);
}
} else { } else {
context->bit_rate = 0; context->bit_rate = 0;
} }
if (have_bitrate_range) { if (have_bitrate_range) {
if (int64_t max = obs_data_get_int(settings, ST_KEY_RATECONTROL_LIMITS_BITRATE_MAXIMUM); max > -1) if (int64_t max = obs_data_get_int(settings, ST_KEY_RATECONTROL_LIMITS_BITRATE_MAXIMUM); max > -1) {
context->rc_max_rate = static_cast<int>(max * 1000); context->rc_max_rate = static_cast<int>(max * 1000);
} else {
context->rc_max_rate = context->bit_rate;
}
context->rc_min_rate = context->bit_rate; context->rc_min_rate = context->bit_rate;
} else { } else {
context->rc_min_rate = context->bit_rate; context->rc_min_rate = context->bit_rate;
context->rc_max_rate = context->bit_rate; context->rc_max_rate = context->bit_rate;
} }
{ // Support for OBS Studio
obs_data_set_int(settings, "bitrate", context->rc_max_rate);
}
// Buffer Size // Buffer Size
if (have_bitrate || have_bitrate_range) { if (have_bitrate || have_bitrate_range) {