A lot of improvements, improve speed tests

Author: awxkee

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

@@ -191,31 +191,6 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
-
-        binding.buttonTest.setOnClickListener {
-            lifecycleScope.launch(Dispatchers.IO) {
-                val coder = HeifCoder(ToneMapper.REC2408)
-                val file =
-                    getAllFilesFromAssets().filter {
-                        it.contains(".avif") || it.contains(".heic") || it.contains(
-                            ".heif"
-                        )
-                    }.filter { it == "test_1.avif" }
-                val buffer = this@MainActivity.assets.open(file[0]).source().buffer()
-                    .readByteArray()
-                val decoded = coder.decodeSampled(
-                    buffer,
-                    1980,
-                    1020,
-                    preferredColorConfig = PreferredColorConfig.RGBA_8888,
-                    ScaleMode.FIT
-                )
-                val encodingTime = measureTimeMillis {
-                    coder.encodeAvif(decoded)
-                }
-                Log.d("MainActivity", "AVIF: Encoding time $encodingTime")
-            }
-        }
     }
 
     private fun testEncoder(assetName: String) {

app/src/main/res/layout/activity_main.xml

@@ -51,14 +51,4 @@
 
     </ScrollView>
 
-    <com.google.android.material.button.MaterialButton
-        android:layout_width="wrap_content"
-        android:text="Test"
-        android:id="@+id/buttonTest"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_height="60dp"/>
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -869,7 +869,10 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_getSizeImpl(JNIEnv *env, jobjec
       AvifImageSize size = AvifDecoderController::getImageSize(srcBuffer.data(), srcBuffer.size());
       jclass sizeClass = env->FindClass("android/util/Size");
       jmethodID methodID = env->GetMethodID(sizeClass, "<init>", "(II)V");
-      auto sizeObject = env->NewObject(sizeClass, methodID, size.width, size.height);
+      auto sizeObject = env->NewObject(sizeClass,
+                                       methodID,
+                                       static_cast<jint >(size.width),
+                                       static_cast<jint>(size.height));
       return sizeObject;
     }
 

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

@@ -46,7 +46,7 @@ fn work_on_transmuted_ptr_f16<F>(
     let mut allocated = false;
     let mut dst_stride = rgba_stride as usize / 2;
     let mut working_slice: BufferStoreMut<'_, f16> = unsafe {
-        if rgba as usize % 2 == 0 && rgba_stride / 2 != 0 {
+        if rgba as usize % 2 == 0 && rgba_stride / 2 == 0 {
             BufferStoreMut::Borrowed(std::slice::from_raw_parts_mut(
                 rgba as *mut f16,
                 rgba_stride as usize / 2 * height,
@@ -110,7 +110,7 @@ fn work_on_transmuted_ptr_u16<F>(
     let mut allocated = false;
     let mut dst_stride = rgba_stride as usize / 2;
     let mut working_slice: BufferStoreMut<'_, u16> = unsafe {
-        if rgba as usize % 2 == 0 && rgba_stride / 2 != 0 {
+        if rgba as usize % 2 == 0 && rgba_stride / 2 == 0 {
             BufferStoreMut::Borrowed(std::slice::from_raw_parts_mut(
                 rgba as *mut u16,
                 rgba_stride as usize / 2 * height,