From 945f1dfe55ad1f150cf0f71baacaea80857a0e4e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 22 Feb 2023 17:33:20 +0100
Subject: [PATCH] OP-4643 - added explicit enum for transcoding type

As transcoding info (colorspace, display) might be collected from DCC, it must be explicit which should be used.
---
 openpype/lib/transcoding.py                       |  2 +-
 .../plugins/publish/extract_color_transcode.py    | 15 +++++++++++----
 .../schemas/schema_global_publish.json            |  9 +++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index 376297ff32..c0bda2aa37 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -1052,7 +1052,7 @@ def convert_colorspace(
     output_path,
     config_path,
     source_colorspace,
-    target_colorspace,
+    target_colorspace=None,
     view=None,
     display=None,
     additional_command_args=None,
diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py
index 456e40008d..b0921688e9 100644
--- a/openpype/plugins/publish/extract_color_transcode.py
+++ b/openpype/plugins/publish/extract_color_transcode.py
@@ -118,10 +118,17 @@ class ExtractOIIOTranscode(publish.Extractor):
                                                output_name,
                                                output_extension)
 
-                target_colorspace = output_def["colorspace"]
-                view = output_def["view"] or colorspace_data.get("view")
-                display = (output_def["display"] or
-                           colorspace_data.get("display"))
+                transcoding_type = output_def["transcoding_type"]
+
+                target_colorspace = view = display = None
+                if transcoding_type == "colorspace":
+                    target_colorspace = (output_def["colorspace"] or
+                                         colorspace_data.get("colorspace"))
+                else:
+                    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:
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index 3e9467af61..76574e8b9b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -271,6 +271,15 @@
                                             "label": "Extension",
                                             "type": "text"
                                         },
+                                        {
+                                            "type": "enum",
+                                            "key": "transcoding_type",
+                                            "label": "Transcoding type",
+                                            "enum_items": [
+                                                { "colorspace": "Use Colorspace" },
+                                                { "display": "Use Display&View" }
+                                            ]
+                                        },
                                         {
                                             "key": "colorspace",
                                             "label": "Colorspace",