X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Fcolorspaces%2Faces.py;h=167d8e81f5bac7025c3e5a05738a03838d85a62d;hb=3d531dce5348148c92789eebf0d198c42c2a0820;hp=cf02f5ca31a87aa9e169ce24cebc2564540f5c8a;hpb=742fd99417610892e0408e6f9d93aefff57dcd08;p=OpenColorIO-Configs.git diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py index cf02f5c..167d8e8 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py @@ -16,7 +16,7 @@ import shutil import PyOpenColorIO as ocio -from aces_ocio.lut import ( +from aces_ocio.generate_lut import ( generate_1d_LUT_from_CTL, generate_3d_LUT_from_CTL, write_SPI_1d) @@ -614,7 +614,7 @@ def create_Dolby_PQ_scaled(aces_ctl_directory, ctls = [os.path.join( aces_ctl_directory, 'utilities', - 'ACESlib.DolbyPQ_to_lin_param.a1.0.0.ctl')] + 'ACESlib.OCIOshaper_to_Lin_param.a1.0.0.ctl')] lut = '%s_to_linear.spi1d' % name lut = sanitize(lut) @@ -737,8 +737,7 @@ def create_ACES_LMT(lmt_name, ctls = [os.path.join(aces_ctl_directory, lmt_values['transformCTLInverse']), shaper_from_aces_ctl % aces_ctl_directory] - # TODO: Investigate unresolved `odt_name` reference. - lut = 'Inverse.%s.%s.spi3d' % (odt_name, shaper_name) + lut = 'Inverse.%s.%s.spi3d' % (lmt_name, shaper_name) lut = sanitize(lut) @@ -1139,19 +1138,19 @@ def create_ODTs(aces_ctl_directory, # Define the base *Dolby PQ Shaper* # dolby_pq_shaper_name = 'Dolby PQ 10000' - dolbypq_shaper_name_aliases = ['crv_%s' % 'dolbypq_10000'] + dolby_pq_shaper_name_aliases = ['crv_%s' % 'dolbypq_10000'] - dolbypq_shaper_colorspace = create_Dolby_PQ( + dolby_pq_shaper_colorspace = create_Dolby_PQ( aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, name=dolby_pq_shaper_name, - aliases=dolbypq_shaper_name_aliases) - colorspaces.append(dolbypq_shaper_colorspace) + aliases=dolby_pq_shaper_name_aliases) + colorspaces.append(dolby_pq_shaper_colorspace) # *Dolby PQ* shaper name and *CTL* transforms bundled up. - dolbypq_shaper_data = [ + dolby_pq_shaper_data = [ dolby_pq_shaper_name, os.path.join('%s', 'utilities', @@ -1162,37 +1161,37 @@ def create_ODTs(aces_ctl_directory, 1.0, {}] - shaper_data[dolby_pq_shaper_name] = dolbypq_shaper_data + shaper_data[dolby_pq_shaper_name] = dolby_pq_shaper_data # Define the *Dolby PQ Shaper that considers a fixed linear range* dolby_pq_scaled_shaper_name = 'Dolby PQ Scaled' - dolbypq_scaled_shaper_name_aliases = ['crv_%s' % 'dolbypq_scaled'] + dolby_pq_scaled_shaper_name_aliases = ['crv_%s' % 'dolbypq_scaled'] - dolbypq_scaled_shaper_colorspace = create_Dolby_PQ_scaled( + dolby_pq_scaled_shaper_colorspace = create_Dolby_PQ_scaled( aces_ctl_directory, lut_directory, lut_resolution_1d, cleanup, name=dolby_pq_scaled_shaper_name, - aliases=dolbypq_scaled_shaper_name_aliases) - colorspaces.append(dolbypq_scaled_shaper_colorspace) + aliases=dolby_pq_scaled_shaper_name_aliases) + colorspaces.append(dolby_pq_scaled_shaper_colorspace) # *Dolby PQ* shaper name and *CTL* transforms bundled up. - dolbypq_scaled_shaper_data = [ + dolby_pq_scaled_shaper_data = [ dolby_pq_scaled_shaper_name, os.path.join('%s', 'utilities', - 'ACESlib.DolbyPQ_to_Lin_param.a1.0.0.ctl'), + 'ACESlib.OCIOshaper_to_Lin_param.a1.0.0.ctl'), os.path.join('%s', 'utilities', - 'ACESlib.Lin_to_DolbyPQ_param.a1.0.0.ctl'), + 'ACESlib.Lin_to_OCIOshaper_param.a1.0.0.ctl'), 1.0, log2_params] - shaper_data[dolby_pq_scaled_shaper_name] = dolbypq_scaled_shaper_data + shaper_data[dolby_pq_scaled_shaper_name] = dolby_pq_scaled_shaper_data rrt_shaper = log2_shaper_data - # rrt_shaper = dolbypq_scaled_shaper_data + # rrt_shaper = dolby_pq_scaled_shaper_data # *RRT + ODT* combinations. sorted_odts = sorted(odt_info.iteritems(), key=lambda x: x[1]) @@ -1200,8 +1199,8 @@ def create_ODTs(aces_ctl_directory, for odt in sorted_odts: (odt_name, odt_values) = odt - # Defining full range transform for *ODTs* that can only generate - # either *legal* or *full* output. + # Defining full range transform for *ODTs* that can generate either + # *legal* or *full* output. # Uncomment these lines and the lower section and # flip the `legalRange` value to 1 to restore the old behavior, @@ -1301,7 +1300,9 @@ def get_transform_info(ctl_transform): transform_full_legal_switch = True break - return (transform_id, transform_user_name, transform_user_name_prefix, + return (transform_id, + transform_user_name, + transform_user_name_prefix, transform_full_legal_switch) @@ -1438,15 +1439,15 @@ def get_LMTs_info(aces_ctl_directory): lmt_dir = os.path.join(lmt_path_tokens[-1], lmt_dir) # Building full name. - transform_CTL = lmt_tokens[-1] - lmt_name = string.join(transform_CTL.split('.')[1:-1], '.') + transform_ctl = lmt_tokens[-1] + lmt_name = string.join(transform_ctl.split('.')[1:-1], '.') # Finding id, user name and user name prefix. (transform_id, transform_user_name, transform_user_name_prefix, transform_full_legal_switch) = get_transform_info( - os.path.join(aces_ctl_directory, lmt_dir, transform_CTL)) + os.path.join(aces_ctl_directory, lmt_dir, transform_ctl)) # Finding inverse. transform_ctl_inverse = 'InvLMT.%s.ctl' % lmt_name @@ -1455,7 +1456,7 @@ def get_LMTs_info(aces_ctl_directory): transform_ctl_inverse = None lmts[lmt_name] = {} - lmts[lmt_name]['transformCTL'] = os.path.join(lmt_dir, transform_CTL) + lmts[lmt_name]['transformCTL'] = os.path.join(lmt_dir, transform_ctl) if transform_ctl_inverse is not None: lmts[lmt_name]['transformCTLInverse'] = os.path.join( lmt_dir, transform_ctl_inverse) @@ -1545,10 +1546,11 @@ def create_colorspaces(aces_ctl_directory, ACEScc) colorspaces.extend(odts) - # TODO: Investigate if there is a way to retrieve the value from *CTL*. + # TODO: Investigate if there is a way to retrieve these values from *CTL*. default_display = 'sRGB (D60 sim.)' + color_picking = 'Rec.709' - roles = {'color_picking': ACEScg.name, + roles = {'color_picking': color_picking, 'color_timing': ACEScc.name, 'compositing_log': ACEScc.name, 'data': '', @@ -1556,6 +1558,8 @@ def create_colorspaces(aces_ctl_directory, 'matte_paint': ACEScc.name, 'reference': '', 'scene_linear': ACEScg.name, - 'texture_paint': ''} + 'texture_paint': '', + 'compositing_linear': ACEScg.name, + 'rendering': ACEScg.name} return ACES, colorspaces, displays, ACEScc, roles, default_display