mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

libobs: Fix GPU scaling always using the main mix

Browse Source
This commit is contained in:
derrod 2023-11-29 15:12:15 +01:00 committed by Lain
parent 758b47d4ed
commit 49e796c6fc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libobs/obs-encoder.c
View File

@ -198,7 +198,7 @@ static inline bool gpu_encode_available(const struct obs_encoder *encoder)
*/
static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
{
struct obs_core_video_mix *mix = NULL;
struct obs_core_video_mix *mix, *current_mix;
bool create_mix = true;
struct obs_video_info ovi;
const struct video_output_info *info;
@ -214,12 +214,16 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
if (!encoder->scaled_height && !encoder->scaled_width)
return;
current_mix = get_mix_for_video(encoder->media);
if (!current_mix)
return;
pthread_mutex_lock(&obs->video.mixes_mutex);
for (size_t i = 0; i < obs->video.mixes.num; i++) {
struct obs_core_video_mix *current = obs->video.mixes.array[i];
const struct video_output_info *voi =
video_output_get_info(current->video);
if (current->view != &obs->data.main_view)
if (current_mix->view != current->view)
continue;
if (voi->width != encoder->scaled_width ||
@ -237,17 +241,13 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
break;
}
if (!obs->video.main_mix) {
create_mix = false;
} else {
ovi = obs->video.main_mix->ovi;
}
pthread_mutex_unlock(&obs->video.mixes_mutex);
if (!create_mix)
return;
ovi = current_mix->ovi;
ovi.output_format = info->format;
ovi.colorspace = info->colorspace;
ovi.range = info->range;
@ -264,7 +264,7 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
mix->encoder_only_mix = true;
mix->encoder_refs = 1;
mix->view = &obs->data.main_view;
mix->view = current_mix->view;
pthread_mutex_lock(&obs->video.mixes_mutex);