Improved tone mapping

Author: awxkee

app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt

@@ -122,7 +122,7 @@ class MainActivity : AppCompatActivity() {
             var allFiles = mutableListOf<String>()
             allFiles.addAll(allFiles2)
             allFiles.addAll(allFiles1)
-//            allFiles = allFiles.filter { it.contains("club.avif") }.toMutableList()
+            allFiles = allFiles.filter { it.contains("wide_gamut.avif") || it.contains("IMG_0199_rr.avif") || it.contains("bt_2020_pq.avif") }.toMutableList()
 //            allFiles = allFiles.filter { it.contains("bbb_alpha_inverted.avif") }.toMutableList()
             for (file in allFiles) {
                 try {

avif-coder/build.gradle.kts

@@ -42,7 +42,7 @@ afterEvaluate {
             create<MavenPublication>("mavenJava") {
                 groupId = "com.github.awxkee"
                 artifactId = "avif-coder"
-                version = "2.0.6"
+                version = "2.0.8"
                 from(components["release"])
 //                artifact("androidSourcesJar")
             }

avif-coder/src/main/cpp/CMakeLists.txt

@@ -19,7 +19,8 @@ add_library(coder SHARED JniEncoder.cpp JniException.cpp SizeScaler.cpp
         colorspace/Trc.cpp YuvConversion.cpp
         colorspace/Rec2408ToneMapper.cpp colorspace/LogarithmicToneMapper.cpp
         colorspace/ColorMatrix.cpp imagebits/ScanAlpha.cpp imagebits/Rgba16.cpp
-        AvifDecoderController.cpp HeifImageDecoder.cpp JniAnimatedController.cpp)
+        AvifDecoderController.cpp HeifImageDecoder.cpp JniAnimatedController.cpp
+        colorspace/FilmicToneMapper.cpp)
 
 add_library(libheif SHARED IMPORTED)
 add_library(libyuv STATIC IMPORTED)

avif-coder/src/main/cpp/colorspace/ColorMatrix.cpp

@@ -31,6 +31,7 @@
 #include "definitions.h"
 #include "Rec2408ToneMapper.h"
 #include "LogarithmicToneMapper.h"
+#include "FilmicToneMapper.h"
 #include "ITUR.h"
 
 void applyColorMatrix(uint8_t *inPlace, uint32_t stride, uint32_t width, uint32_t height,
@@ -80,6 +81,9 @@ void applyColorMatrix(uint8_t *inPlace, uint32_t stride, uint32_t width, uint32_
     } else if (toneMapper == CurveToneMapper::LOGARITHMIC) {
       LogarithmicToneMapper mToneMapper(mCoeffs);
       mToneMapper.transferTone(rowVector.data(), width);
+    } else if (toneMapper == CurveToneMapper::FILMIC) {
+      FilmicToneMapper mToneMapper;
+      mToneMapper.transferTone(rowVector.data(), width);
     }
 
     float *iter = rowVector.data();
@@ -162,7 +166,8 @@ void applyColorMatrix16Bit(uint16_t *inPlace,
 
   concurrency::parallel_for(6, height, [&](uint32_t y) {
     aligned_float_vector rowVector(width * 3);
-    auto sourceRow = reinterpret_cast<uint16_t *>(reinterpret_cast<uint8_t * >(inPlace) + y * stride);
+    auto sourceRow =
+        reinterpret_cast<uint16_t *>(reinterpret_cast<uint8_t * >(inPlace) + y * stride);
 
     float *rowData = rowVector.data();
 
@@ -181,6 +186,9 @@ void applyColorMatrix16Bit(uint16_t *inPlace,
     } else if (toneMapper == CurveToneMapper::LOGARITHMIC) {
       LogarithmicToneMapper mToneMapper(mCoeffs);
       mToneMapper.transferTone(rowVector.data(), width);
+    } else if (toneMapper == CurveToneMapper::FILMIC) {
+      FilmicToneMapper mToneMapper;
+      mToneMapper.transferTone(rowVector.data(), width);
     }
 
     float *iter = rowVector.data();
@@ -214,7 +222,6 @@ void applyColorMatrix16Bit(uint16_t *inPlace,
           static_cast<uint16_t >(std::clamp(iter[2], 0.f, 1.0f) * cutOffColors),
           static_cast<uint16_t>(cutOffColors));
 
-
       sourceRow[0] = gammaMap[scaledValue0];
       sourceRow[1] = gammaMap[scaledValue1];
       sourceRow[2] = gammaMap[scaledValue2];

avif-coder/src/main/cpp/colorspace/FilmicToneMapper.cpp

@@ -0,0 +1,52 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2024 Radzivon Bartoshyk
+ * avif-coder [https://github.com/awxkee/avif-coder]
+ *
+ * Created by Radzivon Bartoshyk on 10/11/2024
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+
+#include "FilmicToneMapper.h"
+#include "Oklab.hpp"
+
+void FilmicToneMapper::transferTone(float *inPlace, uint32_t width) {
+  float *targetPlace = inPlace;
+
+  for (uint32_t x = 0; x < width; ++x) {
+    float r = targetPlace[0];
+    float g = targetPlace[1];
+    float b = targetPlace[2];
+    coder::Oklab oklab = coder::Oklab::fromLinearRGB(r, g, b);
+    if (oklab.L == 0) {
+      continue;
+    }
+    float shScale = this->uncharted2_filmic(oklab.L) / oklab.L;
+    oklab.L = oklab.L * shScale;
+    coder::Rgb linearRgb = oklab.toLinearRGB();
+    targetPlace[0] = std::min(linearRgb.r, 1.f);
+    targetPlace[1] = std::min(linearRgb.g, 1.f);
+    targetPlace[2] = std::min(linearRgb.b, 1.f);
+    targetPlace += 3;
+  }
+}

avif-coder/src/main/cpp/colorspace/FilmicToneMapper.h

@@ -0,0 +1,64 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2024 Radzivon Bartoshyk
+ * avif-coder [https://github.com/awxkee/avif-coder]
+ *
+ * Created by Radzivon Bartoshyk on 10/11/2024
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef AVIF_FILMIC_TONEMAPPER_H_
+#define AVIF_FILMIC_TONEMAPPER_H_
+
+#include <vector>
+
+class FilmicToneMapper {
+ public:
+  FilmicToneMapper() {
+  }
+
+  void transferTone(float *inPlace, uint32_t width);
+
+ private:
+
+  float uncharted2_tonemap_partial(float x) {
+    float A = 0.15f;
+    float B = 0.50f;
+    float C = 0.10f;
+    float D = 0.20f;
+    float E = 0.02f;
+    float F = 0.30f;
+    return ((x * (A * x + C * B) + D * E) / (x * (A * x + B) + D * F)) - E / F;
+  }
+
+  float uncharted2_filmic(float v) {
+    float exposure_bias = 2.0f;
+    float curr = uncharted2_tonemap_partial(v * exposure_bias);
+
+    float W = 11.2f;
+    float white_scale = 1.0f / uncharted2_tonemap_partial(W);
+    return curr * white_scale;
+  }
+
+};
+
+#endif //AVIF_FILMIC_TONEMAPPER_H_

avif-coder/src/main/cpp/colorspace/LogarithmicToneMapper.cpp

@@ -27,33 +27,28 @@
  */
 
 #include "LogarithmicToneMapper.h"
+#include "Oklab.hpp"
 
 void LogarithmicToneMapper::transferTone(float *inPlace, uint32_t width) {
-    float *targetPlace = inPlace;
+  float *targetPlace = inPlace;
 
-    const float primaryR = this->lumaPrimaries[0];
-    const float primaryG = this->lumaPrimaries[1];
-    const float primaryB = this->lumaPrimaries[2];
+  const float vDen = this->den;
 
-    const float vDen = this->den;
-
-    for (uint32_t x = 0; x < width; ++x) {
-        float r = targetPlace[0];
-        float g = targetPlace[1];
-        float b = targetPlace[2];
-        float Lin =
-                r * primaryR + g * primaryG + b * primaryB;
-        if (Lin == 0) {
-            continue;
-        }
-        float Lout = std::logf(std::abs(1 + Lin)) * vDen;
-        float shScale = Lout / Lin;
-        r = r * shScale;
-        g = g * shScale;
-        b = b * shScale;
-        targetPlace[0] = std::min(r, 1.f);
-        targetPlace[1] = std::min(g, 1.f);
-        targetPlace[2] = std::min(b, 1.f);
-        targetPlace += 3;
+  for (uint32_t x = 0; x < width; ++x) {
+    float r = targetPlace[0];
+    float g = targetPlace[1];
+    float b = targetPlace[2];
+    coder::Oklab oklab = coder::Oklab::fromLinearRGB(r, g, b);
+    if (oklab.L == 0) {
+      continue;
     }
+    float Lout = std::logf(std::abs(1.f + oklab.L)) * vDen;
+    float shScale = Lout / oklab.L;
+    oklab.L = oklab.L * shScale;
+    coder::Rgb linearRgb = oklab.toLinearRGB();
+    targetPlace[0] = std::min(linearRgb.r, 1.f);
+    targetPlace[1] = std::min(linearRgb.g, 1.f);
+    targetPlace[2] = std::min(linearRgb.b, 1.f);
+    targetPlace += 3;
+  }
 }

avif-coder/src/main/cpp/colorspace/Oklab.hpp

@@ -0,0 +1,60 @@
+//
+// Created by Radzivon Bartoshyk on 10/11/2024.
+//
+
+#ifndef AVIF_OKLAB
+#define AVIF_OKLAB
+
+#include <cmath>
+
+namespace coder {
+class Rgb {
+ public:
+  float r, g, b;
+  Rgb(float r_, float g_, float b_) : r(r_), g(g_), b(b_) {}
+};
+
+class Oklab {
+ public:
+  // Public member variables for Oklab components
+  float L, a, b;
+
+  // Constructor to initialize Oklab color components
+  constexpr Oklab(float l = 0.0f, float a_ = 0.0f, float b_ = 0.0f)
+      : L(l), a(a_), b(b_) {}
+
+  [[nodiscard]] static constexpr Oklab fromLinearRGB(float r, float g, float rgb_b) {
+    float l = 0.4122214708f * r + 0.5363325363f * g + 0.0514459929f * rgb_b;
+    float m = 0.2119034982f * r + 0.6806995451f * g + 0.1073969566f * rgb_b;
+    float s = 0.0883024619f * r + 0.2817188376f * g + 0.6299787005f * rgb_b;
+
+    float l_ = std::cbrtf(l);
+    float m_ = std::cbrtf(m);
+    float s_ = std::cbrtf(s);
+
+    float oklab_l = 0.2104542553f * l_ + 0.7936177850f * m_ - 0.0040720468f * s_;
+    float oklab_a = 1.9779984951f * l_ - 2.4285922050f * m_ + 0.4505937099f * s_;
+    float oklab_b = 0.0259040371f * l_ + 0.7827717662f * m_ - 0.8086757660f * s_;
+
+    return {oklab_l, oklab_a, oklab_b};
+  }
+
+  [[nodiscard]] Rgb toLinearRGB() const {
+    float l_ = this->L + 0.3963377774f * this->a + 0.2158037573f * this->b;
+    float m_ = this->L - 0.1055613458f * this->a - 0.0638541728f * this->b;
+    float s_ = this->L - 0.0894841775f * this->a - 1.2914855480f * this->b;
+
+    float l = l_ * l_ * l_;
+    float m = m_ * m_ * m_;
+    float s = s_ * s_ * s_;
+
+    float linear_r = 4.0767416621f * l - 3.3077115913f * m + 0.2309699292f * s;
+    float linear_g = -1.2684380046f * l + 2.6097574011f * m - 0.3413193965f * s;
+    float linear_b = -0.0041960863f * l - 0.7034186147f * m + 1.7076147010f * s;
+
+    return {linear_r, linear_g, linear_b};
+  }
+};
+}
+
+#endif //AVIF_OKLAB

avif-coder/src/main/cpp/colorspace/Rec2408ToneMapper.cpp

@@ -28,6 +28,7 @@
 
 #include "Rec2408ToneMapper.h"
 #include "Trc.h"
+#include "Oklab.hpp"
 
 float rec2408_pq(float intensity, const float intensity_target) {
   // Lb, Lw, Lmin, Lmax
@@ -38,7 +39,7 @@ float rec2408_pq(float intensity, const float intensity_target) {
       0.f / intensity_target,
   };
 
-  for (float & luminance : luminances) {
+  for (float &luminance : luminances) {
     luminance = avifToGammaPQ(luminance);
   }
 
@@ -80,29 +81,23 @@ float rec2408_pq(float intensity, const float intensity_target) {
 void Rec2408ToneMapper::transferTone(float *inPlace, uint32_t width) {
   float *targetPlace = inPlace;
 
-  const float primaryR = this->lumaPrimaries[0];
-  const float primaryG = this->lumaPrimaries[1];
-  const float primaryB = this->lumaPrimaries[2];
-
   const float vWeightA = this->weightA;
   const float vWeightB = this->weightB;
 
   for (uint32_t x = 0; x < width; ++x) {
     float r = targetPlace[0];
     float g = targetPlace[1];
     float b = targetPlace[2];
-    float Lin =
-        r * primaryR + g * primaryG + b * primaryB;
-    if (Lin == 0) {
+    coder::Oklab oklab = coder::Oklab::fromLinearRGB(r, g, b);
+    if (oklab.L == 0) {
       continue;
     }
-    float shScale = (1.f + vWeightA * Lin) / (1.f + vWeightB * Lin);
-    r = r * shScale;
-    g = g * shScale;
-    b = b * shScale;
-    targetPlace[0] = std::min(r, 1.f);
-    targetPlace[1] = std::min(g, 1.f);
-    targetPlace[2] = std::min(b, 1.f);
+    float shScale = (1.f + vWeightA * oklab.L) / (1.f + vWeightB * oklab.L);
+    oklab.L = oklab.L * shScale;
+    coder::Rgb linearRgb = oklab.toLinearRGB();
+    targetPlace[0] = std::min(linearRgb.r, 1.f);
+    targetPlace[1] = std::min(linearRgb.g, 1.f);
+    targetPlace[2] = std::min(linearRgb.b, 1.f);
     targetPlace += 3;
   }
 }

avif-coder/src/main/cpp/colorspace/ToneMapper.h

@@ -30,7 +30,7 @@
 #define AVIF_TONEMAPPER_H
 
 enum CurveToneMapper {
-    REC2408 = 1, LOGARITHMIC = 2, TONE_SKIP = 3
+  REC2408 = 1, LOGARITHMIC = 2, FILMIC = 3, TONE_SKIP = 4
 };
 
 #endif //AVIF_TONEMAPPER_H

avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/ToneMapper.kt

@@ -32,5 +32,5 @@ import androidx.annotation.Keep
 
 @Keep
 enum class ToneMapper(val value: Int) {
-    REC2408(1), LOGARITHMIC(2)
+    REC2408(1), LOGARITHMIC(2), FILMIC(3)
 }