Updates, color encoding

Author: awxkee

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2023 Radzivon Bartoshyk
+ * Copyright (c) 2024 Radzivon Bartoshyk
  * avif-coder [https://github.com/awxkee/avif-coder]
  *
  * Created by Radzivon Bartoshyk on 07/03/2024

avif-coder/src/main/cpp/colorspace/eotf-inl.h

@@ -224,7 +224,7 @@ namespace coder::HWY_NAMESPACE {
     }
 
     HWY_FAST_MATH_INLINE float HLGEotf(float v) {
-        v = max(0.0f, v);
+        v = std::max(0.0f, v);
         constexpr float a = 0.17883277f;
         constexpr float b = 0.28466892f;
         constexpr float c = 0.55991073f;
@@ -237,7 +237,7 @@ namespace coder::HWY_NAMESPACE {
 
     template<class D, typename T = Vec<D>, HWY_IF_FLOAT(TFromD<D>)>
     HWY_FAST_MATH_INLINE T dciP3PQGammaCorrection(const D d, T color) {
-        const auto pw = Set(d, 1 / 2.6f);
+        const auto pw = Set(d, 1.f / 2.6f);
         return coder::HWY_NAMESPACE::Pow(d, color, pw);
     }
 
@@ -248,7 +248,7 @@ namespace coder::HWY_NAMESPACE {
     }
 
     HWY_FAST_MATH_INLINE float dciP3PQGammaCorrection(float linear) {
-        return std::powf(linear, 1 / 2.6f);
+        return std::powf(linear, 1.f / 2.6f);
     }
 
     HWY_FAST_MATH_INLINE float gammaOtf(float linear, const float gamma) {

avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.cpp

@@ -57,7 +57,7 @@ namespace coder::HWY_NAMESPACE {
     Copy1Row(const D d, const Buf *HWY_RESTRICT src, Buf *HWY_RESTRICT dst, int width) {
         int x = 0;
         using VU = Vec<decltype(d)>;
-        int pixels = d.MaxLanes();
+        const int pixels = d.MaxLanes();
         for (; x + pixels < width; x += pixels) {
             VU a = LoadU(d, src);
             StoreU(a, d, reinterpret_cast<Buf *>(dst));

avif-coder/src/main/cpp/imagebits/Rgb565.cpp

@@ -355,7 +355,7 @@ namespace coder::HWY_NAMESPACE {
     void RGBAF16To565HWY(const uint16_t *sourceData, int srcStride,
                          uint16_t *dst, int dstStride, int width,
                          int height) {
-        const float maxColors = powf(2, (float) 8) - 1;
+        const float maxColors = std::powf(2.f, static_cast<float>(8.0f)) - 1.f;
 
         auto mSrc = reinterpret_cast<const uint8_t *>(sourceData);
         auto mDst = reinterpret_cast<uint8_t *>(dst);

avif-coder/src/main/cpp/imagebits/RgbaU16toHF.cpp

@@ -44,18 +44,7 @@ HWY_BEFORE_NAMESPACE();
 
 namespace coder::HWY_NAMESPACE {
 
-    using hwy::HWY_NAMESPACE::ScalableTag;
-    using hwy::HWY_NAMESPACE::Vec;
-    using hwy::HWY_NAMESPACE::Set;
-    using hwy::HWY_NAMESPACE::LoadU;
-    using hwy::HWY_NAMESPACE::PromoteUpperTo;
-    using hwy::HWY_NAMESPACE::PromoteLowerTo;
-    using hwy::HWY_NAMESPACE::Mul;
-    using hwy::HWY_NAMESPACE::Combine;
-    using hwy::HWY_NAMESPACE::FixedTag;
-    using hwy::HWY_NAMESPACE::DemoteTo;
-    using hwy::HWY_NAMESPACE::ConvertTo;
-    using hwy::HWY_NAMESPACE::StoreU;
+    using namespace hwy::HWY_NAMESPACE;
     using hwy::float16_t;
     using hwy::float32_t;
 
@@ -65,9 +54,9 @@ namespace coder::HWY_NAMESPACE {
         int x = 0;
         const ScalableTag<float16_t> df16;
         const ScalableTag<uint16_t> du16;
-        const FixedTag<uint32_t, df16.MaxLanes() / 2> du32;
-        const FixedTag<float32_t, df16.MaxLanes() / 2> df32;
-        const FixedTag<float16_t, df16.MaxLanes() / 2> df16h;
+        const Rebind<uint32_t, Half<decltype(df16)>> du32;
+        const Rebind<float32_t, Half<decltype(df16)>> df32;
+        const Rebind<float16_t, Half<decltype(df16)>> df16h;
         const int lanes = df16.MaxLanes();
         using VF16 = Vec<decltype(df16)>;
         using VU16 = Vec<decltype(du16)>;

avif-coder/src/main/cpp/imagebits/half.cpp

@@ -1,6 +1,31 @@
-//
-// Created by Radzivon Bartoshyk on 20/10/2023.
-//
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Radzivon Bartoshyk
+ * avif-coder [https://github.com/awxkee/avif-coder]
+ *
+ * Created by Radzivon Bartoshyk on 20/10/2023
+ *
+ * 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 "half.hpp"
 
 float LoadHalf(uint16_t f) {