RGB565 improvements

awxkee · awxkee · commit 849e572c6435 · 2023-09-20T00:01:50.000+08: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
@@ -45,86 +45,26 @@ class MainActivity : AppCompatActivity() {
 //        assert(HeifCoder().isAvif(buffer))
         val size = HeifCoder().getSize(buffer)!!
         assert(size != null)
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-//            val time = measureTimeMillis {
-////                val bitmap = HeifCoder().decodeSampled(
-////                    buffer,
-////                    size.width / 2,
-////                    size.height / 2,
-////                    PreferredColorConfig.HARDWARE
-////                )
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val bitmap = HeifCoder().decodeSampled(
-                buffer,
-                350,
-                600,
-                PreferredColorConfig.HARDWARE,
-                ScaleMode.FIT
-            )
-            bitmap.recycle()
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val bitmap = HeifCoder().decodeSampled(
-                buffer,
-                350,
-                600,
-                PreferredColorConfig.HARDWARE,
-                ScaleMode.FIT
-            )
-            bitmap.recycle()
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val bitmap = HeifCoder().decodeSampled(
-                buffer,
-                350,
-                600,
-                PreferredColorConfig.HARDWARE,
-                ScaleMode.FIT
-            )
-            bitmap.recycle()
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val bitmap = HeifCoder().decodeSampled(
-                buffer,
-                350,
-                600,
-                PreferredColorConfig.HARDWARE,
-                ScaleMode.FIT
-            )
-            bitmap.recycle()
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val bitmap = HeifCoder().decodeSampled(
-                buffer,
-                350,
-                600,
-                PreferredColorConfig.HARDWARE,
-                ScaleMode.FIT
-            )
-            bitmap.recycle()
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val bitmap = HeifCoder().decodeSampled(
-                buffer,
-                350,
-                600,
-                PreferredColorConfig.HARDWARE,
-                ScaleMode.FIT
-            )
-            bitmap.recycle()
-        }
-////        val opts = BitmapFactory.Options()
-////        opts.inMutable = true
-////        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-////            opts.inPreferredConfig = Bitmap.Config.RGBA_F16
-////        }
-//                binding.imageView.setImageBitmap(bitmap)
-//            }
-//            Log.i("MainActivity AVIF ", "Done in ${time}")
-////            val encoded = HeifCoder().encodeAvif(bitmap)
-////            val decodedSample = HeifCoder().decode(encoded)
-////            binding.imageView.setImageBitmap(bitmap)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val time = measureTimeMillis {
+                val bitmap = HeifCoder().decodeSampled(
+                    buffer,
+                    size.width / 2,
+                    size.height / 2,
+                    PreferredColorConfig.RGB_565
+                )
+//        val opts = BitmapFactory.Options()
+//        opts.inMutable = true
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//            opts.inPreferredConfig = Bitmap.Config.RGBA_F16
 //        }
+                binding.imageView.setImageBitmap(bitmap)
+            }
+            Log.i("MainActivity AVIF ", "Done in ${time}")
+//            val encoded = HeifCoder().encodeAvif(bitmap)
+//            val decodedSample = HeifCoder().decode(encoded)
+//            binding.imageView.setImageBitmap(bitmap)
+        }
 
         //https://wh.aimuse.online/creatives/IMUSE_03617fe2db82a584166_27/TT_a9d21ff1061d785347935fef/68f06252.avif
         //https://wh.aimuse.online/preset/federico-beccari.avif
@@ -135,12 +75,15 @@ class MainActivity : AppCompatActivity() {
 //            .skipMemoryCache(true)
 //            .into(binding.imageView)
 
-        binding.imageView.load("https://wh.aimuse.online/creatives/IMUSE_03617fe2db82a584166_27/TT_a9d21ff1061d785347935fef/68f06252.avif",
-            imageLoader = ImageLoader.Builder(this)
-                .components {
-                    add(HeifDecoder.Factory())
-                }
-                .build())
+//        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.HARDWARE)
+//                    .build())
+//        }
 
 //        binding.imageView.setImageBitmap(bitmap)
 //        binding.imageView.setImageBitmap(cc16)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -18,8 +18,8 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="320dp"
+        android:layout_height="320dp"
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/avif-coder/build.gradle.kts b/avif-coder/build.gradle.kts
@@ -81,6 +81,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
diff --git a/avif-coder/src/main/cpp/CMakeLists.txt b/avif-coder/src/main/cpp/CMakeLists.txt
@@ -48,7 +48,6 @@ list(APPEND EXTRA_LIBS cpufeatures)
 
 include(CheckCXXCompilerFlag)
 if (ANDROID_ABI STREQUAL arm64-v8a)
-    set_target_properties(coder PROPERTIES COMPILE_FLAGS -mfpu=neon)
     add_definitions("-DHAVE_NEON=1")
 endif ()
 
diff --git a/avif-coder/src/main/cpp/JniBitmap.cpp b/avif-coder/src/main/cpp/JniBitmap.cpp
@@ -44,9 +44,17 @@ createBitmap(JNIEnv *env, std::shared_ptr<uint8_t> &data, std::string &colorConf
         return static_cast<jobject>(nullptr);
     }
 
-    coder::CopyUnalignedRGBA(reinterpret_cast<const uint8_t *>(data.get()), stride,
-                             reinterpret_cast<uint8_t *>(addr), (int) info.stride, (int) info.width,
-                             (int) info.height, use16Floats ? 2 : 1);
+    if (colorConfig == "RGB_565") {
+        coder::CopyUnalignedRGB565(reinterpret_cast<const uint8_t *>(data.get()), stride,
+                                   reinterpret_cast<uint8_t *>(addr), (int) info.stride,
+                                   (int) info.width,
+                                   (int) info.height);
+    } else {
+        coder::CopyUnalignedRGBA(reinterpret_cast<const uint8_t *>(data.get()), stride,
+                                 reinterpret_cast<uint8_t *>(addr), (int) info.stride,
+                                 (int) info.width,
+                                 (int) info.height, use16Floats ? 2 : 1);
+    }
 
     if (AndroidBitmap_unlockPixels(env, bitmapObj) != 0) {
         throwPixelsException(env);
diff --git a/avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.cpp b/avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.cpp
@@ -13,8 +13,7 @@
 
 HWY_BEFORE_NAMESPACE();
 
-namespace coder {
-    namespace HWY_NAMESPACE {
+namespace coder::HWY_NAMESPACE {
 
         using hwy::HWY_NAMESPACE::ScalableTag;
         using hwy::HWY_NAMESPACE::Store;
@@ -96,14 +95,47 @@ namespace coder {
             }
         }
 
+        void CopyUnalignedRGB565Row(const uint16_t *HWY_RESTRICT src, uint16_t *HWY_RESTRICT dst,
+                                    int width) {
+            int x = 0;
+            const ScalableTag<uint16_t> du;
+            using VU = Vec<decltype(du)>;
+            int pixels = du.MaxLanes();
+            for (x = 0; x + pixels < width; x += pixels) {
+                VU pixel = Load(du, src);
+                Store(pixel, du, dst);
+
+                src += pixels;
+                dst += pixels;
+            }
+
+            for (; x < width; ++x) {
+                auto p1 = src[0];
+                dst[0] = p1;
+                src += 1;
+                dst += 1;
+            }
+        }
+
+        void
+        CopyUnalignedRGB565(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
+                            int dstStride, int width,
+                            int height) {
+            for (int y = 0; y < height; y++) {
+                CopyUnalignedRGB565Row(reinterpret_cast<const uint16_t *>(src + (y * srcStride)),
+                                       reinterpret_cast<uint16_t *>(dst + (y * dstStride)),
+                                       width);
+            }
+        }
+
     }
-}
 
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
 namespace coder {
     HWY_EXPORT(CopyUnalignedRGBA);
+    HWY_EXPORT(CopyUnalignedRGB565);
 
     HWY_DLLEXPORT void
     CopyUnalignedRGBA(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
@@ -113,5 +145,12 @@ namespace coder {
         HWY_DYNAMIC_DISPATCH(CopyUnalignedRGBA)(src, srcStride, dst, dstStride, width, height,
                                                 pixelSize);
     }
+
+    HWY_DLLEXPORT void
+    CopyUnalignedRGB565(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
+                        int dstStride, int width,
+                        int height) {
+        HWY_DYNAMIC_DISPATCH(CopyUnalignedRGB565)(src, srcStride, dst, dstStride, width, height);
+    }
 }
 #endif
diff --git a/avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.h b/avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.h
@@ -13,6 +13,11 @@ namespace coder {
                       int dstStride, int width,
                       int height,
                       int pixelSize);
+
+    void
+    CopyUnalignedRGB565(const uint8_t *__restrict__ src, int srcStride, uint8_t *__restrict__ dst,
+                        int dstStride, int width,
+                        int height);
 }
 
 #endif //AVIF_COPYUNALIGNEDRGBA_H
diff --git a/avif-coder/src/main/cpp/imagebits/Rgb565.cpp b/avif-coder/src/main/cpp/imagebits/Rgb565.cpp
@@ -5,6 +5,7 @@
 #include "Rgb565.h"
 #include "ThreadPool.hpp"
 #include "HalfFloats.h"
+#include <algorithm>
 
 #undef HWY_TARGET_INCLUDE
 #define HWY_TARGET_INCLUDE "imagebits/Rgb565.cpp"
@@ -39,7 +40,7 @@ namespace coder::HWY_NAMESPACE {
     using hwy::float16_t;
 
     void
-    Rgba8ToF16HWYRow(const uint8_t *source, uint16_t *destination, int width) {
+    Rgba8To565HWYRow(const uint8_t *source, uint16_t *destination, int width) {
         const FixedTag<uint16_t, 8> du16;
         const FixedTag<uint8_t, 8> du8x8;
         using VU16 = Vec<decltype(du16)>;
@@ -62,7 +63,7 @@ namespace coder::HWY_NAMESPACE {
 
             auto rdu16Vec = ShiftLeft<11>(ShiftRight<3>(PromoteTo(rdu16, ru8Row)));
             auto gdu16Vec = ShiftLeft<5>(ShiftRight<2>(PromoteTo(rdu16, gu8Row)));
-            auto bdu16Vec = ShiftRight<5>(PromoteTo(rdu16, bu8Row));
+            auto bdu16Vec = ShiftRight<3>(PromoteTo(rdu16, bu8Row));
 
             auto result = Or(Or(rdu16Vec, gdu16Vec), bdu16Vec);
             Store(result, du16, dst);
@@ -95,7 +96,7 @@ namespace coder::HWY_NAMESPACE {
         auto mDst = reinterpret_cast<uint8_t *>(dst);
 
         for (int y = 0; y < height; ++y) {
-            auto r = pool.enqueue(Rgba8ToF16HWYRow,
+            auto r = pool.enqueue(Rgba8To565HWYRow,
                                   reinterpret_cast<const uint8_t *>(mSrc),
                                   reinterpret_cast<uint16_t *>(mDst), width);
             results.push_back(std::move(r));
@@ -168,7 +169,7 @@ namespace coder::HWY_NAMESPACE {
 
             auto rdu16Vec = ShiftLeft<11>(ShiftRight<3>(PromoteTo(rdu16, r16Row)));
             auto gdu16Vec = ShiftLeft<5>(ShiftRight<2>(PromoteTo(rdu16, g16Row)));
-            auto bdu16Vec = ShiftRight<5>(PromoteTo(rdu16, b16Row));
+            auto bdu16Vec = ShiftRight<3>(PromoteTo(rdu16, b16Row));
 
             auto result = Or(Or(rdu16Vec, gdu16Vec), bdu16Vec);
             Store(result, du16, dst);
@@ -178,9 +179,9 @@ namespace coder::HWY_NAMESPACE {
         }
 
         for (; x < width; ++x) {
-            uint16_t red565 = (src[0] >> 3) << 11;
-            uint16_t green565 = (src[1] >> 2) << 5;
-            uint16_t blue565 = src[2] >> 3;
+            uint16_t red565 = ((uint16_t )roundf(half_to_float(src[0]) * maxColors) >> 3) << 11;
+            uint16_t green565 = ((uint16_t )roundf(half_to_float(src[1]) * maxColors) >> 2) << 5;
+            uint16_t blue565 = (uint16_t )roundf(half_to_float(src[2]) * maxColors) >> 3;
 
             auto result = static_cast<uint16_t>(red565 | green565 | blue565);
             dst[0] = result;

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ android {`
`81`	`81`	`sourceCompatibility = JavaVersion.VERSION_17`
`82`	`82`	`targetCompatibility = JavaVersion.VERSION_17`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`kotlinOptions {`
`85`	`86`	`jvmTarget = JavaVersion.VERSION_17.toString()`
`86`	`87`	`}`