From 4a5a2d1111c8a2fa56fe96aaf181b660d0e790fd Mon Sep 17 00:00:00 2001 From: Ruwen Hahn Date: Thu, 8 Jun 2023 19:24:08 +0200 Subject: [PATCH] obs-ffmpeg: Allow GPU scaling for obs-nvenc --- plugins/obs-ffmpeg/obs-nvenc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/obs-ffmpeg/obs-nvenc.c b/plugins/obs-ffmpeg/obs-nvenc.c index f06f9e0b6..1be8140ec 100644 --- a/plugins/obs-ffmpeg/obs-nvenc.c +++ b/plugins/obs-ffmpeg/obs-nvenc.c @@ -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()) {