Fix F16 Error + added x265 10bit encoding

awxkee · awxkee · commit 864a65542966 · 2023-01-02T17:12:54.000+07:00
diff --git a/app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt b/app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt
@@ -43,7 +43,7 @@ class MainActivity : AppCompatActivity() {
 //        }
         val decodedBitmap = BitmapFactory.decodeResource(resources, R.drawable.test_png_with_alpha)
         var cc16 = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            decodedBitmap.copy(Bitmap.Config.RGBA_1010102, true)
+            decodedBitmap.copy(Bitmap.Config.RGBA_F16, true)
         } else {
             decodedBitmap.copy(Bitmap.Config.ARGB_8888, true)
         }
@@ -75,7 +75,7 @@ class MainActivity : AppCompatActivity() {
 //        val extremlyLargeBitmap = HeifCoder().decode(extremlyLargeBitmapBuffer)
 //        binding.imageView.setImageBitmap(extremlyLargeBitmap)
 
-        val bytes = HeifCoder().encodeAvif(cc16)
+        val bytes = HeifCoder().encodeHeic(cc16)
         val decodedBytes = HeifCoder().decode(bytes)
         binding.imageView.setImageBitmap(decodedBytes)
 //        val ff = File(this.filesDir, "result.avif")
diff --git a/avif-coder-coil/build.gradle b/avif-coder-coil/build.gradle
@@ -15,7 +15,7 @@ afterEvaluate {
             mavenJava(MavenPublication) {
                 groupId = 'com.github.awxkee'
                 artifactId = 'avif-coder-coil'
-                version = '1.0.1'
+                version = '1.0.17'
                 from components.release
                 artifact androidSourcesJar
             }
diff --git a/avif-coder-coil/src/main/java/com/github/awxkee/avifcoil/HeifDecoder.kt b/avif-coder-coil/src/main/java/com/github/awxkee/avifcoil/HeifDecoder.kt
@@ -52,7 +52,7 @@ class HeifDecoder(
         )
     }
 
-    private fun resizeAspectFill(sourceBitmap: Bitmap,dstSize: Size): Bitmap {
+    private fun resizeAspectFill(sourceBitmap: Bitmap, dstSize: Size): Bitmap {
         val background = Bitmap.createBitmap(dstSize.width, dstSize.height, Bitmap.Config.ARGB_8888)
         val originalWidth: Float = background.width.toFloat()
         val originalHeight: Float = background.height.toFloat()
diff --git a/avif-coder/build.gradle b/avif-coder/build.gradle
@@ -15,7 +15,7 @@ afterEvaluate {
             mavenJava(MavenPublication) {
                 groupId = 'com.github.awxkee'
                 artifactId = 'avif-coder'
-                version = '1.0.13'
+                version = '1.0.17'
                 from components.release
                 artifact androidSourcesJar
             }
diff --git a/avif-coder/src/main/cpp/coder.cpp b/avif-coder/src/main/cpp/coder.cpp
@@ -42,7 +42,7 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
     heif_encoder *mEncoder;
     auto result = heif_context_get_encoder_for_format(ctx.get(), heifCompressionFormat, &mEncoder);
     if (result.code != heif_error_Ok) {
-        throwCantEncodeImageException(env);
+        throwCantEncodeImageException(env, result.message);
         return static_cast<jbyteArray>(nullptr);
     }
     std::shared_ptr<heif_encoder> encoder(mEncoder,
@@ -82,7 +82,7 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
                                chroma, &image);
     if (result.code != heif_error_Ok) {
         AndroidBitmap_unlockPixels(env, bitmap);
-        throwCantEncodeImageException(env);
+        throwCantEncodeImageException(env, result.message);
         return static_cast<jbyteArray>(nullptr);
     }
 
@@ -99,7 +99,7 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
                                   (int) info.height, bitDepth);
     if (result.code != heif_error_Ok) {
         AndroidBitmap_unlockPixels(env, bitmap);
-        throwCantEncodeImageException(env);
+        throwCantEncodeImageException(env, result.message);
         return static_cast<jbyteArray>(nullptr);
     }
     int stride;
@@ -128,7 +128,6 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
         uint16_t tmpG;
         uint16_t tmpB;
         uint16_t tmpA;
-        auto *dataPtr = reinterpret_cast<uint16_t *>(dstARGB.get());
         auto *data64Ptr = reinterpret_cast<uint64_t *>(dstARGB.get());
         const float maxColors = (float) pow(2.0, bitDepth) - 1;
         for (int i = 0, k = 0; i < std::min(info.stride * info.height,
@@ -141,11 +140,13 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
                              ((uint64_t) tmpG & 0xffff) << 16 | ((uint64_t) tmpR & 0xffff);
             data64Ptr[k] = color;
         }
+        auto *dataPtr = reinterpret_cast<void *>(dstARGB.get());
         auto srcY = (char *) dataPtr;
         auto dstY = (char *) imgData;
+        const auto sourceStride = info.width * 4 * sizeof(uint16_t);
         for (int y = 0; y < info.height; ++y) {
-            memcpy(dstY, srcY, info.width * 4 * sizeof(uint64_t));
-            srcY += info.width * sizeof(uint64_t);
+            memcpy(dstY, srcY, sourceStride);
+            srcY += sourceStride;
             dstY += stride;
         }
         dstARGB.reset();
@@ -167,7 +168,7 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
     }
     heif_image_release(image);
     if (result.code != heif_error_Ok) {
-        throwCantEncodeImageException(env);
+        throwCantEncodeImageException(env, result.message);
         return static_cast<jbyteArray>(nullptr);
     }
 
@@ -180,7 +181,7 @@ jbyteArray encodeBitmap(JNIEnv *env, jobject thiz,
     AvifMemEncoder memEncoder;
     result = heif_context_write(ctx.get(), &writer, &memEncoder);
     if (result.code != heif_error_Ok) {
-        throwCantEncodeImageException(env);
+        throwCantEncodeImageException(env, result.message);
         return static_cast<jbyteArray>(nullptr);
     }
 
@@ -376,7 +377,7 @@ Java_com_radzivon_bartoshyk_avif_coder_HeifCoder_decodeImpl(JNIEnv *env, jobject
         if (result.code != heif_error_Ok) {
             heif_image_release(img);
             heif_image_handle_release(handle);
-            throwInvalidScale(env);
+            throwInvalidScale(env, result.message);
             return static_cast<jobject>(nullptr);
         }
         heif_image_release(img);
diff --git a/avif-coder/src/main/cpp/jni_exception.cpp b/avif-coder/src/main/cpp/jni_exception.cpp
@@ -34,16 +34,16 @@ jint throwHardwareBitmapException(JNIEnv *env) {
     return env->ThrowNew(exClass, "");
 }
 
-jint throwInvalidScale(JNIEnv *env) {
+jint throwInvalidScale(JNIEnv *env, const char * msg) {
     jclass exClass;
     exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/HeifCantScaleException");
-    return env->ThrowNew(exClass, "");
+    return env->ThrowNew(exClass, msg);
 }
 
-jint throwCantEncodeImageException(JNIEnv *env) {
+jint throwCantEncodeImageException(JNIEnv *env, const char * msg) {
     jclass exClass;
     exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantEncodeImageException");
-    return env->ThrowNew(exClass, "");
+    return env->ThrowNew(exClass, msg);
 }
 
 jint throwInvalidPixelsFormat(JNIEnv *env) {
diff --git a/avif-coder/src/main/cpp/jni_exception.h b/avif-coder/src/main/cpp/jni_exception.h
@@ -11,8 +11,8 @@ jint throwCannotReadFileException(JNIEnv *env);
 jint throwBitDepthException(JNIEnv *env);
 jint throwCoderCreationException(JNIEnv *env);
 jint throwCantDecodeImageException(JNIEnv *env);
-jint throwInvalidScale(JNIEnv *env);
-jint throwCantEncodeImageException(JNIEnv *env);
+jint throwInvalidScale(JNIEnv *env, const char * msg);
+jint throwCantEncodeImageException(JNIEnv *env, const char* msg);
 jint throwInvalidPixelsFormat(JNIEnv *env);
 jint throwPixelsException(JNIEnv *env);
 jint throwHardwareBitmapException(JNIEnv *env);
diff --git a/avif-coder/src/main/cpp/lib/arm64-v8a/libx265.a b/avif-coder/src/main/cpp/lib/arm64-v8a/libx265.a
diff --git a/avif-coder/src/main/cpp/lib/armeabi-v7a/libx265.a b/avif-coder/src/main/cpp/lib/armeabi-v7a/libx265.a
diff --git a/avif-coder/src/main/cpp/lib/x86_64/libx265.a b/avif-coder/src/main/cpp/lib/x86_64/libx265.a
diff --git a/avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/CantEncodeImageException.kt b/avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/CantEncodeImageException.kt
@@ -3,6 +3,7 @@ package com.radzivon.bartoshyk.avif.coder
 import androidx.annotation.Keep
 
 @Keep
-class CantEncodeImageException: Exception("Can't encode image exception") {
+class CantEncodeImageException(override val message: String?) :
+    Exception("Can't encode image: $message") {
 
 }
diff --git a/avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/HeifCantScaleException.kt b/avif-coder/src/main/java/com/radzivon/bartoshyk/avif/coder/HeifCantScaleException.kt
@@ -3,4 +3,5 @@ package com.radzivon.bartoshyk.avif.coder
 import androidx.annotation.Keep
 
 @Keep
-class HeifCantScaleException: Exception("HEIF wasn't able to scale image")
+class HeifCantScaleException(override val message: String?) :
+    Exception("HEIF wasn't able to scale image due to $message")

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ afterEvaluate {`
`15`	`15`	`mavenJava(MavenPublication) {`
`16`	`16`	`groupId = 'com.github.awxkee'`
`17`	`17`	`artifactId = 'avif-coder-coil'`
`18`		`- version = '1.0.1'`
	`18`	`+ version = '1.0.17'`
`19`	`19`	`from components.release`
`20`	`20`	`artifact androidSourcesJar`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class HeifDecoder(`
`52`	`52`	`)`
`53`	`53`	`}`
`54`	`54`
`55`		`- private fun resizeAspectFill(sourceBitmap: Bitmap,dstSize: Size): Bitmap {`
	`55`	`+ private fun resizeAspectFill(sourceBitmap: Bitmap, dstSize: Size): Bitmap {`
`56`	`56`	`val background = Bitmap.createBitmap(dstSize.width, dstSize.height, Bitmap.Config.ARGB_8888)`
`57`	`57`	`val originalWidth: Float = background.width.toFloat()`
`58`	`58`	`val originalHeight: Float = background.height.toFloat()`
Original file line number	Diff line number	Diff line change
`@@ -34,16 +34,16 @@ jint throwHardwareBitmapException(JNIEnv *env) {`
`34`	`34`	`return env->ThrowNew(exClass, "");`
`35`	`35`	`}`
`36`	`36`
`37`		`-jint throwInvalidScale(JNIEnv *env) {`
	`37`	`+jint throwInvalidScale(JNIEnv env, const char msg) {`
`38`	`38`	`jclass exClass;`
`39`	`39`	`exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/HeifCantScaleException");`
`40`		`- return env->ThrowNew(exClass, "");`
	`40`	`+ return env->ThrowNew(exClass, msg);`
`41`	`41`	`}`
`42`	`42`
`43`		`-jint throwCantEncodeImageException(JNIEnv *env) {`
	`43`	`+jint throwCantEncodeImageException(JNIEnv env, const char msg) {`
`44`	`44`	`jclass exClass;`
`45`	`45`	`exClass = env->FindClass("com/radzivon/bartoshyk/avif/coder/CantEncodeImageException");`
`46`		`- return env->ThrowNew(exClass, "");`
	`46`	`+ return env->ThrowNew(exClass, msg);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`jint throwInvalidPixelsFormat(JNIEnv *env) {`