Merge pull request #32 from awxkee/dev

A lot of improvements

Author: awxkee

app/build.gradle

@@ -45,6 +45,7 @@ android {
 
 dependencies {
     implementation project(":avif-coder")
+//    implementation 'com.github.awxkee:avif-coder:1.8.0'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'

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

@@ -36,14 +36,9 @@ import android.util.Size
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.graphics.scale
 import androidx.lifecycle.lifecycleScope
-import com.radzivon.bartoshyk.avif.coder.AvifAnimatedDecoder
-import com.radzivon.bartoshyk.avif.coder.AvifChromaSubsampling
 import com.radzivon.bartoshyk.avif.coder.HeifCoder
-import com.radzivon.bartoshyk.avif.coder.HeifPreset
-import com.radzivon.bartoshyk.avif.coder.PreciseMode
 import com.radzivon.bartoshyk.avif.coder.PreferredColorConfig
 import com.radzivon.bartoshyk.avif.coder.ScaleMode
-import com.radzivon.bartoshyk.avif.coder.ScalingQuality
 import com.radzivon.bartoshyk.avif.coder.ToneMapper
 import com.radzivon.bartoshyk.avif.databinding.ActivityMainBinding
 import com.radzivon.bartoshyk.avif.databinding.BindingImageViewBinding
@@ -57,6 +52,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.IOException
+import kotlin.system.measureTimeMillis
 
 
 class MainActivity : AppCompatActivity() {
@@ -122,9 +118,10 @@ class MainActivity : AppCompatActivity() {
             var allFiles = mutableListOf<String>()
             allFiles.addAll(allFiles2)
             allFiles.addAll(allFiles1)
+            allFiles = allFiles.take(5).toMutableList()
 //            allFiles = allFiles.filter { 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("bt_2020_pq.avif") }.toMutableList()
+//            allFiles = allFiles.filter { it.contains("test_alpha.avif") }.toMutableList()
             for (file in allFiles) {
                 try {
                     Log.d("AVIF", "start processing $file")
@@ -134,30 +131,30 @@ class MainActivity : AppCompatActivity() {
                     val size = coder.getSize(buffer)
                     if (size != null) {
                         val bitmap0 = coder.decodeSampled(
-                                buffer,
-                                if (size.width > 1800 || size.height > 1800) size.width / 4 else size.width,
-                                if (size.width > 1800 || size.height > 1800) size.height / 4 else size.height,
-                                PreferredColorConfig.RGBA_8888,
-                                ScaleMode.RESIZE
+                            buffer,
+                            if (size.width > 1800 || size.height > 1800) size.width / 4 else size.width,
+                            if (size.width > 1800 || size.height > 1800) size.height / 4 else size.height,
+                            PreferredColorConfig.RGBA_1010102,
+                            ScaleMode.RESIZE
                         )
                         var start = System.currentTimeMillis()
 
 //                        var bitmap0 = coder.decode(
 //                            byteArray = buffer,
-//                            preferredColorConfig = PreferredColorConfig.RGBA_8888,
+//                            preferredColorConfig = PreferredColorConfig.RGBA_F16,
 //                        )
 
                         Log.d("AVIFFFF", "Decode time ${System.currentTimeMillis() - start}")
 
-                        val encode = coder.encodeAvif(bitmap0, avifChromaSubsampling = AvifChromaSubsampling.YUV422)
-                        val roundTripped = coder.decode(encode)
+//                        val encode = coder.encodeAvif(bitmap0, avifChromaSubsampling = AvifChromaSubsampling.YUV420)
+//                        val roundTripped = coder.decode(encode)
 //
-                        val cachedFile = File(cacheDir, "yuv400.avif")
-                        FileOutputStream(cachedFile).use {
-                            val bf = it.sink().buffer()
-                            bf.write(encode)
-                            bf.flush()
-                        }
+//                        val cachedFile = File(cacheDir, "yuv400.avif")
+//                        FileOutputStream(cachedFile).use {
+//                            val bf = it.sink().buffer()
+//                            bf.write(encode)
+//                            bf.flush()
+//                        }
 //
 //                        val round = coder.decode(
 //                            byteArray = encode,
@@ -172,7 +169,7 @@ class MainActivity : AppCompatActivity() {
                                 binding.scrollViewContainer,
                                 false
                             )
-                            imageView.root.setImageBitmap(roundTripped)
+                            imageView.root.setImageBitmap(bitmap0)
                             binding.scrollViewContainer.addView(imageView.root)
                         }
 //                        lifecycleScope.launch(Dispatchers.Main) {
@@ -194,76 +191,6 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
-
-//        https://wh.aimuse.online/creatives/IMUSE_03617fe2db82a584166_27/TT_a9d21ff1061d785347935fef/68f06252.avif
-//        https://wh.aimuse.online/preset/federico-beccari.avif
-//         https://wh.aimuse.online/preset/avif10bit.avif
-//
-//        Glide.with(this)
-//            .load("https://wh.aimuse.online/preset/federico-beccari.avif")
-//            .skipMemoryCache(true)
-//            .into(binding.imageView)
-
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//            binding.imageView.load("https://wh.aimuse.online/preset/federico-beccari.avif",
-//                imageLoader = ImageLoader.Builder(this)
-//                    .components {
-//                        add(HeifDecoder.Factory())
-//                    }
-//                    .bitmapConfig(Bitmap.Config.RGBA_F16)
-//                    .build())
-//        }
-
-//        binding.imageView.setImageBitmap(bitmap)
-//        binding.imageView.setImageBitmap(cc16)
-//        val avif12DepthBuffer =
-//            this.assets.open("test_avif_12_bitdepth.avif").source().buffer().readByteArray()
-//        assert(HeifCoder().isAvif(avif12DepthBuffer))
-//        val avifHDRBitmap = HeifCoder().decode(avif12DepthBuffer)
-//        binding.imageView.setImageBitmap(avifHDRBitmap)
-//        val heicBuffer = this.assets.open("pexels-heif.heif").source().buffer().readByteArray()
-//        assert(HeifCoder().isHeif(heicBuffer))
-//        val heicBitmap = HeifCoder().decode(heicBuffer)
-//        binding.imageView.setImageBitmap(heicBitmap)
-//        assert(HeifCoder().getSize(heicBuffer) != null)
-//        assert(HeifCoder().getSize(buffer) != null)
-//        val heicScaled = HeifCoder().decodeSampled(heicBuffer, 350, 900)
-//        binding.imageView.setImageBitmap(heicScaled)
-//        val extremlyLargeBitmapBuffer =
-//            this.assets.open("extremly_large.avif").source().buffer().readByteArray()
-//        assert(HeifCoder().isAvif(extremlyLargeBitmapBuffer))
-//        val extremlyLargeBitmap = HeifCoder().decode(extremlyLargeBitmapBuffer)
-//        binding.imageView.setImageBitmap(extremlyLargeBitmap)
-
-//        val ff = File(this.filesDir, "result.avif")
-//        ff.delete()
-//        val output = FileOutputStream(ff)
-//        output.sink().buffer().use {
-//            it.write(bytes)
-//            it.flush()
-//        }
-//        output.close()
-//        Log.d("p", bytes.size.toString())
-//        writeHevc(decodedBitmap)
-//        val numbers = IntArray(5) { 1 * (it + 1) }
-//        numbers.forEach {
-//            testEncoder("test_${it}.jpg")
-//        }
-//        val bytes = HeifCoder().encodeAvif(cc16)
-//        val ff = File(this.filesDir, "result.avif")
-//        ff.delete()
-//        val output = FileOutputStream(ff)
-//        output.sink().buffer().use {
-//            it.write(bytes)
-//            it.flush()
-//        }
-//        output.close()
-//        Log.d("p", bytes.size.toString())
-//        writeHevc(decodedBitmap)
-//        val numbers = IntArray(5) { 1 * (it + 1) }
-//        numbers.forEach {
-//            testEncoder("test_${it}.jpg")
-//        }
     }
 
     private fun testEncoder(assetName: String) {

avif-coder/build.gradle.kts

@@ -42,7 +42,7 @@ afterEvaluate {
             create<MavenPublication>("mavenJava") {
                 groupId = "com.github.awxkee"
                 artifactId = "avif-coder"
-                version = "2.0.9"
+                version = "2.0.11"
                 from(components["release"])
 //                artifact("androidSourcesJar")
             }

avif-coder/src/main/cpp/CMakeLists.txt

@@ -16,7 +16,7 @@ add_library(coder SHARED JniEncoder.cpp JniException.cpp SizeScaler.cpp
         HardwareBuffersCompat.cpp imagebits/half.cpp
         imagebits/half.hpp imagebits/RgbaU16toHF.cpp
         imagebits/RGBAlpha.cpp
-        colorspace/Trc.cpp YuvConversion.cpp
+        colorspace/Trc.cpp
         colorspace/Rec2408ToneMapper.cpp colorspace/LogarithmicToneMapper.cpp
         colorspace/ColorMatrix.cpp imagebits/ScanAlpha.cpp imagebits/Rgba16.cpp
         AvifDecoderController.cpp HeifImageDecoder.cpp JniAnimatedController.cpp
@@ -48,9 +48,6 @@ list(APPEND EXTRA_LIBS cpufeatures)
 include(CheckCXXCompilerFlag)
 if (ANDROID_ABI STREQUAL arm64-v8a)
     add_definitions("-DHAVE_NEON=1")
-    if (CMAKE_BUILD_TYPE STREQUAL "Release")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -mfloat-abi=hard -ftree-vectorize")
-    endif ()
 endif ()
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -84,6 +81,6 @@ include_directories(icc)
 add_subdirectory(avif)
 
 target_link_libraries( # Specifies the target library.
-        coder PRIVATE
+        coder
         ${log-lib} libheif cpufeatures libyuv -ljnigraphics aom avif_shared
-        libde265 libdav1d libsharpyuv ${android-lib} avifweaver x265)
+        libde265 libdav1d libsharpyuv ${android-lib} avifweaver x265 m c)

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

@@ -18,6 +18,7 @@
 #include "AvifDecoderController.h"
 #include "ReformatBitmap.h"
 #include "JniBitmap.h"
+#include <dlfcn.h>
 
 using namespace std;
 
@@ -28,6 +29,7 @@ jobject decodeImplementationNative(JNIEnv *env, jobject thiz,
   PreferredColorConfig preferredColorConfig;
   ScaleMode scaleMode;
   CurveToneMapper toneMapper;
+
   if (!checkDecodePreconditions(env, javaColorSpace, &preferredColorConfig, javaScaleMode,
                                 &scaleMode, javaToneMapper, &toneMapper)) {
     string exception = "Can't retrieve basic values";