f8d7d27313
The new pixel ref behaves similarly to SkImageRef, with some key differences: It does not depend on the images project. It requires an SkImageCache, which handles allocation and caching of the pixel memory. It takes a function signature for decoding which decodes into already allocated pixel memory rather than into an SkBitmap. Add two implementations of SkImageCache: SkLruImageCache and SkAshmemImageCache. Replace SkSerializationHelpers::DecodeBitmap with SkPicture::InstallPixelRefProc, and update sites that referenced it. SkBitmapFactory now sets the pixel ref to a new object of the new class SkLazyPixelRef, provided it has an SkImageCache for caching. Provide an option to do lazy decodes in render_pictures and bench_pictures. SkPicture: Eliminate the default parameters in the constructor. If a proc for decoding bitmaps is installed, use it to decode any encoded data in subpictures. When parsing deserializing subpictures, check for success. When serializing subpictures, pass the picture's bitmap encoder to the subpicture's call to serialize. Update BitmapFactoryTest to test its new behavior. BUG=https://code.google.com/p/skia/issues/detail?id=1008 BUG=https://code.google.com/p/skia/issues/detail?id=1009 Review URL: https://codereview.appspot.com/7060052 git-svn-id: http://skia.googlecode.com/svn/trunk@7835 2bbb7eff-a529-9590-31e7-b0007b416f81
344 lines
11 KiB
C++
344 lines
11 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkDebugCanvas.h"
|
|
#include "SkDevice.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkImageDecoder.h"
|
|
#include "SkImageEncoder.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkPicture.h"
|
|
#include "SkPicturePlayback.h"
|
|
#include "SkPictureRecord.h"
|
|
#include "SkStream.h"
|
|
#include "picture_utils.h"
|
|
#include "path_utils.h"
|
|
|
|
static void usage() {
|
|
SkDebugf("Usage: filter -i inFile [-o outFile] [--input-dir path] [--output-dir path]\n");
|
|
SkDebugf(" [-h|--help]\n\n");
|
|
SkDebugf(" -i inFile : file to file.\n");
|
|
SkDebugf(" -o outFile : result of filtering.\n");
|
|
SkDebugf(" --input-dir : process all files in dir with .skp extension.\n");
|
|
SkDebugf(" --output-dir : results of filtering the input dir.\n");
|
|
SkDebugf(" -h|--help : Show this help message.\n");
|
|
}
|
|
|
|
// Is the supplied paint simply a color?
|
|
static bool is_simple(const SkPaint& p) {
|
|
return NULL == p.getPathEffect() &&
|
|
NULL == p.getShader() &&
|
|
NULL == p.getXfermode() &&
|
|
NULL == p.getMaskFilter() &&
|
|
NULL == p.getColorFilter() &&
|
|
NULL == p.getRasterizer() &&
|
|
NULL == p.getLooper() &&
|
|
NULL == p.getImageFilter();
|
|
}
|
|
|
|
// Check for:
|
|
// SAVE_LAYER
|
|
// DRAW_BITMAP_RECT_TO_RECT
|
|
// RESTORE
|
|
// where the saveLayer's color can be moved into the drawBitmapRect
|
|
static bool check_0(const SkTDArray<SkDrawCommand*>& commands, int curCommand) {
|
|
if (SAVE_LAYER != commands[curCommand]->getType() ||
|
|
commands.count() <= curCommand+2 ||
|
|
DRAW_BITMAP_RECT_TO_RECT != commands[curCommand+1]->getType() ||
|
|
RESTORE != commands[curCommand+2]->getType())
|
|
return false;
|
|
|
|
SaveLayer* saveLayer = (SaveLayer*) commands[curCommand];
|
|
DrawBitmapRect* dbmr = (DrawBitmapRect*) commands[curCommand+1];
|
|
|
|
const SkPaint* saveLayerPaint = saveLayer->paint();
|
|
SkPaint* dbmrPaint = dbmr->paint();
|
|
|
|
// For this optimization we only fold the saveLayer and drawBitmapRect
|
|
// together if the saveLayer's draw is simple (i.e., no fancy effects) and
|
|
// and the only difference in the colors is that the saveLayer's can have
|
|
// an alpha while the drawBitmapRect's is opaque.
|
|
// TODO: it should be possible to fold them together even if they both
|
|
// have different non-255 alphas but this is low priority since we have
|
|
// never seen that case
|
|
// If either operation lacks a paint then the collapse is trivial
|
|
SkColor layerColor = saveLayerPaint->getColor() | 0xFF000000; // force opaque
|
|
|
|
return NULL == saveLayerPaint ||
|
|
NULL == dbmrPaint ||
|
|
(is_simple(*saveLayerPaint) && dbmrPaint->getColor() == layerColor);
|
|
}
|
|
|
|
// Fold the saveLayer's alpha into the drawBitmapRect and remove the saveLayer
|
|
// and restore
|
|
static void apply_0(const SkTDArray<SkDrawCommand*>& commands, int curCommand) {
|
|
SaveLayer* saveLayer = (SaveLayer*) commands[curCommand];
|
|
DrawBitmapRect* dbmr = (DrawBitmapRect*) commands[curCommand+1];
|
|
Restore* restore = (Restore*) commands[curCommand+2];
|
|
|
|
const SkPaint* saveLayerPaint = saveLayer->paint();
|
|
SkPaint* dbmrPaint = dbmr->paint();
|
|
|
|
if (NULL == saveLayerPaint) {
|
|
saveLayer->setVisible(false);
|
|
restore->setVisible(false);
|
|
} else if (NULL == dbmrPaint) {
|
|
saveLayer->setVisible(false);
|
|
dbmr->setPaint(*saveLayerPaint);
|
|
restore->setVisible(false);
|
|
} else {
|
|
saveLayer->setVisible(false);
|
|
SkColor newColor = SkColorSetA(dbmrPaint->getColor(),
|
|
SkColorGetA(saveLayerPaint->getColor()));
|
|
dbmrPaint->setColor(newColor);
|
|
restore->setVisible(false);
|
|
}
|
|
}
|
|
|
|
// Check for:
|
|
// SAVE_LAYER
|
|
// SAVE
|
|
// CLIP_RECT
|
|
// DRAW_BITMAP_RECT_TO_RECT
|
|
// RESTORE
|
|
// RESTORE
|
|
// where the saveLayer's color can be moved into the drawBitmapRect
|
|
static bool check_1(const SkTDArray<SkDrawCommand*>& commands, int curCommand) {
|
|
if (SAVE_LAYER != commands[curCommand]->getType() ||
|
|
commands.count() <= curCommand+5 ||
|
|
SAVE != commands[curCommand+1]->getType() ||
|
|
CLIP_RECT != commands[curCommand+2]->getType() ||
|
|
DRAW_BITMAP_RECT_TO_RECT != commands[curCommand+3]->getType() ||
|
|
RESTORE != commands[curCommand+4]->getType() ||
|
|
RESTORE != commands[curCommand+5]->getType())
|
|
return false;
|
|
|
|
SaveLayer* saveLayer = (SaveLayer*) commands[curCommand];
|
|
DrawBitmapRect* dbmr = (DrawBitmapRect*) commands[curCommand+3];
|
|
|
|
const SkPaint* saveLayerPaint = saveLayer->paint();
|
|
SkPaint* dbmrPaint = dbmr->paint();
|
|
|
|
// For this optimization we only fold the saveLayer and drawBitmapRect
|
|
// together if the saveLayer's draw is simple (i.e., no fancy effects) and
|
|
// and the only difference in the colors is that the saveLayer's can have
|
|
// an alpha while the drawBitmapRect's is opaque.
|
|
// TODO: it should be possible to fold them together even if they both
|
|
// have different non-255 alphas but this is low priority since we have
|
|
// never seen that case
|
|
// If either operation lacks a paint then the collapse is trivial
|
|
SkColor layerColor = saveLayerPaint->getColor() | 0xFF000000; // force opaque
|
|
|
|
return NULL == saveLayerPaint ||
|
|
NULL == dbmrPaint ||
|
|
(is_simple(*saveLayerPaint) && dbmrPaint->getColor() == layerColor);
|
|
}
|
|
|
|
// Fold the saveLayer's alpha into the drawBitmapRect and remove the saveLayer
|
|
// and restore
|
|
static void apply_1(const SkTDArray<SkDrawCommand*>& commands, int curCommand) {
|
|
SaveLayer* saveLayer = (SaveLayer*) commands[curCommand];
|
|
DrawBitmapRect* dbmr = (DrawBitmapRect*) commands[curCommand+3];
|
|
Restore* restore = (Restore*) commands[curCommand+5];
|
|
|
|
const SkPaint* saveLayerPaint = saveLayer->paint();
|
|
SkPaint* dbmrPaint = dbmr->paint();
|
|
|
|
if (NULL == saveLayerPaint) {
|
|
saveLayer->setVisible(false);
|
|
restore->setVisible(false);
|
|
} else if (NULL == dbmrPaint) {
|
|
saveLayer->setVisible(false);
|
|
dbmr->setPaint(*saveLayerPaint);
|
|
restore->setVisible(false);
|
|
} else {
|
|
saveLayer->setVisible(false);
|
|
SkColor newColor = SkColorSetA(dbmrPaint->getColor(),
|
|
SkColorGetA(saveLayerPaint->getColor()));
|
|
dbmrPaint->setColor(newColor);
|
|
restore->setVisible(false);
|
|
}
|
|
}
|
|
|
|
typedef bool (*PFCheck)(const SkTDArray<SkDrawCommand*>& commands, int curCommand);
|
|
typedef void (*PFApply)(const SkTDArray<SkDrawCommand*>& commands, int curCommand);
|
|
|
|
struct OptTableEntry {
|
|
PFCheck fCheck;
|
|
PFApply fApply;
|
|
int fNumTimesApplied;
|
|
} gOptTable[] = {
|
|
{ check_0, apply_0, 0 },
|
|
{ check_1, apply_1, 0 },
|
|
};
|
|
|
|
static int filter_picture(const SkString& inFile, const SkString& outFile) {
|
|
SkPicture* inPicture = NULL;
|
|
|
|
SkFILEStream inStream(inFile.c_str());
|
|
if (inStream.isValid()) {
|
|
inPicture = SkNEW_ARGS(SkPicture, (&inStream, NULL, &SkImageDecoder::DecodeMemory));
|
|
}
|
|
|
|
if (NULL == inPicture) {
|
|
SkDebugf("Could not read file %s\n", inFile.c_str());
|
|
return -1;
|
|
}
|
|
|
|
int localCount[SK_ARRAY_COUNT(gOptTable)];
|
|
|
|
memset(localCount, 0, sizeof(localCount));
|
|
|
|
SkDebugCanvas debugCanvas(inPicture->width(), inPicture->height());
|
|
debugCanvas.setBounds(inPicture->width(), inPicture->height());
|
|
inPicture->draw(&debugCanvas);
|
|
|
|
const SkTDArray<SkDrawCommand*>& commands = debugCanvas.getDrawCommands();
|
|
|
|
// hide the initial save and restore since replaying the commands will
|
|
// re-add them
|
|
if (commands.count() > 0) {
|
|
commands[0]->setVisible(false);
|
|
commands[commands.count()-1]->setVisible(false);
|
|
}
|
|
|
|
for (int i = 0; i < commands.count(); ++i) {
|
|
for (size_t opt = 0; opt < SK_ARRAY_COUNT(gOptTable); ++opt) {
|
|
if ((*gOptTable[opt].fCheck)(commands, i)) {
|
|
(*gOptTable[opt].fApply)(commands, i);
|
|
++gOptTable[opt].fNumTimesApplied;
|
|
++localCount[opt];
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!outFile.isEmpty()) {
|
|
SkPicture outPicture;
|
|
|
|
SkCanvas* canvas = outPicture.beginRecording(inPicture->width(), inPicture->height());
|
|
debugCanvas.draw(canvas);
|
|
outPicture.endRecording();
|
|
|
|
SkFILEWStream outStream(outFile.c_str());
|
|
|
|
outPicture.serialize(&outStream);
|
|
}
|
|
|
|
bool someOptFired = false;
|
|
for (size_t opt = 0; opt < SK_ARRAY_COUNT(gOptTable); ++opt) {
|
|
if (0 != localCount[opt]) {
|
|
SkDebugf("%d: %d ", opt, localCount[opt]);
|
|
someOptFired = true;
|
|
}
|
|
}
|
|
|
|
if (!someOptFired) {
|
|
SkDebugf("No opts fired\n");
|
|
} else {
|
|
SkDebugf("\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
// This function is not marked as 'static' so it can be referenced externally
|
|
// in the iOS build.
|
|
int tool_main(int argc, char** argv); // suppress a warning on mac
|
|
|
|
int tool_main(int argc, char** argv) {
|
|
SkGraphics::Init();
|
|
|
|
if (argc < 3) {
|
|
usage();
|
|
return -1;
|
|
}
|
|
|
|
SkString inFile, outFile, inDir, outDir;
|
|
|
|
char* const* stop = argv + argc;
|
|
for (++argv; argv < stop; ++argv) {
|
|
if (strcmp(*argv, "-i") == 0) {
|
|
argv++;
|
|
if (argv < stop && **argv) {
|
|
inFile.set(*argv);
|
|
} else {
|
|
SkDebugf("missing arg for -i\n");
|
|
usage();
|
|
return -1;
|
|
}
|
|
} else if (strcmp(*argv, "--input-dir") == 0) {
|
|
argv++;
|
|
if (argv < stop && **argv) {
|
|
inDir.set(*argv);
|
|
} else {
|
|
SkDebugf("missing arg for --input-dir\n");
|
|
usage();
|
|
return -1;
|
|
}
|
|
} else if (strcmp(*argv, "--output-dir") == 0) {
|
|
argv++;
|
|
if (argv < stop && **argv) {
|
|
outDir.set(*argv);
|
|
} else {
|
|
SkDebugf("missing arg for --output-dir\n");
|
|
usage();
|
|
return -1;
|
|
}
|
|
} else if (strcmp(*argv, "-o") == 0) {
|
|
argv++;
|
|
if (argv < stop && **argv) {
|
|
outFile.set(*argv);
|
|
} else {
|
|
SkDebugf("missing arg for -o\n");
|
|
usage();
|
|
return -1;
|
|
}
|
|
} else if (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0) {
|
|
usage();
|
|
return 0;
|
|
} else {
|
|
SkDebugf("unknown arg %s\n", *argv);
|
|
usage();
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
SkOSFile::Iter iter(inDir.c_str(), "skp");
|
|
|
|
SkString inputFilename, outputFilename;
|
|
if (iter.next(&inputFilename)) {
|
|
|
|
do {
|
|
sk_tools::make_filepath(&inFile, inDir, inputFilename);
|
|
if (!outDir.isEmpty()) {
|
|
sk_tools::make_filepath(&outFile, outDir, inputFilename);
|
|
}
|
|
SkDebugf("Executing %s\n", inputFilename.c_str());
|
|
filter_picture(inFile, outFile);
|
|
} while(iter.next(&inputFilename));
|
|
|
|
} else if (!inFile.isEmpty()) {
|
|
filter_picture(inFile, outFile);
|
|
} else {
|
|
usage();
|
|
return -1;
|
|
}
|
|
|
|
for (size_t opt = 0; opt < SK_ARRAY_COUNT(gOptTable); ++opt) {
|
|
SkDebugf("opt %d: %d\n", opt, gOptTable[opt].fNumTimesApplied);
|
|
}
|
|
|
|
SkGraphics::Term();
|
|
return 0;
|
|
}
|
|
|
|
#if !defined SK_BUILD_FOR_IOS
|
|
int main(int argc, char * const argv[]) {
|
|
return tool_main(argc, (char**) argv);
|
|
}
|
|
#endif
|