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

Merge "Encode F16 Bitmaps to 8-bit P3" into pi-dev

Browse Source
This commit is contained in:
Leon Scroggins
2018-03-13 10:40:25 +00:00
committed by Android (Google) Code Review
parent fd95ca6d2e 4856210398
commit 5a0b48a13d
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/jni/android/graphics/Bitmap.cpp
View File

@@ -921,6 +921,28 @@ static jboolean Bitmap_compress(JNIEnv* env, jobject clazz, jlong bitmapHandle,
SkBitmap skbitmap;
bitmap->getSkBitmap(&skbitmap);
if (skbitmap.colorType() == kRGBA_F16_SkColorType) {
// Convert to P3 before encoding. This matches SkAndroidCodec::computeOutputColorSpace
// for wide gamuts.
auto cs = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma,
SkColorSpace::kDCIP3_D65_Gamut);
auto info = skbitmap.info().makeColorType(kRGBA_8888_SkColorType)
.makeColorSpace(std::move(cs));
SkBitmap p3;
if (!p3.tryAllocPixels(info)) {
return JNI_FALSE;
}
auto xform = SkColorSpaceXform::New(skbitmap.colorSpace(), info.colorSpace());
if (!xform) {
return JNI_FALSE;
}
if (!xform->apply(SkColorSpaceXform::kRGBA_8888_ColorFormat, p3.getPixels(),
SkColorSpaceXform::kRGBA_F16_ColorFormat, skbitmap.getPixels(),
info.width() * info.height(), kUnpremul_SkAlphaType)) {
return JNI_FALSE;
}
skbitmap = p3;
}
return SkEncodeImage(strm.get(), skbitmap, fm, quality) ? JNI_TRUE : JNI_FALSE;
}