From e238970bd9d4c1fb6fcd30b9fde7779362bbdd20 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 2 Oct 2025 17:20:35 +0200 Subject: [PATCH] Color Management: Update for new extended sRGB naming conventions in OCIO Recognize srgbe_ prefix for interop ID, and edr-video encoding as HDR. Pull Request: https://projects.blender.org/blender/blender/pulls/147205 --- source/blender/imbuf/intern/colormanagement.cc | 2 +- .../imbuf/opencolorio/intern/libocio/libocio_colorspace.cc | 2 +- .../imbuf/opencolorio/intern/libocio/libocio_display.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc index d7fc30cfef6..30dacdc37a3 100644 --- a/source/blender/imbuf/intern/colormanagement.cc +++ b/source/blender/imbuf/intern/colormanagement.cc @@ -1503,7 +1503,7 @@ bool IMB_colormanagement_space_to_cicp(const ColorSpace *colorspace, cicp[3] = CICP_RANGE_FULL; return true; } - if (ELEM(interop_id, "srgb_p3d65_display", "srgbx_p3d65_display")) { + if (ELEM(interop_id, "srgb_p3d65_display", "srgbe_p3d65_display")) { /* For video we use BT.709 to match default sRGB writing, even though it is wrong. * But we have been writing sRGB like this forever, and there is the so called * "Quicktime gamma shift bug" that complicates things. */ diff --git a/source/blender/imbuf/opencolorio/intern/libocio/libocio_colorspace.cc b/source/blender/imbuf/opencolorio/intern/libocio/libocio_colorspace.cc index 7f79560851f..e46931a06b5 100644 --- a/source/blender/imbuf/opencolorio/intern/libocio/libocio_colorspace.cc +++ b/source/blender/imbuf/opencolorio/intern/libocio/libocio_colorspace.cc @@ -150,7 +150,7 @@ LibOCIOColorSpace::LibOCIOColorSpace(const int index, interop_id_ = "srgb_p3d65_display"; } else if (alias == "displayp3_hdr_display") { - interop_id_ = "srgbx_p3d65_display"; + interop_id_ = "srgbe_p3d65_display"; } else if (alias == "p3d65_display") { interop_id_ = "g26_p3d65_display"; diff --git a/source/blender/imbuf/opencolorio/intern/libocio/libocio_display.cc b/source/blender/imbuf/opencolorio/intern/libocio/libocio_display.cc index aaa59f544f0..b654ba37ebd 100644 --- a/source/blender/imbuf/opencolorio/intern/libocio/libocio_display.cc +++ b/source/blender/imbuf/opencolorio/intern/libocio/libocio_display.cc @@ -114,7 +114,7 @@ LibOCIODisplay::LibOCIODisplay(const int index, const LibOCIOConfig &config) : c bool view_is_hdr = false; if (ocio_display_colorspace) { StringRefNull encoding = ocio_display_colorspace->getEncoding(); - view_is_hdr = encoding == "hdr-video"; + view_is_hdr = encoding == "hdr-video" || encoding == "edr-video"; is_hdr_ |= view_is_hdr; } @@ -155,7 +155,7 @@ LibOCIODisplay::LibOCIODisplay(const int index, const LibOCIOConfig &config) : c if (display_interop_id.startswith("srgb_")) { transfer_function = TransferFunction::sRGB; } - else if (display_interop_id.startswith("srgbx_")) { + else if (display_interop_id.startswith("srgbe_")) { transfer_function = TransferFunction::ExtendedsRGB; } else if (display_interop_id.startswith("pq_")) {