Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into bugfix/extract_oiio_transcode_apply_scene_display_view

Browse source
This commit is contained in:
Mustafa Zaky Jafar 2025-11-28 17:24:50 +02:00 • committed by GitHub
commit ddb29c857b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/ayon_core/lib/transcoding.py
View file

@ -1232,6 +1232,14 @@ def oiio_color_convert(
# Handle the different conversion cases # Handle the different conversion cases
# Source view and display are known # Source view and display are known
if source_view and source_display: if source_view and source_display:
color_convert_args = None
ocio_display_args = None
oiio_cmd.extend([
"--ociodisplay:inverse=1:subimages=0",
source_display,
source_view,
])
if target_colorspace: if target_colorspace:
# This is a two-step conversion process since there's no direct # This is a two-step conversion process since there's no direct
# display/view to colorspace command # display/view to colorspace command
@ -1241,22 +1249,25 @@ def oiio_color_convert(
elif source_display != target_display or source_view != target_view: elif source_display != target_display or source_view != target_view:
# Complete display/view pair conversion # Complete display/view pair conversion
# - go through a reference space # - go through a reference space
color_convert_args = (target_display, target_view) ocio_display_args = (target_display, target_view)
else: else:
color_convert_args = None
logger.debug( logger.debug(
"Source and target display/view pairs are identical." "Source and target display/view pairs are identical."
" No color conversion needed." " No color conversion needed."
) )
if color_convert_args: if color_convert_args:
# Use colorconvert for colorspace target
oiio_cmd.extend([ oiio_cmd.extend([
"--ociodisplay:inverse=1:subimages=0",
source_display,
source_view,
"--colorconvert:subimages=0", "--colorconvert:subimages=0",
*color_convert_args *color_convert_args
]) ])
elif ocio_display_args:
# Use ociodisplay for display/view target
oiio_cmd.extend([
"--ociodisplay:subimages=0",
*ocio_display_args
])
elif target_colorspace: elif target_colorspace:
# Standard color space to color space conversion # Standard color space to color space conversion