commit a0f0b99a322a8a77f7a4b548063ebaf1a98a3f8d
author ColdPaleLight <zhangzhijian.123@bytedance.com> Thu Nov 24 07:37:53 2022 +0800
committer GitHub <noreply@github.com> Wed Nov 23 23:37:53 2022 +0000
tree f4b1939ad87a0f43680e0d991f978e516b298b7c
parent d4fe02ab03668e9cdb820d640e681baa1cedec11

[Impeller] Implement 'ui.decodeImageFromPixels' (#37866)

lib/ui/painting/image_decoder_impeller.cc

diff --git a/lib/ui/painting/image_decoder_impeller.cc b/lib/ui/painting/image_decoder_impeller.cc
index aa89551..6e13772 100644
--- a/lib/ui/painting/image_decoder_impeller.cc
+++ b/lib/ui/painting/image_decoder_impeller.cc
@@ -18,6 +18,7 @@
 #include "impeller/base/strings.h"
 #include "impeller/geometry/size.h"
 #include "include/core/SkSize.h"
+#include "third_party/skia/include/core/SkMallocPixelRef.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 
 namespace flutter {
@@ -66,23 +67,21 @@
     return nullptr;
   }
 
-  if (!descriptor->is_compressed()) {
-    FML_DLOG(ERROR)
-        << "Uncompressed images are not implemented in Impeller yet.";
-    return nullptr;
-  }
   target_size.set(std::min(static_cast<int32_t>(max_texture_size.width),
                            target_size.width()),
                   std::min(static_cast<int32_t>(max_texture_size.height),
                            target_size.height()));
 
   const SkISize source_size = descriptor->image_info().dimensions();
-  auto decode_size = descriptor->get_scaled_dimensions(std::max(
-      static_cast<double>(target_size.width()) / source_size.width(),
-      static_cast<double>(target_size.height()) / source_size.height()));
+  auto decode_size = source_size;
+  if (descriptor->is_compressed()) {
+    decode_size = descriptor->get_scaled_dimensions(std::max(
+        static_cast<double>(target_size.width()) / source_size.width(),
+        static_cast<double>(target_size.height()) / source_size.height()));
+  }
 
   //----------------------------------------------------------------------------
-  /// 1. Decode the image into the image generator's closest supported size.
+  /// 1. Decode the image.
   ///
 
   const auto base_image_info = descriptor->image_info();
@@ -99,18 +98,26 @@
   }
 
   auto bitmap = std::make_shared<SkBitmap>();
-  if (!bitmap->tryAllocPixels(image_info)) {
-    FML_DLOG(ERROR)
-        << "Could not allocate intermediate for image decompression.";
-    return nullptr;
+  if (descriptor->is_compressed()) {
+    if (!bitmap->tryAllocPixels(image_info)) {
+      FML_DLOG(ERROR)
+          << "Could not allocate intermediate for image decompression.";
+      return nullptr;
+    }
+    // Decode the image into the image generator's closest supported size.
+    if (!descriptor->get_pixels(bitmap->pixmap())) {
+      FML_DLOG(ERROR) << "Could not decompress image.";
+      return nullptr;
+    }
+  } else {
+    bitmap->setInfo(image_info);
+    auto pixel_ref = SkMallocPixelRef::MakeWithData(
+        image_info, descriptor->row_bytes(), descriptor->data());
+    bitmap->setPixelRef(pixel_ref, 0, 0);
+    bitmap->setImmutable();
   }
 
-  if (!descriptor->get_pixels(bitmap->pixmap())) {
-    FML_DLOG(ERROR) << "Could not decompress image.";
-    return nullptr;
-  }
-
-  if (decode_size == target_size) {
+  if (bitmap->dimensions() == target_size) {
     return bitmap;
   }