diff options
author | 2016-02-03 12:39:10 -0800 | |
---|---|---|
committer | 2016-02-03 12:39:11 -0800 | |
commit | 9e9444cad8a9df626eff49ea271ebb4e3a603a20 (patch) | |
tree | f482ea6f1bab30056099201ec915aa9ed0980909 /dm | |
parent | 9cdb9920fcad286ecf7875ea19902022b644fbdc (diff) |
Test unpremul decodes
This is a workaround until SkCanvas supports drawing kUnpremul sources.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1661913005
Review URL: https://codereview.chromium.org/1661913005
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DM.cpp | 6 | ||||
-rw-r--r-- | dm/DMSrcSink.cpp | 33 |
2 files changed, 37 insertions, 2 deletions
@@ -313,6 +313,9 @@ static void push_android_codec_src(Path path, AndroidCodecSrc::Mode mode, case kPremul_SkAlphaType: folder.append("_premul"); break; + case kUnpremul_SkAlphaType: + folder.append("_unpremul"); + break; default: break; } @@ -373,8 +376,7 @@ static void push_codec_srcs(Path path) { SkTArray<SkAlphaType> alphaModes; alphaModes.push_back(kPremul_SkAlphaType); - // FIXME: Currently we cannot draw unpremultiplied sources. skbug.com/3338 and skbug.com/3339 - // alphaModes.push_back(kUnpremul_SkAlphaType); + alphaModes.push_back(kUnpremul_SkAlphaType); if (codec->getInfo().alphaType() == kOpaque_SkAlphaType) { alphaModes.push_back(kOpaque_SkAlphaType); } diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index f5a00b5600..7a260e5820 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -18,6 +18,7 @@ #include "SkMultiPictureDraw.h" #include "SkNullCanvas.h" #include "SkOSFile.h" +#include "SkOpts.h" #include "SkPictureData.h" #include "SkPictureRecorder.h" #include "SkRandom.h" @@ -257,6 +258,32 @@ bool CodecSrc::veto(SinkFlags flags) const { return flags.type != SinkFlags::kRaster || flags.approach != SinkFlags::kDirect; } +// FIXME: Currently we cannot draw unpremultiplied sources. skbug.com/3338 and skbug.com/3339. +// This allows us to still test unpremultiplied decodes. +void premultiply_if_necessary(SkBitmap& bitmap) { + if (kUnpremul_SkAlphaType != bitmap.alphaType()) { + return; + } + + switch (bitmap.colorType()) { + case kN32_SkColorType: + for (int y = 0; y < bitmap.height(); y++) { + uint32_t* row = (uint32_t*) bitmap.getAddr(0, y); + SkOpts::RGBA_to_rgbA(row, row, bitmap.width()); + } + break; + case kIndex_8_SkColorType: { + SkColorTable* colorTable = bitmap.getColorTable(); + SkPMColor* colorPtr = const_cast<SkPMColor*>(colorTable->readColors()); + SkOpts::RGBA_to_rgbA(colorPtr, colorPtr, colorTable->count()); + break; + } + default: + // No need to premultiply kGray or k565 outputs. + break; + } +} + bool get_decode_info(SkImageInfo* decodeInfo, SkColorType canvasColorType, CodecSrc::DstColorType dstColorType) { switch (dstColorType) { @@ -380,6 +407,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { // Everything else is considered a failure. return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str()); } + premultiply_if_necessary(bitmap); canvas->drawBitmap(bitmap, 0, 0); break; } @@ -413,6 +441,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { } } + premultiply_if_necessary(bitmap); canvas->drawBitmap(bitmap, 0, 0); break; } @@ -464,6 +493,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { codec->skipScanlines(linesToSkip); } } + premultiply_if_necessary(bitmap); canvas->drawBitmap(bitmap, 0, 0); break; } @@ -536,6 +566,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { x, y, decodeInfo.width(), decodeInfo.height(), fPath.c_str(), W, H, result); } + premultiply_if_necessary(subsetBm); canvas->drawBitmap(subsetBm, SkIntToScalar(left), SkIntToScalar(top)); // translate by the scaled height. top += decodeInfo.height(); @@ -646,6 +677,7 @@ Error AndroidCodecSrc::draw(SkCanvas* canvas) const { default: return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str()); } + premultiply_if_necessary(bitmap); canvas->drawBitmap(bitmap, 0, 0); return ""; } @@ -705,6 +737,7 @@ Error AndroidCodecSrc::draw(SkCanvas* canvas) const { SkRect rect = SkRect::MakeXYWH(0, 0, (SkScalar) finalScaledWidth, (SkScalar) finalScaledHeight); + premultiply_if_necessary(bitmap); canvas->drawBitmapRect(bitmap, rect, rect, nullptr); return ""; } |