From 2476678b3c420d00fba983002aaa8f742051d0ca Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Fri, 8 Jul 2022 20:11:00 +0900 Subject: [PATCH] d3d11: Update colorspace map Map DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 to sRGB colorimetry Part-of: --- .../gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.cpp b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.cpp index 96948e9..dee92a6 100644 --- a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.cpp +++ b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.cpp @@ -217,21 +217,21 @@ static const GstDxgiColorSpace rgb_colorspace_map[] = { */ /* 1) RGB_FULL_G22_NONE_P709 */ + MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, SRGB, BT709), + /* 1-1) Approximation for RGB_FULL_G22_NONE_P709 */ MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT709, BT709), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT601, BT709), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT2020_10, BT709), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT2020_12, BT709), + MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, SRGB, BT470BG), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT709, BT470BG), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT601, BT470BG), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT2020_10, BT470BG), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, BT2020_12, BT470BG), - /* 1-1) Approximation for RGB_FULL_G22_NONE_P709 */ - MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, SRGB, BT709), - MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P709, _0_255, UNKNOWN, SRGB, BT470BG), - /* 2) RGB_FULL_G10_NONE_P709 */ MAKE_COLOR_MAP (RGB_FULL_G10_NONE_P709, _0_255, UNKNOWN, GAMMA10, BT709), + /* 2-1 ) Approximation for RGB_FULL_G10_NONE_P709 */ MAKE_COLOR_MAP (RGB_FULL_G10_NONE_P709, _0_255, UNKNOWN, GAMMA10, BT470BG), /* 3) RGB_STUDIO_G22_NONE_P709 */ @@ -239,14 +239,13 @@ static const GstDxgiColorSpace rgb_colorspace_map[] = { MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT601, BT709), MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT2020_10, BT709), MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT2020_12, BT709), + /* 3-1) Approximation for RGB_STUDIO_G22_NONE_P709 */ MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT709, BT470BG), MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT601, BT470BG), MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT2020_10, BT470BG), MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, BT2020_12, BT470BG), - - /* 3-1) Approximation for RGB_STUDIO_G22_NONE_P709 */ MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, SRGB, BT709), MAKE_COLOR_MAP (RGB_STUDIO_G22_NONE_P709, _16_235, UNKNOWN, SRGB, BT470BG), @@ -271,12 +270,12 @@ static const GstDxgiColorSpace rgb_colorspace_map[] = { MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P2020, _0_255, UNKNOWN, BT601, BT2020), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P2020, _0_255, UNKNOWN, BT2020_10, BT2020), MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P2020, _0_255, UNKNOWN, BT2020_12, BT2020), - /* 7-1) Approximation for RGB_FULL_G22_NONE_P2020 */ MAKE_COLOR_MAP (RGB_FULL_G22_NONE_P2020, _0_255, UNKNOWN, SRGB, BT2020), /* 8) RGB_STUDIO_G24_NONE_P709 */ MAKE_COLOR_MAP (RGB_STUDIO_G24_NONE_P709, _16_235, UNKNOWN, SRGB, BT709), + /* 8-1) Approximation for RGB_STUDIO_G24_NONE_P709 */ MAKE_COLOR_MAP (RGB_STUDIO_G24_NONE_P709, _16_235, UNKNOWN, SRGB, BT470BG), /* 9) RGB_STUDIO_G24_NONE_P2020 */ @@ -716,7 +715,7 @@ gst_d3d11_find_swap_chain_color_space (const GstVideoInfo * info, GST_DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709; color_space->range = GST_VIDEO_COLOR_RANGE_0_255; color_space->matrix = GST_VIDEO_COLOR_MATRIX_RGB; - color_space->transfer = GST_VIDEO_TRANSFER_BT709; + color_space->transfer = GST_VIDEO_TRANSFER_SRGB; color_space->primaries = GST_VIDEO_COLOR_PRIMARIES_BT709; return TRUE; } -- 2.7.4