Merge pull request #39 from awxkee/dev

Decoding improvements

Author: awxkee

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

@@ -122,7 +122,7 @@ class MainActivity : AppCompatActivity() {
 //            allFiles = allFiles.take(5).toMutableList()
 //            allFiles = allFiles.filter { it.contains("hato-wide-gamut-8bit.avif") || 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()
-            allFiles = allFiles.filter { it.contains("head-empty-hdr.avif") }.toMutableList()
+//            allFiles = allFiles.filter { it.contains("head-empty-hdr.avif") }.toMutableList()
             for (file in allFiles) {
                 try {
                     Log.d("AVIF", "start processing $file")

avif-coder/src/main/cpp/lib/arm64-v8a/libavifweaver.a

@@ -5,10 +5,10 @@ edition = "2021"
 
 [dependencies]
 num-traits = "0.2"
-pic-scale = { version = "0.5.9", default-features = false, features = ["nightly_f16"] }
-yuv = { version = "0.8.3", features = ["nightly_f16"], default-features = false }
+pic-scale = { version = "0.6.1", default-features = false, features = ["nightly_f16"] }
+yuv = { path = "../../../RustroverProjects/yuvutils-rs", features = ["nightly_f16"], default-features = false }
 bytemuck = { version = "1.22", features = ["nightly_float"] }
-moxcms = "0.6.1"
+moxcms = "0.6.2"
 gainforge = "0.3.2"
 
 [features]

avif-coder/src/main/cpp/lib/armeabi-v7a/libavifweaver.a

@@ -243,8 +243,8 @@ pub unsafe extern "C" fn apply_tone_mapping_rgba16(
         new_profile.update_rgb_colorimetry_triplet(
             white_point,
             red_chromaticity.to_xyzd(),
-            blue_chromaticity.to_xyzd(),
             green_chromaticity.to_xyzd(),
+            blue_chromaticity.to_xyzd(),
         );
         new_profile.cicp = Some(CicpProfile {
             full_range: true,
@@ -279,11 +279,11 @@ pub unsafe extern "C" fn apply_tone_mapping_rgba16(
                                 &new_profile,
                                 &ColorProfile::new_srgb(),
                                 ToneMappingMethod::Rec2408(GainHdrMetadata {
-                                    display_max_brightness: 203f32,
+                                    display_max_brightness: 203.,
                                     content_max_brightness: brightness,
                                 }),
                                 MappingColorSpace::Rgb(RgbToneMapperParameters {
-                                    gamut_clipping: GamutClipping::Clip,
+                                    gamut_clipping: GamutClipping::NoClip,
                                     exposure: 1.0,
                                 }),
                             )
@@ -292,11 +292,11 @@ pub unsafe extern "C" fn apply_tone_mapping_rgba16(
                                 &new_profile,
                                 &ColorProfile::new_srgb(),
                                 ToneMappingMethod::Rec2408(GainHdrMetadata {
-                                    display_max_brightness: 203f32,
+                                    display_max_brightness: 203.,
                                     content_max_brightness: brightness,
                                 }),
                                 MappingColorSpace::Rgb(RgbToneMapperParameters {
-                                    gamut_clipping: GamutClipping::Clip,
+                                    gamut_clipping: GamutClipping::NoClip,
                                     exposure: 1.0,
                                 }),
                             )
@@ -305,11 +305,11 @@ pub unsafe extern "C" fn apply_tone_mapping_rgba16(
                                 &new_profile,
                                 &ColorProfile::new_srgb(),
                                 ToneMappingMethod::Rec2408(GainHdrMetadata {
-                                    display_max_brightness: 203f32,
+                                    display_max_brightness: 203.,
                                     content_max_brightness: brightness,
                                 }),
                                 MappingColorSpace::YRgb(CommonToneMapperParameters {
-                                    gamut_clipping: GamutClipping::Clip,
+                                    gamut_clipping: GamutClipping::NoClip,
                                     exposure: 1.0,
                                 }),
                             )