summaryrefslogtreecommitdiff
path: root/native/graphics
diff options
context:
space:
mode:
author Alec Mouri <alecmouri@google.com> 2022-01-20 13:58:23 -0800
committer Alec Mouri <alecmouri@google.com> 2022-01-27 22:55:18 +0000
commit1efd0a5df616c0b2efe8035f1d2af2e97ca08638 (patch)
tree16289748fde6e05d8ee2674e4088fcd0bddb21c1 /native/graphics
parent230b32ceb6c143eed852d298dfbb3bdd3a801adc (diff)
Expose 1010102 config for bitmap
Bug: 200307898 Test: CtsGraphicsTestCases Change-Id: I33153e080292a95c0cc3d6edada8b274f0b06ac7
Diffstat (limited to 'native/graphics')
-rw-r--r--native/graphics/jni/imagedecoder.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp
index a0f3098ad347..bb25274e3136 100644
--- a/native/graphics/jni/imagedecoder.cpp
+++ b/native/graphics/jni/imagedecoder.cpp
@@ -198,14 +198,16 @@ static SkColorType getColorType(AndroidBitmapFormat format) {
return kGray_8_SkColorType;
case ANDROID_BITMAP_FORMAT_RGBA_F16:
return kRGBA_F16_SkColorType;
+ case ANDROID_BITMAP_FORMAT_RGBA_1010102:
+ return kRGBA_1010102_SkColorType;
default:
return kUnknown_SkColorType;
}
}
int AImageDecoder_setAndroidBitmapFormat(AImageDecoder* decoder, int32_t format) {
- if (!decoder || format < ANDROID_BITMAP_FORMAT_NONE
- || format > ANDROID_BITMAP_FORMAT_RGBA_F16) {
+ if (!decoder || format < ANDROID_BITMAP_FORMAT_NONE ||
+ format > ANDROID_BITMAP_FORMAT_RGBA_1010102) {
return ANDROID_IMAGE_DECODER_BAD_PARAMETER;
}
@@ -290,6 +292,8 @@ static AndroidBitmapFormat getFormat(SkColorType colorType) {
return ANDROID_BITMAP_FORMAT_A_8;
case kRGBA_F16_SkColorType:
return ANDROID_BITMAP_FORMAT_RGBA_F16;
+ case kRGBA_1010102_SkColorType:
+ return ANDROID_BITMAP_FORMAT_RGBA_1010102;
default:
return ANDROID_BITMAP_FORMAT_NONE;
}