39748b2771
I can't tell you how excited I am to turn down the libpng settings... anything that saves me a few seconds is a nice quality of life win. This CL makes ok run in about half the time when producing .pngs. Profile running `ok gm srgb png` before: 10.59 s 16.5% 10.59 s longest_match 8.98 s 14.0% 8.98 s png_setup_paeth_row 8.93 s 13.9% 8.93 s skia_png_write_find_filter 7.75 s 12.1% 7.75 s deflate_slow 4.63 s 7.2% 4.63 s std::wait_until(...) const 959.00 ms 1.5% 959.00 ms SkPathRef::validate() const 935.00 ms 1.4% 935.00 ms sk_to_srgb_hsw ... After: 2.35 s 8.7% 2.35 s std::wait_until(...) const 1.70 s 6.2% 1.70 s longest_match 1.19 s 4.4% 1.19 s deflate_fast 931.00 ms 3.4% 931.00 ms SkPathRef::validate() const 898.00 ms 3.3% 898.00 ms sk_to_srgb_hsw ... Change-Id: I425c30b2ecd97a0e4a4392779de6301db473ee47 Reviewed-on: https://skia-review.googlesource.com/15547 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Matt Sarett <msarett@google.com>
132 lines
4.0 KiB
C++
132 lines
4.0 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkImage.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkPictureRecorder.h"
|
|
#include "SkPngEncoder.h"
|
|
#include "ok.h"
|
|
#include <regex>
|
|
|
|
static std::unique_ptr<Src> proxy(Src* original, std::function<Status(SkCanvas*)> fn) {
|
|
struct : Src {
|
|
Src* original;
|
|
std::function<Status(SkCanvas*)> fn;
|
|
|
|
std::string name() override { return original->name(); }
|
|
SkISize size() override { return original->size(); }
|
|
Status draw(SkCanvas* canvas) override { return fn(canvas); }
|
|
} src;
|
|
src.original = original;
|
|
src.fn = fn;
|
|
return move_unique(src);
|
|
}
|
|
|
|
struct ViaPic : Dst {
|
|
std::unique_ptr<Dst> target;
|
|
bool rtree = false;
|
|
|
|
static std::unique_ptr<Dst> Create(Options options, std::unique_ptr<Dst> dst) {
|
|
ViaPic via;
|
|
via.target = std::move(dst);
|
|
if (options("bbh") == "rtree") { via.rtree = true; }
|
|
return move_unique(via);
|
|
}
|
|
|
|
Status draw(Src* src) override {
|
|
SkRTreeFactory factory;
|
|
SkPictureRecorder rec;
|
|
rec.beginRecording(SkRect::MakeSize(SkSize::Make(src->size())),
|
|
rtree ? &factory : nullptr);
|
|
|
|
for (auto status = src->draw(rec.getRecordingCanvas()); status != Status::OK; ) {
|
|
return status;
|
|
}
|
|
auto pic = rec.finishRecordingAsPicture();
|
|
|
|
return target->draw(proxy(src, [=](SkCanvas* canvas) {
|
|
pic->playback(canvas);
|
|
return Status::OK;
|
|
}).get());
|
|
}
|
|
|
|
sk_sp<SkImage> image() override {
|
|
return target->image();
|
|
}
|
|
};
|
|
static Register via_pic{"via_pic", "record then play back an SkPicture", ViaPic::Create};
|
|
|
|
struct Png : Dst {
|
|
std::unique_ptr<Dst> target;
|
|
std::string dir;
|
|
|
|
static std::unique_ptr<Dst> Create(Options options, std::unique_ptr<Dst> dst) {
|
|
Png via;
|
|
via.target = std::move(dst);
|
|
via.dir = options("dir", "ok");
|
|
return move_unique(via);
|
|
}
|
|
|
|
Status draw(Src* src) override {
|
|
for (auto status = target->draw(src); status != Status::OK; ) {
|
|
return status;
|
|
}
|
|
|
|
SkBitmap bm;
|
|
SkPixmap pm;
|
|
if (!target->image()->asLegacyBitmap(&bm, SkImage::kRO_LegacyBitmapMode) ||
|
|
!bm.peekPixels(&pm)) {
|
|
return Status::Failed;
|
|
}
|
|
|
|
sk_mkdir(dir.c_str());
|
|
SkFILEWStream dst{(dir + "/" + src->name() + ".png").c_str()};
|
|
|
|
SkPngEncoder::Options options;
|
|
options.fFilterFlags = SkPngEncoder::FilterFlag::kNone;
|
|
options.fZLibLevel = 1;
|
|
options.fUnpremulBehavior = pm.colorSpace() ? SkTransferFunctionBehavior::kRespect
|
|
: SkTransferFunctionBehavior::kIgnore;
|
|
return SkPngEncoder::Encode(&dst, pm, options) ? Status::OK
|
|
: Status::Failed;
|
|
}
|
|
|
|
sk_sp<SkImage> image() override {
|
|
return target->image();
|
|
}
|
|
};
|
|
static Register png{"png", "dump PNGs to dir=ok" , Png::Create};
|
|
|
|
struct Filter : Dst {
|
|
std::unique_ptr<Dst> target;
|
|
std::regex match, search;
|
|
|
|
static std::unique_ptr<Dst> Create(Options options, std::unique_ptr<Dst> dst) {
|
|
Filter via;
|
|
via.target = std::move(dst);
|
|
via.match = options("match", ".*");
|
|
via.search = options("search", ".*");
|
|
return move_unique(via);
|
|
}
|
|
|
|
Status draw(Src* src) override {
|
|
auto name = src->name();
|
|
if (!std::regex_match (name, match) ||
|
|
!std::regex_search(name, search)) {
|
|
return Status::Skipped;
|
|
}
|
|
return target->draw(src);
|
|
}
|
|
|
|
sk_sp<SkImage> image() override {
|
|
return target->image();
|
|
}
|
|
};
|
|
struct Register filter{"filter",
|
|
"run only srcs matching match=.* exactly and search=.* somewhere",
|
|
Filter::Create};
|