starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-24 02:34:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

obs-ffmpeg: Restore bad GPU index NVENC error message

Browse Source 
FFmpeg wipes priv_data if the encoder fails to start, so we need some
way of knowing if the GPU index was non-zero. This is a bit ugly but the
best way to do it for now.
This commit is contained in:
Richard Stanway
2023-02-17 11:19:08 -05:00
committed by Ryan Foster
parent e593335086
commit 7dae8d307c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
+7 -7
View File
@@ -35,6 +35,7 @@ struct nvenc_encoder {
#ifdef ENABLE_HEVC
bool hevc;
#endif
int gpu;
DARRAY(uint8_t) header;
DARRAY(uint8_t) sei;
};
@@ -178,6 +179,10 @@ static bool nvenc_update(struct nvenc_encoder *enc, obs_data_t *settings,
av_opt_set(enc->ffve.context->priv_data, "level", "auto", 0);
av_opt_set_int(enc->ffve.context->priv_data, "gpu", gpu, 0);
// This is ugly but ffmpeg wipes priv_data on error and we need
// to know this to show a proper error message.
enc->gpu = gpu;
set_psycho_aq(enc, psycho_aq);
enc->ffve.context->max_b_frames = bf;
@@ -243,20 +248,15 @@ static void on_init_error(void *data, int ret)
struct nvenc_encoder *enc = data;
struct dstr error_message = {0};
int64_t gpu;
if (av_opt_get_int(enc->ffve.context->priv_data, "gpu", 0, &gpu) < 0) {
gpu = -1;
}
dstr_copy(&error_message, obs_module_text("NVENC.Error"));
dstr_replace(&error_message, "%1", av_err2str(ret));
dstr_cat(&error_message, "\r\n\r\n");
if (gpu > 0) {
if (enc->gpu > 0) {
// if a non-zero GPU failed, almost always
// user error. tell then to fix it.
char gpu_str[16];
snprintf(gpu_str, sizeof(gpu_str) - 1, "%d", (int)gpu);
snprintf(gpu_str, sizeof(gpu_str) - 1, "%d", enc->gpu);
gpu_str[sizeof(gpu_str) - 1] = 0;
dstr_cat(&error_message, obs_module_text("NVENC.BadGPUIndex"));