Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support decoding gainmaps to alpha8 with BitmapFactory.

Browse Source 
Bug: 271174821
Test: android.graphics.cts.GainmapTest
Change-Id: Ifdb285ea3f6bb6a3de44b216d1b4bb2c1826469a
This commit is contained in:
John Reck
2023-05-09 17:50:33 -04:00
committed by Sally Qi
parent bce1bf4fdc
commit 818328c482
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hwui/jni/BitmapFactory.cpp
View File

@@ -194,7 +194,11 @@ static bool decodeGainmap(std::unique_ptr<SkStream> gainmapStream, const SkGainm
ALOGE("Can not create a codec for Gainmap.");
return false;
}
SkColorType decodeColorType = codec->computeOutputColorType(kN32_SkColorType);
SkColorType decodeColorType = kN32_SkColorType;
if (codec->getInfo().colorType() == kGray_8_SkColorType) {
decodeColorType = kGray_8_SkColorType;
}
decodeColorType = codec->computeOutputColorType(decodeColorType);
sk_sp<SkColorSpace> decodeColorSpace = codec->computeOutputColorSpace(decodeColorType, nullptr);
SkISize size = codec->getSampledDimensions(sampleSize);
@@ -217,7 +221,11 @@ static bool decodeGainmap(std::unique_ptr<SkStream> gainmapStream, const SkGainm
const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(), decodeColorType,
alphaType, decodeColorSpace);
const SkImageInfo& bitmapInfo = decodeInfo;
SkImageInfo bitmapInfo = decodeInfo;
if (decodeColorType == kGray_8_SkColorType) {
// We treat gray8 as alpha8 in Bitmap's API surface
bitmapInfo = bitmapInfo.makeColorType(kAlpha_8_SkColorType);
}
SkBitmap decodeBitmap;
sk_sp<Bitmap> nativeBitmap = nullptr;