jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-ffmpeg: Fix NVENC lossless mode 

Lossless mode is set through the preset setting, and the profile ffmpeg
setting was incorrectly being set as lossless instead.
master
jp9000 2016-05-16 04:18:29 -07:00
parent 48185cc404
commit 757c1942dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
View File

@ -160,6 +160,8 @@ static bool nvenc_update(void *data, obs_data_t *settings)
nvenc_video_info(enc, &info); nvenc_video_info(enc, &info);
av_opt_set_int(enc->context->priv_data, "cbr", false, 0); av_opt_set_int(enc->context->priv_data, "cbr", false, 0);
av_opt_set(enc->context->priv_data, "preset", preset, 0);
if (astrcmpi(rc, "cqp") == 0) { if (astrcmpi(rc, "cqp") == 0) {
bitrate = 0; bitrate = 0;
enc->context->global_quality = cqp; enc->context->global_quality = cqp;
@ -171,7 +173,7 @@ static bool nvenc_update(void *data, obs_data_t *settings)
bool hp = (astrcmpi(preset, "hp") == 0 || bool hp = (astrcmpi(preset, "hp") == 0 ||
astrcmpi(preset, "llhp") == 0); astrcmpi(preset, "llhp") == 0);
av_opt_set(enc->context->priv_data, "profile", av_opt_set(enc->context->priv_data, "preset",
hp ? "losslesshp" : "lossless", 0); hp ? "losslesshp" : "lossless", 0);
} else if (astrcmpi(rc, "vbr") != 0) { /* CBR by default */ } else if (astrcmpi(rc, "vbr") != 0) { /* CBR by default */
@ -182,7 +184,6 @@ static bool nvenc_update(void *data, obs_data_t *settings)
} }
av_opt_set(enc->context->priv_data, "preset", preset, 0);
av_opt_set(enc->context->priv_data, "level", level, 0); av_opt_set(enc->context->priv_data, "level", level, 0);
av_opt_set_int(enc->context->priv_data, "2pass", twopass, 0); av_opt_set_int(enc->context->priv_data, "2pass", twopass, 0);
av_opt_set_int(enc->context->priv_data, "gpu", gpu, 0); av_opt_set_int(enc->context->priv_data, "gpu", gpu, 0);