Support gainmap HW copy.
- for Bitmap::allocateHardwareBitmap to create and upload a hardware
version of the gainmap.
Bug: 267216439
Test: android.graphics.cts.BitmapFactoryTest,
android.graphics.cts.BitmapRegionDecoderTest,
android.graphics.cts.ImageDecoderTest, android.graphics.cts.GainmapTest
Change-Id: Ie080896425dc82a605b2bc41e97ddc2420f5328a
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 7228b89..3b12972 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -537,6 +537,7 @@
"AnimatorManager.cpp",
"CanvasTransform.cpp",
"DamageAccumulator.cpp",
+ "Gainmap.cpp",
"Interpolator.cpp",
"LightingInfo.cpp",
"Matrix.cpp",
diff --git a/libs/hwui/Gainmap.cpp b/libs/hwui/Gainmap.cpp
new file mode 100644
index 0000000..30f401e
--- /dev/null
+++ b/libs/hwui/Gainmap.cpp
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "Gainmap.h"
+
+namespace android::uirenderer {
+
+sp<Gainmap> Gainmap::allocateHardwareGainmap(const sp<Gainmap>& srcGainmap) {
+ auto gainmap = sp<Gainmap>::make();
+ gainmap->info = srcGainmap->info;
+ const SkBitmap skSrcBitmap = srcGainmap->bitmap->getSkBitmap();
+ sk_sp<Bitmap> skBitmap(Bitmap::allocateHardwareBitmap(skSrcBitmap));
+ if (!skBitmap.get()) {
+ return nullptr;
+ }
+ gainmap->bitmap = std::move(skBitmap);
+ return gainmap;
+}
+
+} // namespace android::uirenderer
\ No newline at end of file
diff --git a/libs/hwui/Gainmap.h b/libs/hwui/Gainmap.h
index 765f98a..3bc183a 100644
--- a/libs/hwui/Gainmap.h
+++ b/libs/hwui/Gainmap.h
@@ -27,6 +27,7 @@
public:
SkGainmapInfo info;
sk_sp<Bitmap> bitmap;
+ static sp<Gainmap> allocateHardwareGainmap(const sp<Gainmap>& srcGainmap);
};
} // namespace android::uirenderer
diff --git a/libs/hwui/jni/Bitmap.cpp b/libs/hwui/jni/Bitmap.cpp
index 3f9c4bd..6ee7576 100644
--- a/libs/hwui/jni/Bitmap.cpp
+++ b/libs/hwui/jni/Bitmap.cpp
@@ -386,15 +386,10 @@
return NULL;
}
if (hasGainmap) {
- auto gainmap = sp<uirenderer::Gainmap>::make();
- gainmap->info = original.gainmap()->info;
- const SkBitmap skSrcBitmap = original.gainmap()->bitmap->getSkBitmap();
- sk_sp<Bitmap> skBitmap(Bitmap::allocateHardwareBitmap(skSrcBitmap));
- if (!skBitmap.get()) {
- return NULL;
+ auto gm = uirenderer::Gainmap::allocateHardwareGainmap(original.gainmap());
+ if (gm) {
+ bitmap->setGainmap(std::move(gm));
}
- gainmap->bitmap = std::move(skBitmap);
- bitmap->setGainmap(std::move(gainmap));
}
return createBitmap(env, bitmap.release(), getPremulBitmapCreateFlags(isMutable));
}
diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp
index 571ab83..c57e6f0 100644
--- a/libs/hwui/jni/BitmapFactory.cpp
+++ b/libs/hwui/jni/BitmapFactory.cpp
@@ -637,7 +637,10 @@
return nullObjectReturn("Failed to allocate a hardware bitmap");
}
if (hasGainmap) {
- hardwareBitmap->setGainmap(std::move(gainmap));
+ auto gm = uirenderer::Gainmap::allocateHardwareGainmap(gainmap);
+ if (gm) {
+ hardwareBitmap->setGainmap(std::move(gm));
+ }
}
return bitmap::createBitmap(env, hardwareBitmap.release(), bitmapCreateFlags,
diff --git a/libs/hwui/jni/BitmapRegionDecoder.cpp b/libs/hwui/jni/BitmapRegionDecoder.cpp
index f93be03..aeaa171 100644
--- a/libs/hwui/jni/BitmapRegionDecoder.cpp
+++ b/libs/hwui/jni/BitmapRegionDecoder.cpp
@@ -334,7 +334,10 @@
if (isHardware) {
sk_sp<Bitmap> hardwareBitmap = Bitmap::allocateHardwareBitmap(bitmap);
if (hasGainmap) {
- hardwareBitmap->setGainmap(std::move(gainmap));
+ auto gm = uirenderer::Gainmap::allocateHardwareGainmap(gainmap);
+ if (gm) {
+ hardwareBitmap->setGainmap(std::move(gm));
+ }
}
return bitmap::createBitmap(env, hardwareBitmap.release(), bitmapCreateFlags);
}
diff --git a/libs/hwui/jni/ImageDecoder.cpp b/libs/hwui/jni/ImageDecoder.cpp
index fda7080..ad80460 100644
--- a/libs/hwui/jni/ImageDecoder.cpp
+++ b/libs/hwui/jni/ImageDecoder.cpp
@@ -469,8 +469,10 @@
if (hwBitmap) {
hwBitmap->setImmutable();
if (nativeBitmap->hasGainmap()) {
- // TODO: Also convert to a HW gainmap image
- hwBitmap->setGainmap(nativeBitmap->gainmap());
+ auto gm = uirenderer::Gainmap::allocateHardwareGainmap(nativeBitmap->gainmap());
+ if (gm) {
+ hwBitmap->setGainmap(std::move(gm));
+ }
}
return bitmap::createBitmap(env, hwBitmap.release(), bitmapCreateFlags,
ninePatchChunk, ninePatchInsets);