5a2e50edc5
This reverts commitcd284c5323. Reason for revert: assert fired in SkMallocPixelRef.cpp:61: fatal error: "assert(info.computeByteSize(rowBytes) == info.getSafeSize(rowBytes))" google3 thinks it was from surface_rowbytes Original change's description: > Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"" > > This reverts commit809cbedd4b. > > Bug: skia: > Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d > Reviewed-on: https://skia-review.googlesource.com/52665 > Commit-Queue: Mike Reed <reed@google.com> > Reviewed-by: Florin Malita <fmalita@chromium.org> TBR=fmalita@chromium.org,reed@google.com Change-Id: I41e3f7a3f791cc8183291847e783ed8a53bc91d2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/53802 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
57 lines
1.8 KiB
C++
57 lines
1.8 KiB
C++
/*
|
|
* 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 "AndroidCodecBench.h"
|
|
#include "CodecBenchPriv.h"
|
|
#include "SkBitmap.h"
|
|
#include "SkAndroidCodec.h"
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkOSFile.h"
|
|
|
|
AndroidCodecBench::AndroidCodecBench(SkString baseName, SkData* encoded, int sampleSize)
|
|
: fData(SkRef(encoded))
|
|
, fSampleSize(sampleSize)
|
|
{
|
|
// Parse filename and the color type to give the benchmark a useful name
|
|
fName.printf("AndroidCodec_%s_SampleSize%d", baseName.c_str(), sampleSize);
|
|
}
|
|
|
|
const char* AndroidCodecBench::onGetName() {
|
|
return fName.c_str();
|
|
}
|
|
|
|
bool AndroidCodecBench::isSuitableFor(Backend backend) {
|
|
return kNonRendering_Backend == backend;
|
|
}
|
|
|
|
void AndroidCodecBench::onDelayedSetup() {
|
|
std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::MakeFromData(fData));
|
|
SkISize scaledSize = codec->getSampledDimensions(fSampleSize);
|
|
|
|
fInfo = codec->getInfo().makeWH(scaledSize.width(), scaledSize.height())
|
|
.makeColorType(kN32_SkColorType);
|
|
if (kUnpremul_SkAlphaType == fInfo.alphaType()) {
|
|
fInfo = fInfo.makeAlphaType(kPremul_SkAlphaType);
|
|
}
|
|
|
|
fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes()));
|
|
}
|
|
|
|
void AndroidCodecBench::onDraw(int n, SkCanvas* canvas) {
|
|
std::unique_ptr<SkAndroidCodec> codec;
|
|
SkAndroidCodec::AndroidOptions options;
|
|
options.fSampleSize = fSampleSize;
|
|
for (int i = 0; i < n; i++) {
|
|
codec = SkAndroidCodec::MakeFromData(fData);
|
|
#ifdef SK_DEBUG
|
|
const SkCodec::Result result =
|
|
#endif
|
|
codec->getAndroidPixels(fInfo, fPixelStorage.get(), fInfo.minRowBytes(), &options);
|
|
SkASSERT(result == SkCodec::kSuccess || result == SkCodec::kIncompleteInput);
|
|
}
|
|
}
|