From 382074b54cc0eb7a7c6d403853f4350d485fa00a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 26 Jan 2023 18:54:02 +0100
Subject: [PATCH] OP-4643 - implemented display and viewer color space

---
 openpype/lib/transcoding.py                   | 23 +++++++++++++++++--
 .../publish/extract_color_transcode.py        | 13 +++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index f22628dd28..cc9cd4e1eb 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -1053,6 +1053,8 @@ def convert_colorspace(
     config_path,
     source_colorspace,
     target_colorspace,
+    view,
+    display,
     logger=None
 ):
     """Convert source files from one color space to another.
@@ -1070,8 +1072,11 @@ def convert_colorspace(
         config_path (str): path to OCIO config file
         source_colorspace (str): ocio valid color space of source files
         target_colorspace (str): ocio valid target color space
+        view (str): name for viewer space (ocio valid)
+        display (str): name for display-referred reference space (ocio valid)
         logger (logging.Logger): Logger used for logging.
-
+    Raises:
+        ValueError: if misconfigured
     """
     if logger is None:
         logger = logging.getLogger(__name__)
@@ -1082,9 +1087,23 @@ def convert_colorspace(
         # Don't add any additional attributes
         "--nosoftwareattrib",
         "--colorconfig", config_path,
-        "--colorconvert", source_colorspace, target_colorspace,
         "-o", out_filepath
     ]
 
+    if all([target_colorspace, view, display]):
+        raise ValueError("Colorspace and both screen and display"
+                         " cannot be set together."
+                         "Choose colorspace or screen and display")
+    if not target_colorspace and not all([view, display]):
+        raise ValueError("Both screen and display must be set.")
+
+    if target_colorspace:
+        oiio_cmd.extend(["--colorconvert",
+                         source_colorspace,
+                         target_colorspace])
+    if view and display:
+        oiio_cmd.extend(["--iscolorspace", source_colorspace])
+        oiio_cmd.extend(["--ociodisplay", display, view])
+
     logger.debug("Conversion command: {}".format(" ".join(oiio_cmd)))
     run_subprocess(oiio_cmd, logger=logger)
diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py
index 09c86909cb..cd8421c0cd 100644
--- a/openpype/plugins/publish/extract_color_transcode.py
+++ b/openpype/plugins/publish/extract_color_transcode.py
@@ -106,8 +106,15 @@ class ExtractOIIOTranscode(publish.Extractor):
                     new_repre["files"] = renamed_files
 
                 target_colorspace = output_def["colorspace"]
-                if not target_colorspace:
-                    raise RuntimeError("Target colorspace must be set")
+                view = output_def["view"] or colorspace_data.get("view")
+                display = (output_def["display"] or
+                           colorspace_data.get("display"))
+                # both could be already collected by DCC,
+                # but could be overwritten
+                if view:
+                    new_repre["colorspaceData"]["view"] = view
+                if display:
+                    new_repre["colorspaceData"]["view"] = display
 
                 files_to_convert = self._translate_to_sequence(
                     files_to_convert)
@@ -123,6 +130,8 @@ class ExtractOIIOTranscode(publish.Extractor):
                         config_path,
                         source_colorspace,
                         target_colorspace,
+                        view,
+                        display,
                         self.log
                     )