Update ProPhotoRGB transform and tests

•  ProPhotoRGB.cpp to remove unused linear-to-encoded LUT generation and updated the color space conversion to use build_conversion_matrix_to_XYZ_D65.
• test cases in BuiltinTransform_tests.cpp and BuiltinTransformRegistry_tests.cpp.

Signed-off-by: Vlad (Kuzmin) Erium <[email protected]>

Author: ssh4net

src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.cpp

@@ -11,13 +11,13 @@
 #include "OpBuilders.h"
 #include "Platform.h"
 #include "transforms/builtins/ACES.h"
-#include "transforms/builtins/ProPhotoRGB.h"
 #include "transforms/builtins/AppleCameras.h"
 #include "transforms/builtins/ArriCameras.h"
 #include "transforms/builtins/BuiltinTransformRegistry.h"
 #include "transforms/builtins/CanonCameras.h"
 #include "transforms/builtins/Displays.h"
 #include "transforms/builtins/PanasonicCameras.h"
+#include "transforms/builtins/ProPhotoRGB.h"
 #include "transforms/builtins/RedCameras.h"
 #include "transforms/builtins/SonyCameras.h"
 #include "utils/StringUtils.h"

src/OpenColorIO/transforms/builtins/ProPhotoRGB.cpp

@@ -53,33 +53,9 @@ namespace OCIO_NAMESPACE
 	{
 
 		static constexpr double gamma = 1.8;
-		static constexpr double breakLinear = 1.0 / 512.0;	// Linear breakpoint.
 		static constexpr double slope = 16.0;				// Slope of linear segment.
 		static constexpr double breakEnc = 1.0 / 32.0;		// Encoded breakpoint
 
-		void GenerateLinearToEncodedOps(OpRcPtrVec& ops)
-		{
-			// Linear to encoded gamma 1.8 curve using LUT for accuracy.
-			auto GenerateLutValues = [](double in) -> float
-				{
-					const double absIn = std::abs(in);
-					double out = 0.0;
-
-					if (absIn < breakLinear)
-					{
-						out = absIn * slope;
-					}
-					else
-					{
-						out = std::pow(absIn, 1.0 / gamma);
-					}
-
-					return float(std::copysign(out, in));
-				};
-
-			CreateHalfLut(ops, GenerateLutValues);
-		}
-
 		void GenerateEncodedToLinearOps(OpRcPtrVec& ops)
 		{
 			// Encoded gamma 1.8 to linear curve using LUT for accuracy.
@@ -169,8 +145,7 @@ namespace OCIO_NAMESPACE
 
 						// 2. Convert color space from ROMM RGB (D50) to ACES AP0 (D60).
 						MatrixOpData::MatrixArrayPtr matrix
-							= build_conversion_matrix(ROMM_RGB::primaries,
-								ACES_AP0::primaries,
+							= build_conversion_matrix_to_XYZ_D65(ROMM_RGB::primaries,
 								ADAPTATION_BRADFORD);
 						CreateMatrixOp(ops, matrix, TRANSFORM_DIR_FORWARD);
 					};

tests/cpu/transforms/BuiltinTransform_tests.cpp

@@ -720,7 +720,14 @@ AllValues UnitTestValues
     { "DISPLAY - CIE-XYZ-D65_to_REC.2100-HLG-1000nit",
         { 6.0e-5f,
         { 0.5f,            0.4f,            0.3f,            -0.1f,         1.01f,        0.2f }, 
-        { 0.5649694f,      0.4038837f,      0.3751478f,      -0.505630434f, 0.738133013f, 0.251128823f } } }
+        { 0.5649694f,      0.4038837f,      0.3751478f,      -0.505630434f, 0.738133013f, 0.251128823f } } },
+    { "ROMM_to_CIE-XYZ-D65_BFD",
+        { 1.0e-6f,
+        { 0.5f,           0.4f,           0.3f,      0.248054f,   0.216383f,   0.124372f },
+        { 0.03f,          0.02f,          0.01f,     0.00160897f, 0.00140735f, 0.000677473f } } },
+    { "LINEAR-RIMM_to_ACES2065-1_BFD",
+        { 1.0e-6f,
+        { 0.5f,           0.4f,           0.3f,      0.47351069f, 0.39131449f, 0.29965645f } } }
 };
 
 } // anon.

tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp

@@ -405,7 +405,7 @@ OCIO_ADD_TEST(Builtins, version_2_3_validation)
     TestStyle("ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-4000nit-REC2020-D60-in-REC2020-D65_2.0");
 
     // ProPhotoRGB / ROMM RGB builtin transforms.
-    TestStyle("LINEAR-RIMM_to_ACES2065-1_BFD");
     TestStyle("ROMM_to_CIE-XYZ-D65_BFD");
-    TestStyle("PROPHOTO-RGB-SRGB-GAMMA_to_ACES2065-1");
+    TestStyle("LINEAR-RIMM_to_ACES2065-1_BFD");
+    //TestStyle("PROPHOTO-RGB-SRGB-GAMMA_to_ACES2065-1");
 }