aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-04-29 09:38:40 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-29 09:38:40 -0700
commit69deca8d1e57daec540f8a7f10d9c660b640b9a9 (patch)
treedbf8b6d316f6d0f49373870692ca6e442630b74e /dm
parent1b5dd884546d35ff0909168cbfeafd7f53225a97 (diff)
Add ColorCodecSrc for testing/comparison on color corrected decodes
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp12
-rw-r--r--dm/DMSrcSink.cpp65
-rw-r--r--dm/DMSrcSink.h18
3 files changed, 94 insertions, 1 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index fe1432bf32..9dbd43adda 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -779,7 +779,7 @@ static bool gather_srcs() {
}
SkTArray<SkString> images;
- if (!CollectImages(&images)) {
+ if (!CollectImages(FLAGS_images, &images)) {
return false;
}
@@ -795,6 +795,16 @@ static bool gather_srcs() {
}
}
+ SkTArray<SkString> colorImages;
+ if (!CollectImages(FLAGS_colorImages, &colorImages)) {
+ return false;
+ }
+
+ for (auto colorImage : colorImages) {
+ ColorCodecSrc* src = new ColorCodecSrc(colorImage, ColorCodecSrc::kBaseline_Mode);
+ push_src("image", "color_codec_baseline", src);
+ }
+
return true;
}
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index e8018297b7..f99afe4859 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -932,6 +932,71 @@ Name ImageGenSrc::name() const {
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+ColorCodecSrc::ColorCodecSrc(Path path, Mode mode)
+ : fPath(path)
+ , fMode(mode)
+{}
+
+bool ColorCodecSrc::veto(SinkFlags flags) const {
+ // Test to direct raster backends (8888 and 565).
+ return flags.type != SinkFlags::kRaster || flags.approach != SinkFlags::kDirect;
+}
+
+Error ColorCodecSrc::draw(SkCanvas* canvas) const {
+ if (kRGB_565_SkColorType == canvas->imageInfo().colorType()) {
+ return Error::Nonfatal("No need to test color correction to 565 backend.");
+ }
+
+ SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
+ if (!encoded) {
+ return SkStringPrintf("Couldn't read %s.", fPath.c_str());
+ }
+
+ SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
+ if (nullptr == codec.get()) {
+ return SkStringPrintf("Couldn't create codec for %s.", fPath.c_str());
+ }
+
+ SkImageInfo decodeInfo = codec->getInfo().makeColorType(kN32_SkColorType);
+ SkBitmap bitmap;
+ if (!bitmap.tryAllocPixels(decodeInfo)) {
+ return SkStringPrintf("Image(%s) is too large (%d x %d)", fPath.c_str(),
+ decodeInfo.width(), decodeInfo.height());
+ }
+
+ switch (fMode) {
+ case kBaseline_Mode:
+ switch (codec->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowBytes())) {
+ case SkCodec::kSuccess:
+ break;
+ default:
+ // Everything else is considered a failure.
+ return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str());
+ }
+ canvas->drawBitmap(bitmap, 0, 0);
+ break;
+ default:
+ SkASSERT(false);
+ return "Invalid fMode";
+ }
+ return "";
+}
+
+SkISize ColorCodecSrc::size() const {
+ SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
+ SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
+ if (nullptr == codec) {
+ return SkISize::Make(0, 0);
+ }
+ return SkISize::Make(codec->getInfo().width(), codec->getInfo().height());
+}
+
+Name ColorCodecSrc::name() const {
+ return SkOSPath::Basename(fPath.c_str());
+}
+
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
static const SkRect kSKPViewport = {0,0, 1000,1000};
SKPSrc::SKPSrc(Path path) : fPath(path) {}
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 5f60dc59fd..5a734a6f3c 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -208,6 +208,24 @@ private:
bool fRunSerially;
};
+class ColorCodecSrc : public Src {
+public:
+ enum Mode {
+ // Mimic legacy behavior and apply no color correction.
+ kBaseline_Mode,
+ };
+
+ ColorCodecSrc(Path, Mode);
+
+ Error draw(SkCanvas*) const override;
+ SkISize size() const override;
+ Name name() const override;
+ bool veto(SinkFlags) const override;
+private:
+ Path fPath;
+ Mode fMode;
+};
+
class SKPSrc : public Src {
public:
explicit SKPSrc(Path path);