Merge pull request #2356 from jpark37/sycc-color-space

Color space refinements
This commit is contained in:
Jim
2020-08-05 08:58:21 -07:00
committed by GitHub
13 changed files with 189 additions and 54 deletions

View File

@@ -1383,7 +1383,7 @@ bool OBSBasic::InitBasicConfigDefaults()
config_set_default_uint(basicConfig, "Video", "FPSDen", 1);
config_set_default_string(basicConfig, "Video", "ScaleType", "bicubic");
config_set_default_string(basicConfig, "Video", "ColorFormat", "NV12");
config_set_default_string(basicConfig, "Video", "ColorSpace", "601");
config_set_default_string(basicConfig, "Video", "ColorSpace", "sRGB");
config_set_default_string(basicConfig, "Video", "ColorRange",
"Partial");
@@ -3792,8 +3792,11 @@ int OBSBasic::ResetVideo()
ovi.output_height =
(uint32_t)config_get_uint(basicConfig, "Video", "OutputCY");
ovi.output_format = GetVideoFormatFromName(colorFormat);
ovi.colorspace = astrcmpi(colorSpace, "601") == 0 ? VIDEO_CS_601
: VIDEO_CS_709;
ovi.colorspace = astrcmpi(colorSpace, "601") == 0
? VIDEO_CS_601
: (astrcmpi(colorSpace, "709") == 0
? VIDEO_CS_709
: VIDEO_CS_SRGB);
ovi.range = astrcmpi(colorRange, "Full") == 0 ? VIDEO_RANGE_FULL
: VIDEO_RANGE_PARTIAL;
ovi.adapter =