Built-In Transform support for Apple Log

src/OpenColorIO/CMakeLists.txt

@@ -150,6 +150,7 @@ set(SOURCES
     transforms/builtins/BuiltinTransformRegistry.cpp
     transforms/builtins/ColorMatrixHelpers.cpp
     transforms/builtins/OpHelpers.cpp
+    transforms/builtins/AppleCameras.cpp
     transforms/builtins/ArriCameras.cpp
     transforms/builtins/CanonCameras.cpp
     transforms/builtins/Displays.cpp

src/OpenColorIO/transforms/builtins/AppleCameras.cpp

@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright Contributors to the OpenColorIO Project.
+
+
+#include <cmath>
+
+#include <OpenColorIO/OpenColorIO.h>
+
+#include "ops/matrix/MatrixOp.h"
+#include "transforms/builtins/AppleCameras.h"
+#include "transforms/builtins/BuiltinTransformRegistry.h"
+#include "transforms/builtins/ColorMatrixHelpers.h"
+#include "transforms/builtins/OpHelpers.h"
+
+
+namespace OCIO_NAMESPACE
+{
+
+namespace APPLE_LOG
+{
+auto GenerateLutValues = [](double in) -> float
+{
+    constexpr double R_0   = -0.05641088;
+    constexpr double R_t   = 0.01;
+    constexpr double c     = 47.28711236;
+    constexpr double beta  = 0.00964052;
+    constexpr double gamma = 0.08550479;
+    constexpr double delta = 0.69336945;
+    const double P_t       = c * pow((R_t - R_0), 2.0);
+
+    if (in >= P_t)
+    {
+        return pow(2.0, (in - delta) / gamma) - beta;
+    }
+    else if (in < P_t && in >= 0.0)
+    {
+        return sqrt(in / c) + R_0;
+    }
+    else
+    {
+        return R_0;
+    }
+
+};
+} // namespace APPLE_LOG
+
+namespace CAMERA
+{
+
+namespace APPLE
+{
+
+void RegisterAll(BuiltinTransformRegistryImpl & registry) noexcept
+{
+    {
+        auto APPLE_LOG_to_ACES2065_1_Functor = [](OpRcPtrVec & ops)
+        {
+            CreateLut(ops, 4096, APPLE_LOG::GenerateLutValues);
+
+            MatrixOpData::MatrixArrayPtr matrix
+            = build_conversion_matrix(REC2020::primaries, ACES_AP0::primaries, ADAPTATION_BRADFORD);
+            CreateMatrixOp(ops, matrix, TRANSFORM_DIR_FORWARD);
+        };
+
+        registry.addBuiltin("APPLE_LOG_to_ACES2065-1",
+                            "Convert Apple Log to ACES2065-1",
+                            APPLE_LOG_to_ACES2065_1_Functor);
+    }
+    {
+        auto APPLE_LOG_to_Linear_Functor = [](OpRcPtrVec & ops)
+        {
+            CreateLut(ops, 4096, APPLE_LOG::GenerateLutValues);
+        };
+
+        registry.addBuiltin("CURVE - APPLE_LOG_to_LINEAR",
+                            "Convert Apple Log to linear",
+                            APPLE_LOG_to_Linear_Functor);
+    }
+}
+
+} // namespace APPLE
+
+} // namespace CAMERA
+
+} // namespace OCIO_NAMESPACE

src/OpenColorIO/transforms/builtins/AppleCameras.h

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright Contributors to the OpenColorIO Project.
+
+
+#ifndef INCLUDED_OCIO_APPLE_CAMERAS_H
+#define INCLUDED_OCIO_APPLE_CAMERAS_H
+
+
+#include <OpenColorIO/OpenColorIO.h>
+
+
+namespace OCIO_NAMESPACE
+{
+
+class BuiltinTransformRegistryImpl;
+
+namespace CAMERA
+{
+
+namespace APPLE
+{
+
+void RegisterAll(BuiltinTransformRegistryImpl & registry) noexcept;
+
+} // namespace APPLE
+
+} // namespace CAMERA
+
+} // namespace OCIO_NAMESPACE
+
+#endif // INCLUDED_OCIO_APPLE_CAMERAS_H

src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.cpp

@@ -11,6 +11,7 @@
 #include "OpBuilders.h"
 #include "Platform.h"
 #include "transforms/builtins/ACES.h"
+#include "transforms/builtins/AppleCameras.h"
 #include "transforms/builtins/ArriCameras.h"
 #include "transforms/builtins/BuiltinTransformRegistry.h"
 #include "transforms/builtins/CanonCameras.h"
@@ -109,6 +110,7 @@ void BuiltinTransformRegistryImpl::registerAll() noexcept
     ACES::RegisterAll(*this);
 
     // Camera support.
+    CAMERA::APPLE::RegisterAll(*this);
     CAMERA::ARRI::RegisterAll(*this);
     CAMERA::CANON::RegisterAll(*this);
     CAMERA::PANASONIC::RegisterAll(*this);

tests/cpu/CMakeLists.txt

@@ -161,6 +161,7 @@ set(SOURCES
     ScanlineHelper.cpp
     Transform.cpp
     transforms/builtins/ACES.cpp
+    transforms/builtins/AppleCameras.cpp
     transforms/builtins/ArriCameras.cpp
     transforms/builtins/CanonCameras.cpp
     transforms/builtins/ColorMatrixHelpers.cpp

tests/cpu/transforms/BuiltinTransform_tests.cpp

@@ -429,6 +429,10 @@ AllValues UnitTestValues
     { "ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-CINEMA-108nit-7.2nit-P3lim_1.1",
         { { 0.5f, 0.4f, 0.3f }, { 0.22214814f,     0.21179835f,     0.15639816f } } },
 
+    { "APPLE_LOG_to_ACES2065-1",
+        { { 0.5f, 0.4f, 0.3f }, { 0.153334766f,    0.083515430f,     0.032948254f } } },
+    { "CURVE - APPLE_LOG_to_LINEAR",
+        { { 0.5f, 0.4f, 0.3f }, { 0.198913991f,    0.083076466024f,  0.0315782763f } } },
     { "ARRI_ALEXA-LOGC-EI800-AWG_to_ACES2065-1",
         { { 0.5f, 0.4f, 0.3f }, { 0.401621427766f, 0.236455447604f,  0.064830001192f } } },
     { "ARRI_LOGC4_to_ACES2065-1",