diff --git a/frontend/utility/MultitrackVideoOutput.cpp b/frontend/utility/MultitrackVideoOutput.cpp index 2870effa4..ebd6890ac 100644 --- a/frontend/utility/MultitrackVideoOutput.cpp +++ b/frontend/utility/MultitrackVideoOutput.cpp @@ -158,9 +158,6 @@ static void adjust_video_encoder_scaling(const obs_video_info &ovi, obs_encoder_ auto requested_width = encoder_config.width; auto requested_height = encoder_config.height; - if (ovi.output_width == requested_width || ovi.output_height == requested_height) - return; - if (ovi.base_width < requested_width || ovi.base_height < requested_height) { blog(LOG_WARNING, "Requested resolution exceeds canvas/available resolution for encoder %zu: %" PRIu32 "x%" PRIu32 @@ -170,7 +167,9 @@ static void adjust_video_encoder_scaling(const obs_video_info &ovi, obs_encoder_ obs_encoder_set_scaled_size(video_encoder, requested_width, requested_height); obs_encoder_set_gpu_scale_type(video_encoder, encoder_config.gpu_scale_type.value_or(OBS_SCALE_BICUBIC)); - obs_encoder_set_preferred_video_format(video_encoder, VIDEO_FORMAT_NV12); + obs_encoder_set_preferred_video_format(video_encoder, encoder_config.format.value_or(VIDEO_FORMAT_NV12)); + obs_encoder_set_preferred_color_space(video_encoder, encoder_config.colorspace.value_or(VIDEO_CS_709)); + obs_encoder_set_preferred_range(video_encoder, encoder_config.range.value_or(VIDEO_RANGE_PARTIAL)); } static uint32_t closest_divisor(const obs_video_info &ovi, const media_frames_per_second &target_fps) diff --git a/frontend/utility/models/multitrack-video.hpp b/frontend/utility/models/multitrack-video.hpp index fe2474a36..4029fd752 100644 --- a/frontend/utility/models/multitrack-video.hpp +++ b/frontend/utility/models/multitrack-video.hpp @@ -56,6 +56,34 @@ NLOHMANN_JSON_SERIALIZE_ENUM(obs_scale_type, { {OBS_SCALE_AREA, "OBS_SCALE_AREA"}, }) +NLOHMANN_JSON_SERIALIZE_ENUM(video_colorspace, { + {VIDEO_CS_DEFAULT, "VIDEO_CS_DEFAULT"}, + {VIDEO_CS_601, "VIDEO_CS_601"}, + {VIDEO_CS_709, "VIDEO_CS_709"}, + {VIDEO_CS_SRGB, "VIDEO_CS_SRGB"}, + {VIDEO_CS_2100_PQ, "VIDEO_CS_2100_PQ"}, + {VIDEO_CS_2100_HLG, "VIDEO_CS_2100_HLG"}, + }) + +/* This only includes output formats selectable in advanced settings. */ +NLOHMANN_JSON_SERIALIZE_ENUM(video_format, { + {VIDEO_FORMAT_NONE, "VIDEO_FORMAT_NONE"}, + {VIDEO_FORMAT_I420, "VIDEO_FORMAT_I420"}, + {VIDEO_FORMAT_NV12, "VIDEO_FORMAT_NV12"}, + {VIDEO_FORMAT_BGRA, "VIDEO_FORMAT_BGRA"}, + {VIDEO_FORMAT_I444, "VIDEO_FORMAT_I444"}, + {VIDEO_FORMAT_I010, "VIDEO_FORMAT_I010"}, + {VIDEO_FORMAT_P010, "VIDEO_FORMAT_P010"}, + {VIDEO_FORMAT_P216, "VIDEO_FORMAT_P216"}, + {VIDEO_FORMAT_P416, "VIDEO_FORMAT_P416"}, + }) + +NLOHMANN_JSON_SERIALIZE_ENUM(video_range_type, { + {VIDEO_RANGE_DEFAULT, "VIDEO_RANGE_DEFAULT"}, + {VIDEO_RANGE_PARTIAL, "VIDEO_RANGE_PARTIAL"}, + {VIDEO_RANGE_FULL, "VIDEO_RANGE_FULL"}, + }) + NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(media_frames_per_second, numerator, denominator) namespace GoLiveApi { @@ -212,10 +240,13 @@ struct VideoEncoderConfiguration { uint32_t height; optional framerate; optional gpu_scale_type; + optional colorspace; + optional range; + optional format; json settings; NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(VideoEncoderConfiguration, type, width, height, framerate, - gpu_scale_type, settings) + gpu_scale_type, colorspace, range, format, settings) }; struct AudioEncoderConfiguration {