Merge remote-tracking branch 'origin/master'

Author: awxkee

CHANGELOG.md

@@ -1 +1 @@
-Upgrade libjxl, speed improvements and stability
+Improvements for f16, fixes for non standard cpu processors

app/src/main/java/com/awxkee/jxlcoder/MainActivity.kt

@@ -125,8 +125,8 @@ class MainActivity : ComponentActivity() {
                     }
                     LaunchedEffect(key1 = Unit, block = {
                         lifecycleScope.launch(Dispatchers.IO) {
-                            val buffer5 =
-                                assets.open("hatice.jpg").source().buffer().readByteArray()
+//                            val buffer5 =
+//                                assets.open("hatice.jpg").source().buffer().readByteArray()
 //                            val bitmap = BitmapFactory.decodeByteArray(buffer5, 0, buffer5.size)
 //                                .scale(500, 500)
 //                            val encoder = JxlAnimatedEncoder(
@@ -190,7 +190,7 @@ class MainActivity : ComponentActivity() {
 
                             var assets =
                                 (this@MainActivity.assets.list("") ?: return@launch).toList()
-                            assets = assets.filter { it.contains("20181110_213419__MMC1561-HDR.jxl") }
+//                            assets = assets.filter { it.contains("20181110_213419__MMC1561-HDR.jxl") }
                             for (asset in assets) {
                                 try {
                                     val buffer4 =
@@ -204,9 +204,9 @@ class MainActivity : ComponentActivity() {
                                                 buffer4,
                                                 largeImageSize.width / 2,
                                                 largeImageSize.height / 2,
-                                                preferredColorConfig = PreferredColorConfig.RGBA_F16,
+                                                preferredColorConfig = PreferredColorConfig.RGBA_8888,
                                                 com.awxkee.jxlcoder.ScaleMode.FIT,
-                                                toneMapper = JxlToneMapper.FILMIC,
+                                                toneMapper = JxlToneMapper.REC2408,
                                             )
 //                                            val srcImage = JxlCoder.decode(buffer4,
 //                                                preferredColorConfig = PreferredColorConfig.RGB_565,

jxlcoder/src/main/cpp/JniDecoding.cpp

@@ -103,7 +103,8 @@ jobject decodeSampledImageImpl(JNIEnv *env, std::vector<uint8_t> &imageData, jin
   imageData.clear();
 
   if (!iccProfile.empty()) {
-    size_t stride = (size_t) xsize * 4 * (size_t)(useBitmapFloats ? sizeof(uint16_t) : sizeof(uint8_t));
+    size_t stride =
+        (size_t) xsize * 4 * (size_t) (useBitmapFloats ? sizeof(uint16_t) : sizeof(uint8_t));
     convertUseDefinedColorSpace(rgbaPixels,
                                 stride,
                                 static_cast<size_t>(xsize),
@@ -113,11 +114,13 @@ jobject decodeSampledImageImpl(JNIEnv *env, std::vector<uint8_t> &imageData, jin
                                 useBitmapFloats);
   }
 
-  bool useSampler = (scaledWidth > 0 || scaledHeight > 0) && (scaledWidth != 0 && scaledHeight != 0);
+  bool
+      useSampler = (scaledWidth > 0 || scaledHeight > 0) && (scaledWidth != 0 && scaledHeight != 0);
 
   uint32_t finalWidth = xsize;
   uint32_t finalHeight = ysize;
-  uint32_t stride = static_cast<uint32_t >(finalWidth) * 4 * static_cast<uint32_t >(useBitmapFloats ? sizeof(uint16_t) : sizeof(uint8_t));
+  uint32_t stride = static_cast<uint32_t >(finalWidth) * 4
+      * static_cast<uint32_t >(useBitmapFloats ? sizeof(uint16_t) : sizeof(uint8_t));
 
   if (useSampler) {
     auto scaleResult = RescaleImage(rgbaPixels, env, &stride, useBitmapFloats,
@@ -248,7 +251,8 @@ jobject decodeSampledImageImpl(JNIEnv *env, std::vector<uint8_t> &imageData, jin
   jobject rgba8888Obj = env->GetStaticObjectField(bitmapConfig, rgba8888FieldID);
 
   jclass bitmapClass = env->FindClass("android/graphics/Bitmap");
-  jmethodID createBitmapMethodID = env->GetStaticMethodID(bitmapClass, "createBitmap",
+  jmethodID createBitmapMethodID = env->GetStaticMethodID(bitmapClass,
+                                                          "createBitmap",
                                                           "(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;");
   jobject bitmapObj = env->CallStaticObjectMethod(bitmapClass, createBitmapMethodID,
                                                   static_cast<jint>(finalWidth),
@@ -317,6 +321,11 @@ Java_com_awxkee_jxlcoder_JxlCoder_decodeSampledImpl(JNIEnv *env, jobject thiz,
     std::string errorString = "Not enough memory to decode this image";
     throwException(env, errorString);
     return nullptr;
+  } catch (std::runtime_error &err) {
+    std::string w1 = err.what();
+    std::string errorString = "Error while decoding: " + w1;
+    throwException(env, errorString);
+    return nullptr;
   }
 }
 
@@ -346,6 +355,11 @@ Java_com_awxkee_jxlcoder_JxlCoder_decodeByteBufferSampledImpl(JNIEnv *env, jobje
     std::string errorString = "Not enough memory to decode this image";
     throwException(env, errorString);
     return nullptr;
+  } catch (std::runtime_error &err) {
+    std::string w1 = err.what();
+    std::string errorString = "Error while decoding: " + w1;
+    throwException(env, errorString);
+    return nullptr;
   }
 }