Merge pull request #4 from awxkee/v2

Preparing release

Author: awxkee

Cargo.toml

@@ -18,7 +18,7 @@ rust-version = "1.82.0"
 
 [dependencies]
 num-traits = "0.2.19"
-moxcms = "0.2.3"
+moxcms = "0.3.0"
 quick-xml = { version =  "0.37.2", features = ["serde", "serde-types", "serialize"] }
 serde = { version = "1.0.218", features = ["derive"] }
 

app/Cargo.toml

@@ -8,6 +8,6 @@ image = { version = "0.25.5", features = ["avif-native"] }
 gainforge = { path = "../" }
 turbojpeg = "1.2.2"
 num-traits = "0.2.19"
-moxcms = "0.2.3"
+moxcms = "0.3.0"
 zune-jpeg = { git = "https://github.com/etemesi254/zune-image" }
 pic-scale = "0.5.3"

app/src/main.rs

@@ -30,9 +30,9 @@ mod mlaf;
 mod parse;
 
 use gainforge::{
-    create_tone_mapper_rgb, BufferStore, FilmicSplineParameters, GainHdrMetadata, GainImage,
-    GainImageMut, GamutClipping, GamutColorSpace, HdrTransferFunction, IsoGainMap, MpfInfo,
-    ToneMappingMethod, TransferFunction, UhdrDirectoryContainer,
+    create_tone_mapper_rgb, create_tone_mapper_rgb16, BufferStore, FilmicSplineParameters,
+    GainHdrMetadata, GainImage, GainImageMut, GamutClipping, GamutColorSpace, HdrTransferFunction,
+    IsoGainMap, MpfInfo, ToneMappingMethod, TransferFunction, UhdrDirectoryContainer,
 };
 use moxcms::ColorProfile;
 use std::fs::File;
@@ -163,31 +163,31 @@ fn extract_images(file_path: &str) -> GainMapAssociationGroup {
 }
 
 fn main() {
-    let img = image::ImageReader::open("./assets/08_base_hdr.avif")
+    let img = image::ImageReader::open("./assets/hdr.avif")
         .unwrap()
         .decode()
         .unwrap();
-    let rgb = img.to_rgb8();
+    let rgb = img.to_rgb16();
 
-    let tone_mapper = create_tone_mapper_rgb(
+    let tone_mapper = create_tone_mapper_rgb16(
         HdrTransferFunction::Pq,
         GamutColorSpace::Bt2020,
         TransferFunction::Srgb,
         GamutColorSpace::Srgb,
-        ToneMappingMethod::FilmicSpline(FilmicSplineParameters {
-            saturation: 0f32,
-            white_point_source: 8f32,
-            black_point_source: -8f32,
-            black_point_target: 0.01f32,
-            ..Default::default()
-        }),
-        // ToneMappingMethod::Rec2408(GainHDRMetadata::new(2000f32, 250f32)),
-        GamutClipping::Clip,
+        // ToneMappingMethod::FilmicSpline(FilmicSplineParameters {
+        //     saturation: 0f32,
+        //     white_point_source: 8f32,
+        //     black_point_source: -8f32,
+        //     black_point_target: 0.01f32,
+        //     ..Default::default()
+        // }),
+        ToneMappingMethod::Rec2408(GainHdrMetadata::new(2000f32, 250f32)),
+        GamutClipping::NoClip,
         // ToneMappingMethod::Rec2408(GainHDRMetadata::new(2000f32, 250f32)),
         // ToneMappingMethod::Rec2408(GainHDRMetadata::new(1000f32, 250f32)),
     );
     let dims = rgb.dimensions();
-    let mut dst = vec![0u8; rgb.len()];
+    let mut dst = vec![0u16; rgb.len()];
     let work_time = Instant::now();
     for (src, dst) in rgb
         .chunks_exact(rgb.dimensions().0 as usize * 3)
@@ -227,9 +227,11 @@ fn main() {
     // )
     // .unwrap();
 
+    let compressed = dst.iter().map(|&x| (x >> 8) as u8).collect::<Vec<_>>();
+
     image::save_buffer(
-        "clamp1.jpg",
-        &dst,
+        "clamp_compress.jpg",
+        &compressed,
         img.width(),
         img.height(),
         image::ExtendedColorType::Rgb8,

src/apply_gain_map.rs

@@ -136,7 +136,7 @@ pub fn apply_gain_map_rgb10(
     gain_map: GainMap,
     weight: f32,
 ) -> Result<(), ForgeError> {
-    apply_gain_map::<u16, 3, 3, 1024, 8192, 10>(
+    apply_gain_map::<u16, 3, 3, 65536, 8192, 10>(
         image,
         dst_image,
         image_icc_profile,
@@ -174,7 +174,7 @@ pub fn apply_gain_map_rgba10(
     gain_map: GainMap,
     weight: f32,
 ) -> Result<(), ForgeError> {
-    apply_gain_map::<u16, 4, 3, 1024, 8192, 10>(
+    apply_gain_map::<u16, 4, 3, 65536, 8192, 10>(
         image,
         dst_image,
         image_icc_profile,
@@ -212,7 +212,7 @@ pub fn apply_gain_map_rgb12(
     gain_map: GainMap,
     weight: f32,
 ) -> Result<(), ForgeError> {
-    apply_gain_map::<u16, 3, 3, 4096, 16384, 12>(
+    apply_gain_map::<u16, 3, 3, 65536, 16384, 12>(
         image,
         dst_image,
         image_icc_profile,
@@ -250,7 +250,7 @@ pub fn apply_gain_map_rgba12(
     gain_map: GainMap,
     weight: f32,
 ) -> Result<(), ForgeError> {
-    apply_gain_map::<u16, 4, 3, 4096, 16384, 12>(
+    apply_gain_map::<u16, 4, 3, 65536, 16384, 12>(
         image,
         dst_image,
         image_icc_profile,
@@ -412,13 +412,13 @@ where
         .ok_or(ForgeError::InvalidIcc)?;
 
     let image_linearize_map_r = img_profile
-        .build_r_linearize_table::<LIN_DEPTH>()
+        .build_r_linearize_table::<LIN_DEPTH, BIT_DEPTH>()
         .map_err(|_| ForgeError::InvalidIcc)?;
     let image_linearize_map_g = img_profile
-        .build_g_linearize_table::<LIN_DEPTH>()
+        .build_g_linearize_table::<LIN_DEPTH, BIT_DEPTH>()
         .map_err(|_| ForgeError::InvalidIcc)?;
     let image_linearize_map_b = img_profile
-        .build_b_linearize_table::<LIN_DEPTH>()
+        .build_b_linearize_table::<LIN_DEPTH, BIT_DEPTH>()
         .map_err(|_| ForgeError::InvalidIcc)?;
 
     let gain_map_icc_profile = (if gain_map.use_base_cg {
@@ -429,13 +429,13 @@ where
     .ok_or(ForgeError::InvalidGainMapConfiguration)?;
 
     let gain_image_linearize_map_r = gain_map_icc_profile
-        .build_r_linearize_table::<LIN_DEPTH>()
+        .build_r_linearize_table::<LIN_DEPTH, BIT_DEPTH>()
         .map_err(|_| ForgeError::InvalidIcc)?;
     let gain_image_linearize_map_g = gain_map_icc_profile
-        .build_g_linearize_table::<LIN_DEPTH>()
+        .build_g_linearize_table::<LIN_DEPTH, BIT_DEPTH>()
         .map_err(|_| ForgeError::InvalidIcc)?;
     let gain_image_linearize_map_b = gain_map_icc_profile
-        .build_b_linearize_table::<LIN_DEPTH>()
+        .build_b_linearize_table::<LIN_DEPTH, BIT_DEPTH>()
         .map_err(|_| ForgeError::InvalidIcc)?;
 
     let mut linearized_image_content = vec![0f32; image.width * N];

src/iso_gain_map.rs

@@ -990,6 +990,7 @@ impl<const N: usize> GainLUT<N> {
     }
 }
 
+/// Computes gain map weight for given display boost
 pub fn make_gainmap_weight(gain_map: GainMap, display_boost: f32) -> f32 {
     let input_boost = display_boost.max(1f32);
     let gainmap_weight = (input_boost.log2() - gain_map.hdr_capacity_min.log2())