809cbedd4b
This reverts commit 88757dacd4.
Reason for revert: Still seems to be failing Chromium "telemetry_perf_unittests (with patch) on Android" on android_n5x_swarming_rel.
Original change's description:
> guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
>
> Now with legacy behavior for allocpixels
>
> This was reverted, so the current CL is a "fix" on top of ...
> https://skia-review.googlesource.com/c/skia/+/50980
>
> Related update to Chrome (in preparation for this change)
> https://chromium-review.googlesource.com/c/chromium/src/+/685719
>
> Bug: skia:
> Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
> Reviewed-on: https://skia-review.googlesource.com/51341
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=fmalita@chromium.org,reed@google.com
Change-Id: I827a0ca1d1e3909e648fde3342cdb8601d34da8d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/52381
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@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);
|
|
}
|
|
}
|