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

Merge "Implement encoding alpha8 gainmaps" into udc-dev

Browse Source
This commit is contained in:
John Reck
2023-03-03 15:02:23 +00:00
committed by Android (Google) Code Review
parent 40078ee5d1 280b4409ce
commit 492ddfb55e
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/Bitmap.java
View File

@@ -2001,7 +2001,7 @@ public final class Bitmap implements Parcelable {
checkPixelAccess(x, y); checkPixelAccess(x, y);
final ColorSpace cs = getColorSpace(); final ColorSpace cs = getColorSpace();
if (cs.equals(ColorSpace.get(ColorSpace.Named.SRGB))) { if (cs == null || cs.equals(ColorSpace.get(ColorSpace.Named.SRGB))) {
return Color.valueOf(nativeGetPixel(mNativePtr, x, y)); return Color.valueOf(nativeGetPixel(mNativePtr, x, y));
} }
// The returned value is in kRGBA_F16_SkColorType, which is packed as // The returned value is in kRGBA_F16_SkColorType, which is packed as

7
libs/hwui/hwui/Bitmap.cpp
View File

@@ -463,6 +463,13 @@ bool Bitmap::compress(JavaCompressFormat format, int32_t quality, SkWStream* str
if (hasGainmap() && format == JavaCompressFormat::Jpeg) { if (hasGainmap() && format == JavaCompressFormat::Jpeg) {
SkBitmap baseBitmap = getSkBitmap(); SkBitmap baseBitmap = getSkBitmap();
SkBitmap gainmapBitmap = gainmap()->bitmap->getSkBitmap(); SkBitmap gainmapBitmap = gainmap()->bitmap->getSkBitmap();
if (gainmapBitmap.colorType() == SkColorType::kAlpha_8_SkColorType) {
SkBitmap greyGainmap;
auto greyInfo = gainmapBitmap.info().makeColorType(SkColorType::kGray_8_SkColorType);
greyGainmap.setInfo(greyInfo, gainmapBitmap.rowBytes());
greyGainmap.setPixelRef(sk_ref_sp(gainmapBitmap.pixelRef()), 0, 0);
gainmapBitmap = std::move(greyGainmap);
}
SkJpegEncoder::Options options{.fQuality = quality}; SkJpegEncoder::Options options{.fQuality = quality};
return SkJpegGainmapEncoder::EncodeHDRGM(stream, baseBitmap.pixmap(), options, return SkJpegGainmapEncoder::EncodeHDRGM(stream, baseBitmap.pixmap(), options,
gainmapBitmap.pixmap(), options, gainmap()->info); gainmapBitmap.pixmap(), options, gainmap()->info);

34
tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt
View File

@@ -80,10 +80,10 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context
spinner.adapter = adapter spinner.adapter = adapter
spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected( override fun onItemSelected(
parent: AdapterView<*>?, parent: AdapterView<*>?,
view: View?, view: View?,
position: Int, position: Int,
id: Long id: Long
) { ) {
setImage(position) setImage(position)
} }
@@ -108,7 +108,7 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context
if (selectedImage == position) return if (selectedImage == position) return
selectedImage = position selectedImage = position
val source = ImageDecoder.createSource(resources.assets, val source = ImageDecoder.createSource(resources.assets,
"gainmaps/${gainmapImages[position]}") "gainmaps/${gainmapImages[position]}")
doDecode(source) doDecode(source)
} }
@@ -137,16 +137,16 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context
gainmapVisualizer = map gainmapVisualizer = map
} else { } else {
gainmapVisualizer = Bitmap.createBitmap(map.width, map.height, gainmapVisualizer = Bitmap.createBitmap(map.width, map.height,
Bitmap.Config.ARGB_8888) Bitmap.Config.ARGB_8888)
val canvas = Canvas(gainmapVisualizer!!) val canvas = Canvas(gainmapVisualizer!!)
val paint = Paint() val paint = Paint()
paint.colorFilter = ColorMatrixColorFilter( paint.colorFilter = ColorMatrixColorFilter(
floatArrayOf( floatArrayOf(
0f, 0f, 0f, 1f, 0f, 0f, 0f, 0f, 1f, 0f,
0f, 0f, 0f, 1f, 0f, 0f, 0f, 0f, 1f, 0f,
0f, 0f, 0f, 1f, 0f, 0f, 0f, 0f, 1f, 0f,
0f, 0f, 0f, 0f, 255f 0f, 0f, 0f, 0f, 255f
) )
) )
canvas.drawBitmap(map, 0f, 0f, paint) canvas.drawBitmap(map, 0f, 0f, paint)
canvas.setBitmap(null) canvas.setBitmap(null)
@@ -174,8 +174,14 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context
if (bitmap == null) return if (bitmap == null) return
imageView.setImage(ImageSource.cachedBitmap(when (outputMode) { imageView.setImage(ImageSource.cachedBitmap(when (outputMode) {
R.id.output_hdr -> { bitmap!!.gainmap = gainmap; bitmap!! } R.id.output_hdr -> {
R.id.output_sdr -> { bitmap!!.gainmap = null; bitmap!! } bitmap!!.gainmap = gainmap; bitmap!!
}
R.id.output_sdr -> {
bitmap!!.gainmap = null; bitmap!!
}
R.id.output_gainmap -> gainmapVisualizer!! R.id.output_gainmap -> gainmapVisualizer!!
else -> throw IllegalStateException() else -> throw IllegalStateException()
})) }))