aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2018-05-23 10:58:18 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-23 15:20:21 +0000
commitfe75169912d5df74d4aab44f5552a31bb5d9b907 (patch)
tree2d9669d8d83529a8eee97947498f3cd646248858 /bench
parentdcc69a507dd42bf6d865f1f86f8f90caff29c2cb (diff)
Remove ColorCodecBench
This wasn't being run (AFAICT) and was built on pre-skcms color management. Change-Id: I506e8767f716bc6e4590ce255c5e40f1064fc152 Reviewed-on: https://skia-review.googlesource.com/129644 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'bench')
-rw-r--r--bench/ColorCodecBench.cpp106
-rw-r--r--bench/ColorCodecBench.h41
-rw-r--r--bench/nanobench.cpp21
3 files changed, 0 insertions, 168 deletions
diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp
deleted file mode 100644
index 37f1a6233d..0000000000
--- a/bench/ColorCodecBench.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "ColorCodecBench.h"
-#include "Resources.h"
-#include "SkCodec.h"
-#include "SkCodecPriv.h"
-#include "SkColorSpace_XYZ.h"
-#include "SkColorSpaceXform.h"
-#include "SkCommandLineFlags.h"
-
-DEFINE_bool(xform_only, false, "Only time the color xform, do not include the decode time");
-DEFINE_bool(srgb, false, "Convert to srgb dst space");
-DEFINE_bool(nonstd, false, "Convert to non-standard dst space");
-DEFINE_bool(half, false, "Convert to half floats");
-
-ColorCodecBench::ColorCodecBench(const char* name, sk_sp<SkData> encoded)
- : fEncoded(std::move(encoded))
-{
- fName.appendf("Color%s", FLAGS_xform_only ? "Xform" : "Codec");
- fName.appendf("_%s", name);
-}
-
-const char* ColorCodecBench::onGetName() {
- return fName.c_str();
-}
-
-bool ColorCodecBench::isSuitableFor(Backend backend) {
- return kNonRendering_Backend == backend;
-}
-
-void ColorCodecBench::decodeAndXform() {
-#ifdef SK_DEBUG
- SkCodec::Result result =
-#endif
- SkCodec::MakeFromData(fEncoded)->getPixels(fDstInfo, fDst.get(), fDstInfo.minRowBytes());
- SkASSERT(SkCodec::kSuccess == result);
-}
-
-void ColorCodecBench::xformOnly() {
- std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(fSrcSpace.get(),
- fDstSpace.get());
- SkASSERT(xform);
-
- void* dst = fDst.get();
- void* src = fSrc.get();
- for (int y = 0; y < fSrcInfo.height(); y++) {
- SkAssertResult(xform->apply(select_xform_format(fDstInfo.colorType()), dst,
- SkColorSpaceXform::kRGBA_8888_ColorFormat, src,
- fSrcInfo.width(), fDstInfo.alphaType()));
- dst = SkTAddOffset<void>(dst, fDstInfo.minRowBytes());
- src = SkTAddOffset<void>(src, fSrcInfo.minRowBytes());
- }
-}
-
-void ColorCodecBench::onDelayedSetup() {
- std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(fEncoded);
- fSrcInfo = codec->getInfo().makeColorType(kRGBA_8888_SkColorType);
- fDstInfo = fSrcInfo;
-
- fDstSpace = nullptr;
- if (FLAGS_srgb) {
- fDstSpace = SkColorSpace::MakeSRGB();
- } else if (FLAGS_nonstd) {
- SkColorSpaceTransferFn gamma;
- gamma.fA = 1.0f;
- gamma.fB = gamma.fC = gamma.fD = gamma.fE = gamma.fF = 0.0f;
- gamma.fG = 4.0f;
- SkMatrix44 matrix = SkMatrix44(SkMatrix44::kUninitialized_Constructor);
- matrix.set3x3(0.30f, 0.31f, 0.28f, 0.32f, 0.33f, 0.29f, 0.27f, 0.30f, 0.30f);
- fDstSpace = SkColorSpace::MakeRGB(gamma, matrix);
- } else {
- sk_sp<SkData> dstData = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
- SkASSERT(dstData);
- fDstSpace = SkColorSpace::MakeICC(dstData->data(), dstData->size());
- }
- SkASSERT(fDstSpace);
- fDstInfo = fDstInfo.makeColorSpace(fDstSpace);
-
- if (FLAGS_half) {
- fDstInfo = fDstInfo.makeColorType(kRGBA_F16_SkColorType);
- fDstSpace = fDstSpace->makeLinearGamma();
- }
-
- fDst.reset(fDstInfo.computeMinByteSize());
-
- if (FLAGS_xform_only) {
- fSrc.reset(fSrcInfo.computeMinByteSize());
- fSrcSpace = codec->getInfo().refColorSpace();
- codec->getPixels(fSrcInfo, fSrc.get(), fSrcInfo.minRowBytes());
- }
-}
-
-void ColorCodecBench::onDraw(int n, SkCanvas*) {
- for (int i = 0; i < n; i++) {
- if (FLAGS_xform_only) {
- this->xformOnly();
- } else {
- this->decodeAndXform();
- }
- }
-}
diff --git a/bench/ColorCodecBench.h b/bench/ColorCodecBench.h
deleted file mode 100644
index e5048f8d7b..0000000000
--- a/bench/ColorCodecBench.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef ColorCodecBench_DEFINED
-#define ColorCodecBench_DEFINED
-
-#include "Benchmark.h"
-#include "SkAutoMalloc.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-
-class ColorCodecBench : public Benchmark {
-public:
- ColorCodecBench(const char* name, sk_sp<SkData> encoded);
-
-protected:
- const char* onGetName() override;
- bool isSuitableFor(Backend backend) override;
- void onDraw(int n, SkCanvas* canvas) override;
- void onDelayedSetup() override;
-
-private:
- void decodeAndXform();
- void xformOnly();
-
- SkString fName;
- sk_sp<SkData> fEncoded;
- SkImageInfo fSrcInfo;
- SkImageInfo fDstInfo;
- SkAutoMalloc fDst;
- SkAutoMalloc fSrc;
- sk_sp<SkColorSpace> fDstSpace;
- sk_sp<SkColorSpace> fSrcSpace;
-
- typedef Benchmark INHERITED;
-};
-#endif // ColorCodecBench_DEFINED
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index a156ad6ecc..8c89ec716c 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -14,7 +14,6 @@
#include "BitmapRegionDecoderBench.h"
#include "CodecBench.h"
#include "CodecBenchPriv.h"
-#include "ColorCodecBench.h"
#include "CrashHandler.h"
#include "GMBench.h"
#include "ProcStats.h"
@@ -621,7 +620,6 @@ public:
, fCurrentCodec(0)
, fCurrentAndroidCodec(0)
, fCurrentBRDImage(0)
- , fCurrentColorImage(0)
, fCurrentColorType(0)
, fCurrentAlphaType(0)
, fCurrentSubsetType(0)
@@ -657,9 +655,6 @@ public:
if (!CollectImages(FLAGS_images, &fImages)) {
exit(1);
}
- if (!CollectImages(FLAGS_colorImages, &fColorImages)) {
- exit(1);
- }
// Choose the candidate color types for image decoding
fColorTypes.push_back(kN32_SkColorType);
@@ -1048,20 +1043,6 @@ public:
fCurrentColorType = 0;
}
- while (fCurrentColorImage < fColorImages.count()) {
- fSourceType = "colorimage";
- fBenchType = "skcolorcodec";
- const SkString& path = fColorImages[fCurrentColorImage];
- fCurrentColorImage++;
- sk_sp<SkData> encoded = SkData::MakeFromFileName(path.c_str());
- if (encoded) {
- return new ColorCodecBench(SkOSPath::Basename(path.c_str()).c_str(),
- std::move(encoded));
- } else {
- SkDebugf("Could not read file %s.\n", path.c_str());
- }
- }
-
return nullptr;
}
@@ -1106,7 +1087,6 @@ private:
SkTArray<SkString> fSVGs;
SkTArray<bool> fUseMPDs;
SkTArray<SkString> fImages;
- SkTArray<SkString> fColorImages;
SkTArray<SkColorType, true> fColorTypes;
SkScalar fZoomMax;
double fZoomPeriodMs;
@@ -1125,7 +1105,6 @@ private:
int fCurrentCodec;
int fCurrentAndroidCodec;
int fCurrentBRDImage;
- int fCurrentColorImage;
int fCurrentColorType;
int fCurrentAlphaType;
int fCurrentSubsetType;