8715d47e24
Remove reference to SkImageDecoder from SkPicture. Make the default InstallPixelRefProc passed to CreateFromStream use SkImageGenerator::NewFromEncoded instead. Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator. Remove the old version that used SkImageDecoder. Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default now behaves lazily. Update all clients to use the default. Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly. This is a rebased version of: https://codereview.chromium.org/1671193002/ TBR=reed@google.com BUG=skia:4691 BUG=skia:4290 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1699183004 Review URL: https://codereview.chromium.org/1699183004
96 lines
3.0 KiB
C++
96 lines
3.0 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "DumpRecord.h"
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkPicture.h"
|
|
#include "SkPictureRecorder.h"
|
|
#include "SkRecordDraw.h"
|
|
#include "SkRecordOpts.h"
|
|
#include "SkRecorder.h"
|
|
#include "SkStream.h"
|
|
#include <stdio.h>
|
|
|
|
DEFINE_string2(skps, r, "", ".SKPs to dump.");
|
|
DEFINE_string(match, "", "The usual filters on file names to dump.");
|
|
DEFINE_bool2(optimize, O, false, "Run SkRecordOptimize before dumping.");
|
|
DEFINE_bool(optimize2, false, "Run SkRecordOptimize2 before dumping.");
|
|
DEFINE_int32(tile, 1000000000, "Simulated tile size.");
|
|
DEFINE_bool(timeWithCommand, false, "If true, print time next to command, else in first column.");
|
|
DEFINE_string2(write, w, "", "Write the (optimized) picture to the named file.");
|
|
|
|
static void dump(const char* name, int w, int h, const SkRecord& record) {
|
|
SkBitmap bitmap;
|
|
bitmap.allocN32Pixels(w, h);
|
|
SkCanvas canvas(bitmap);
|
|
canvas.clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile),
|
|
SkIntToScalar(FLAGS_tile)));
|
|
|
|
printf("%s %s\n", FLAGS_optimize ? "optimized" : "not-optimized", name);
|
|
|
|
DumpRecord(record, &canvas, FLAGS_timeWithCommand);
|
|
}
|
|
|
|
int tool_main(int argc, char** argv);
|
|
int tool_main(int argc, char** argv) {
|
|
SkCommandLineFlags::Parse(argc, argv);
|
|
|
|
for (int i = 0; i < FLAGS_skps.count(); i++) {
|
|
if (SkCommandLineFlags::ShouldSkip(FLAGS_match, FLAGS_skps[i])) {
|
|
continue;
|
|
}
|
|
|
|
SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(FLAGS_skps[i]));
|
|
if (!stream) {
|
|
SkDebugf("Could not read %s.\n", FLAGS_skps[i]);
|
|
return 1;
|
|
}
|
|
SkAutoTUnref<SkPicture> src(SkPicture::CreateFromStream(stream));
|
|
if (!src) {
|
|
SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]);
|
|
return 1;
|
|
}
|
|
const int w = SkScalarCeilToInt(src->cullRect().width());
|
|
const int h = SkScalarCeilToInt(src->cullRect().height());
|
|
|
|
SkRecord record;
|
|
SkRecorder canvas(&record, w, h);
|
|
src->playback(&canvas);
|
|
|
|
if (FLAGS_optimize) {
|
|
SkRecordOptimize(&record);
|
|
}
|
|
if (FLAGS_optimize2) {
|
|
SkRecordOptimize2(&record);
|
|
}
|
|
|
|
dump(FLAGS_skps[i], w, h, record);
|
|
|
|
if (FLAGS_write.count() > 0) {
|
|
SkPictureRecorder r;
|
|
SkRecordDraw(record,
|
|
r.beginRecording(SkRect::MakeIWH(w, h)),
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
nullptr,
|
|
nullptr);
|
|
SkAutoTUnref<SkPicture> dst(r.endRecording());
|
|
SkFILEWStream ostream(FLAGS_write[0]);
|
|
dst->serialize(&ostream);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if !defined SK_BUILD_FOR_IOS
|
|
int main(int argc, char * const argv[]) {
|
|
return tool_main(argc, (char**) argv);
|
|
}
|
|
#endif
|