opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

obs-ffmpeg: Cap NVENC Max B-frames according to GPU caps

Browse Source 
Erroring out of NVENC init early if the Max B-frames setting was higher
than the encoder's capability causes an encoder failure on NVIDIA Pascal
(10-series) and earlier GPUs due to an unfortunate interaction between
Simple Output Mode, HEVC, and our default B-frames setting of 2. Since
we already check the Max B-frames capability of the encoder, cap at that
value instead of erroring out.

Fixes #7698.
This commit is contained in:
Ryan Foster
2022-11-01 15:26:23 -07:00
committed by Jim
parent a3d340f0be
commit 77fbfbe5c6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/obs-ffmpeg/jim-nvenc.c
+6 -3
View File
@@ -1005,7 +1005,7 @@ static bool init_specific_encoder(struct nvenc_data *enc, obs_data_t *settings,
static bool init_encoder(struct nvenc_data *enc, enum codec_type codec, static bool init_encoder(struct nvenc_data *enc, enum codec_type codec,
obs_data_t *settings, obs_encoder_t *encoder) obs_data_t *settings, obs_encoder_t *encoder)
{ {
const int bf = (int)obs_data_get_int(settings, "bf"); int bf = (int)obs_data_get_int(settings, "bf");
const bool psycho_aq = obs_data_get_bool(settings, "psycho_aq"); const bool psycho_aq = obs_data_get_bool(settings, "psycho_aq");
const bool support_10bit = const bool support_10bit =
nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_10BIT_ENCODE); nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_10BIT_ENCODE);
@@ -1032,8 +1032,11 @@ static bool init_encoder(struct nvenc_data *enc, enum codec_type codec,
} }
if (bf > bf_max) { if (bf > bf_max) {
NV_FAIL(obs_module_text("NVENC.TooManyBFrames"), bf, bf_max); blog(LOG_WARNING,
return false; "[jim-nvenc] Max B-frames setting (%d) is more than encoder supports (%d).\n"
"Setting B-frames to %d",
bf, bf_max, bf_max);
bf = bf_max;
} }
if (!init_specific_encoder(enc, settings, bf, psycho_aq)) { if (!init_specific_encoder(enc, settings, bf, psycho_aq)) {