Fixes

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("output_shot.avif") }.toMutableList()
+            allFiles = allFiles.filter { it.contains("hato-wide-gamut-8bit.avif") }.toMutableList()
 //            allFiles = allFiles.filter { it.contains("bbb_alpha_inverted.avif") }.toMutableList()
             for (file in allFiles) {
                 try {
@@ -142,15 +142,24 @@ class MainActivity : AppCompatActivity() {
 
                         var start = System.currentTimeMillis()
 
-                        var bitmap0 = coder.decodeSampled(
+                        var bitmap0 = coder.decode(
                             byteArray = buffer,
-                            scaledWidth = 325,
-                            scaledHeight = 325,
                             preferredColorConfig = PreferredColorConfig.RGBA_8888,
-                            scaleMode = ScaleMode.FILL,
-                            scaleQuality = ScalingQuality.FASTEST,
                         )
 
+                        Log.d("AVIFFFF", "Decode time ${System.currentTimeMillis() - start}")
+
+//                        val encode = coder.encodeHeic(bitmap0)
+//
+//                        val round = coder.decodeSampled(
+//                            byteArray = encode,
+//                            scaledWidth = 700,
+//                            scaledHeight = 700,
+//                            preferredColorConfig = PreferredColorConfig.RGBA_8888,
+//                            scaleMode = ScaleMode.FIT,
+//                            scaleQuality = ScalingQuality.DEFAULT,
+//                        )
+
 //                        bitmap0.setColorSpace(ColorSpace.getFromDataSpace(DataSpace.DATASPACE_BT2020_PQ)!!)
 
                         lifecycleScope.launch(Dispatchers.Main) {
@@ -168,7 +177,7 @@ class MainActivity : AppCompatActivity() {
 //                                binding.scrollViewContainer,
 //                                false
 //                            )
-//                            imageView.root.setImageBitmap(bitmap)
+//                            imageView.root.setImageBitmap(round)
 //                            binding.scrollViewContainer.addView(imageView.root)
 //                        }
                     }

avif-coder/src/main/cpp/AvifDecoderController.cpp

@@ -37,6 +37,7 @@
 #include "ColorSpaceProfile.h"
 #include <ITUR.h>
 #include "ColorMatrix.h"
+#include "avifweaver.h"
 
 class AvifUniqueImage {
  public:
@@ -105,17 +106,17 @@ AvifImageFrame AvifDecoderController::getFrame(uint32_t frame,
   auto colorPrimaries = decoder->image->colorPrimaries;
   auto transferCharacteristics = decoder->image->transferCharacteristics;
 
+  uint32_t bitDepth = decoder->image->depth;
+
   bool isImageRequires64Bit = avifImageUsesU16(decoder->image);
   if (isImageRequires64Bit) {
     avifUniqueImage.rgbImage.alphaPremultiplied = false;
-    avifUniqueImage.rgbImage.depth = 16;
+    avifUniqueImage.rgbImage.depth = bitDepth;
   } else {
     avifUniqueImage.rgbImage.alphaPremultiplied = false;
     avifUniqueImage.rgbImage.depth = 8;
   }
 
-  uint32_t bitDepth = avifUniqueImage.rgbImage.depth;
-
   avifResult rgbResult = avifUniqueImage.allocateImage();
   if (rgbResult != AVIF_RESULT_OK) {
     std::string

avif-coder/src/main/cpp/SizeScaler.cpp

@@ -305,6 +305,9 @@ aligned_uint8_vector RescaleSourceImage(uint8_t *sourceData,
     imageWidth = scaledWidth;
     imageHeight = scaledHeight;
 
+    *imageWidthPtr = imageWidth;
+    *imageHeightPtr = imageHeight;
+
     if (xTranslation > 0 || yTranslation > 0) {
 
       int left = std::max(xTranslation, 0);

avif-coder/src/main/cpp/avifweaver.h

@@ -4,8 +4,55 @@
 #include <ostream>
 #include <new>
 
+enum class YuvMatrix {
+  Bt601 = 0,
+  Bt709 = 1,
+  Bt2020 = 2,
+};
+
+enum class YuvStandardRange {
+  Tv,
+  Pc,
+};
+
+enum class YuvType {
+  Yuv420,
+  Yuv422,
+  Yuv444,
+};
+
 extern "C" {
 
+void weave_yuv8_to_rgba8(const uint8_t *y_plane,
+                         uint32_t y_stride,
+                         const uint8_t *u_plane,
+                         uint32_t u_stride,
+                         const uint8_t *v_plane,
+                         uint32_t v_stride,
+                         uint8_t *rgba,
+                         uint32_t dst_stride,
+                         uint32_t width,
+                         uint32_t height,
+                         YuvStandardRange range,
+                         YuvMatrix matrix,
+                         YuvType yuv_type);
+
+void weave_yuv8_with_alpha_to_rgba8(const uint8_t *y_plane,
+                                    uint32_t y_stride,
+                                    const uint8_t *u_plane,
+                                    uint32_t u_stride,
+                                    const uint8_t *v_plane,
+                                    uint32_t v_stride,
+                                    const uint8_t *a_plane,
+                                    uint32_t a_stride,
+                                    uint8_t *rgba,
+                                    uint32_t dst_stride,
+                                    uint32_t width,
+                                    uint32_t height,
+                                    YuvStandardRange range,
+                                    YuvMatrix matrix,
+                                    YuvType yuv_type);
+
 void weave_scale_u8(const uint8_t *src,
                     uint32_t src_stride,
                     uint32_t width,

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

@@ -8,7 +8,7 @@ num-traits = "0.2.19"
 pic-scale = { version = "0.2.11", default-features = false }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-pic-scale = { version = "0.2.11", default-features = false }
+pic-scale = { version = "0.2.11", default-features = false, features = ["disable_simd"] }
 
 [target.'cfg(target_arch = "x86")'.dependencies]
 pic-scale = { version = "0.2.11", default-features = false, features = ["disable_simd"] }
@@ -18,3 +18,7 @@ pic-scale = { version = "0.2.11", default-features = false, features = ["disable
 
 [lib]
 crate-type = ["cdylib"]
+
+[profile.release]
+lto = true
+codegen-units = 2

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

@@ -27,8 +27,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+use pic_scale::{
+    ImageSize, ImageStore, ResamplingFunction, Scaler, Scaling, ScalingU16, ThreadingPolicy,
+};
 use std::slice;
-use pic_scale::{ImageSize, ImageStore, ResamplingFunction, Scaler, Scaling, ScalingU16, ThreadingPolicy};
 
 #[no_mangle]
 pub unsafe extern "C-unwind" fn weave_scale_u8(
@@ -81,7 +83,10 @@ pub unsafe extern "C-unwind" fn weave_scale_u8(
         false,
     );
 
-    for (dst_chunk, src_chunk) in dst_slice.chunks_mut(dst_stride as usize).zip(new_store.as_bytes().chunks(new_width as usize * 4)) {
+    for (dst_chunk, src_chunk) in dst_slice
+        .chunks_mut(dst_stride as usize)
+        .zip(new_store.as_bytes().chunks(new_width as usize * 4))
+    {
         for (dst, src) in dst_chunk.iter_mut().zip(src_chunk.iter()) {
             *dst = *src;
         }
@@ -108,21 +113,15 @@ pub unsafe extern "C-unwind" fn weave_scale_u16(
         for x in 0..width as usize {
             let px = lane.add(x * 4);
             let dst_px = dst_lane.get_unchecked_mut((x * 4)..);
-            unsafe {
-                *dst_px.get_unchecked_mut(0) = px.read_unaligned();
-                *dst_px.get_unchecked_mut(1) = px.add(1).read_unaligned();
-                *dst_px.get_unchecked_mut(2) = px.add(2).read_unaligned();
-                *dst_px.get_unchecked_mut(3) = px.add(3).read_unaligned();
-            }
+            *dst_px.get_unchecked_mut(0) = px.read_unaligned();
+            *dst_px.get_unchecked_mut(1) = px.add(1).read_unaligned();
+            *dst_px.get_unchecked_mut(2) = px.add(2).read_unaligned();
+            *dst_px.get_unchecked_mut(3) = px.add(3).read_unaligned();
         }
     }
 
-    let _source_store = ImageStore::<u16, 4>::new(
-        _src_slice,
-        width as usize,
-        height as usize,
-    )
-        .unwrap();
+    let _source_store =
+        ImageStore::<u16, 4>::new(_src_slice, width as usize, height as usize).unwrap();
 
     let mut scaler = Scaler::new(if method == 3 {
         ResamplingFunction::Lanczos3
@@ -133,16 +132,17 @@ pub unsafe extern "C-unwind" fn weave_scale_u16(
     });
     scaler.set_threading_policy(ThreadingPolicy::Adaptive);
 
-    let _new_store_stride = new_width * 4 * std::mem::size_of::<u16>() as u32;
-
     let _new_store = scaler.resize_rgba_u16(
         ImageSize::new(new_width as usize, new_height as usize),
         _source_store,
         bit_depth,
         false,
     );
     let dst_slice = unsafe {
-        slice::from_raw_parts_mut(dst as *mut u16, new_width as usize * 4 * new_height as usize)
+        slice::from_raw_parts_mut(
+            dst as *mut u16,
+            new_width as usize * 4 * new_height as usize,
+        )
     };
     for (src, dst) in _new_store.as_bytes().iter().zip(dst_slice.iter_mut()) {
         *dst = *src;

avif-coder/src/main/cpp/lib/x86/libavifweaver.so

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.7.0' apply false
+    id 'com.android.library' version '8.7.1' apply false
     id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
     id 'com.google.devtools.ksp' version '2.0.20-1.0.25' apply false
 }