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

obs-ffmpeg: Allow GPU scaling for obs-nvenc

Browse Source
This commit is contained in:
Ruwen Hahn
2023-06-08 19:24:08 +02:00
parent 03fa9acc7f
commit 4a5a2d1111
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,8 +452,8 @@ static bool init_encoder_base(struct nvenc_data *enc, obs_data_t *settings,
video_t *video = obs_encoder_video(enc->encoder);
const struct video_output_info *voi = video_output_get_info(video);
enc->cx = voi->width;
enc->cy = voi->height;
enc->cx = obs_encoder_get_width(enc->encoder);
enc->cy = obs_encoder_get_height(enc->encoder);
/* -------------------------- */
/* get preset */
@@ -1140,9 +1140,12 @@ static void *nvenc_create_base(enum codec_type codec, obs_data_t *settings,
}
if (obs_encoder_scaling_enabled(encoder)) {
blog(LOG_INFO,
"[obs-nvenc] scaling enabled, falling back to ffmpeg");
goto reroute;
if (!obs_encoder_gpu_scaling_enabled(encoder)) {
blog(LOG_INFO,
"[obs-nvenc] CPU scaling enabled, falling back to ffmpeg");
goto reroute;
}
blog(LOG_INFO, "[obs-nvenc] GPU scaling enabled");
}
if (!obs_p010_tex_active() && !obs_nv12_tex_active()) {