Skip to content

Commit b5b5b01

Browse files
authored
multitrack: revert encoder gpu scale (#1664)
* multitrack: revert encoder gpu scale * revert preferred colorspace to VIDEO_CS_709 which I recently changed in commit ac57016. But after diagnosing the root cause properly, that change was unnecessary. * removing the redundant (?) obs_encoder_set_video_mix call. This was already set by the create_video_encoder() function
1 parent 6eaf4a0 commit b5b5b01

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

obs-studio-server/source/osn-multitrack-video-output.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static void adjust_video_encoder_scaling(const obs_video_info &ovi, obs_encoder_
6565
obs_encoder_set_scaled_size(video_encoder, requested_width, requested_height);
6666
obs_encoder_set_gpu_scale_type(video_encoder, encoder_config.gpu_scale_type.value_or(OBS_SCALE_BICUBIC));
6767
obs_encoder_set_preferred_video_format(video_encoder, encoder_config.format.value_or(VIDEO_FORMAT_NV12));
68-
obs_encoder_set_preferred_color_space(video_encoder, encoder_config.colorspace.value_or(VIDEO_CS_DEFAULT));
68+
obs_encoder_set_preferred_color_space(video_encoder, encoder_config.colorspace.value_or(VIDEO_CS_709));
6969
obs_encoder_set_preferred_range(video_encoder, encoder_config.range.value_or(VIDEO_RANGE_PARTIAL));
7070
}
7171

@@ -209,8 +209,6 @@ static bool create_video_encoders(const Config &go_live_config, std::shared_ptr<
209209

210210
if (obs_get_multiple_rendering()) {
211211
obs_encoder_set_video_mix(encoder, obs_video_mix_get(ovi, OBS_STREAMING_VIDEO_RENDERING));
212-
} else {
213-
obs_encoder_set_video_mix(encoder, obs_video_mix_get(ovi, OBS_MAIN_VIDEO_RENDERING));
214212
}
215213

216214
if (!obs_encoder_set_group(encoder, encoder_group.get())) {

0 commit comments

Comments
 (0)