Skip to content

Commit

Permalink
Fix core colourspace labelling logic
Browse files Browse the repository at this point in the history
The core colourspace list now contains more items, better matching the CG config.

Signed-off-by: John-Paul Smith <[email protected]>
  • Loading branch information
john-paulsmith committed Apr 29, 2024
1 parent ff9b225 commit 122c534
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
22 changes: 11 additions & 11 deletions include/ofxColourspaceList.h
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceLinP3d65Encoding "scene-linear"
#define kOfxColourspaceLinP3d65IsSceneLinear true
#define kOfxColourspaceLinP3d65IsData false
#define kOfxColourspaceLinP3d65IsCore false
#define kOfxColourspaceLinP3d65IsCore true

// lin_rec2020
// Convert ACES2065-1 to linear Rec.2020 primaries, D65 white point
Expand All @@ -719,7 +719,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceLinRec2020Encoding "scene-linear"
#define kOfxColourspaceLinRec2020IsSceneLinear true
#define kOfxColourspaceLinRec2020IsData false
#define kOfxColourspaceLinRec2020IsCore false
#define kOfxColourspaceLinRec2020IsCore true

// lin_rec709_srgb
// Convert ACES2065-1 to linear Rec.709 primaries, D65 white point
Expand All @@ -735,7 +735,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceLinRec709SrgbEncoding "scene-linear"
#define kOfxColourspaceLinRec709SrgbIsSceneLinear true
#define kOfxColourspaceLinRec709SrgbIsData false
#define kOfxColourspaceLinRec709SrgbIsCore false
#define kOfxColourspaceLinRec709SrgbIsCore true

// g18_rec709_tx
// Convert ACES2065-1 to 1.8 gamma-corrected Rec.709 primaries, D65 white point
Expand All @@ -749,7 +749,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceG18Rec709TxEncoding "sdr-video"
#define kOfxColourspaceG18Rec709TxIsSceneLinear false
#define kOfxColourspaceG18Rec709TxIsData false
#define kOfxColourspaceG18Rec709TxIsCore false
#define kOfxColourspaceG18Rec709TxIsCore true

// g22_ap1_tx
// Convert ACES2065-1 to 2.2 gamma-corrected AP1 primaries, ACES ~=D60 white point
Expand All @@ -762,7 +762,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceG22Ap1TxEncoding "sdr-video"
#define kOfxColourspaceG22Ap1TxIsSceneLinear false
#define kOfxColourspaceG22Ap1TxIsData false
#define kOfxColourspaceG22Ap1TxIsCore false
#define kOfxColourspaceG22Ap1TxIsCore true

// g22_rec709_tx
// Convert ACES2065-1 to 2.2 gamma-corrected Rec.709 primaries, D65 white point
Expand All @@ -776,7 +776,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceG22Rec709TxEncoding "sdr-video"
#define kOfxColourspaceG22Rec709TxIsSceneLinear false
#define kOfxColourspaceG22Rec709TxIsData false
#define kOfxColourspaceG22Rec709TxIsCore false
#define kOfxColourspaceG22Rec709TxIsCore true

// g24_rec709_tx
// Convert ACES2065-1 to 2.4 gamma-corrected Rec.709 primaries, D65 white point
Expand All @@ -791,7 +791,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceG24Rec709TxEncoding "sdr-video"
#define kOfxColourspaceG24Rec709TxIsSceneLinear false
#define kOfxColourspaceG24Rec709TxIsData false
#define kOfxColourspaceG24Rec709TxIsCore false
#define kOfxColourspaceG24Rec709TxIsCore true

// srgb_encoded_ap1_tx
// Convert ACES2065-1 to sRGB Encoded AP1 primaries, ACES ~=D60 white point
Expand All @@ -804,7 +804,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceSrgbEncodedAp1TxEncoding "sdr-video"
#define kOfxColourspaceSrgbEncodedAp1TxIsSceneLinear false
#define kOfxColourspaceSrgbEncodedAp1TxIsData false
#define kOfxColourspaceSrgbEncodedAp1TxIsCore false
#define kOfxColourspaceSrgbEncodedAp1TxIsCore true

// srgb_encoded_p3d65_tx
// Convert ACES2065-1 to sRGB Encoded P3-D65 primaries, D65 white point
Expand All @@ -818,7 +818,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceSrgbEncodedP3d65TxEncoding "sdr-video"
#define kOfxColourspaceSrgbEncodedP3d65TxIsSceneLinear false
#define kOfxColourspaceSrgbEncodedP3d65TxIsData false
#define kOfxColourspaceSrgbEncodedP3d65TxIsCore false
#define kOfxColourspaceSrgbEncodedP3d65TxIsCore true

// srgb_tx
// Convert ACES2065-1 to sRGB
Expand All @@ -833,7 +833,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceSrgbTxEncoding "sdr-video"
#define kOfxColourspaceSrgbTxIsSceneLinear false
#define kOfxColourspaceSrgbTxIsData false
#define kOfxColourspaceSrgbTxIsCore false
#define kOfxColourspaceSrgbTxIsCore true

// Raw
// The utility "Raw" colorspace.
Expand All @@ -844,7 +844,7 @@ This file was auto-generated by scripts/genColour from studio-config-v2.1.0_aces
#define kOfxColourspaceRawEncoding ""
#define kOfxColourspaceRawIsSceneLinear false
#define kOfxColourspaceRawIsData true
#define kOfxColourspaceRawIsCore false
#define kOfxColourspaceRawIsCore true

#ifdef __cplusplus
}
Expand Down
6 changes: 4 additions & 2 deletions scripts/genColour
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,11 @@ for display in studio_config.getDisplays():
print_colourspace(studio_config.getColorSpace(display), is_core)

print('\n// Scene Colourspaces')
core_colourspaces = cg_config.getColorSpaceNames()
for spc in studio_config.getColorSpaces():
is_core = spc.getName() in core_colourspaces
if None == cg_config.getColorSpace(spc.getName()):
is_core = False
else:
is_core = True
print_colourspace(spc, is_core)

print(footer)

0 comments on commit 122c534

Please sign in to comment.