2015-03-27 19:16:53 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2015 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "Resources.h"
|
2015-10-21 17:27:10 +00:00
|
|
|
#include "SkAndroidCodec.h"
|
2015-03-27 19:16:53 +00:00
|
|
|
#include "SkBitmap.h"
|
|
|
|
#include "SkCodec.h"
|
2015-10-09 18:07:34 +00:00
|
|
|
#include "SkData.h"
|
2015-03-27 19:16:53 +00:00
|
|
|
#include "SkMD5.h"
|
2015-07-22 14:16:20 +00:00
|
|
|
#include "SkRandom.h"
|
2015-03-27 19:16:53 +00:00
|
|
|
#include "Test.h"
|
|
|
|
|
|
|
|
static SkStreamAsset* resource(const char path[]) {
|
|
|
|
SkString fullPath = GetResourcePath(path);
|
|
|
|
return SkStream::NewFromFile(fullPath.c_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
static void md5(const SkBitmap& bm, SkMD5::Digest* digest) {
|
|
|
|
SkAutoLockPixels autoLockPixels(bm);
|
|
|
|
SkASSERT(bm.getPixels());
|
|
|
|
SkMD5 md5;
|
|
|
|
size_t rowLen = bm.info().bytesPerPixel() * bm.width();
|
|
|
|
for (int y = 0; y < bm.height(); ++y) {
|
|
|
|
md5.update(static_cast<uint8_t*>(bm.getAddr(0, y)), rowLen);
|
|
|
|
}
|
|
|
|
md5.finish(*digest);
|
|
|
|
}
|
|
|
|
|
Allow creating multiple scanline decoders.
Make getScanlineDecoder return a new object each time, which is
owned by the caller, and independent from any existing scanline
decoders and the SkCodec itself.
Since the SkCodec already contains the entire state machine, and it
is used by the scanline decoders, simply create a new SkCodec which
is now owned by the scanline decoder.
Move code that cleans up after using a scanline decoder into its
destructor
One side effect is that creating the first scanline decoder requires
a duplication of the stream and re-reading the header. (With some
more complexity/changes, we could pass the state machine to the
scanline decoder and make the SkCodec recreate its own state machine
instead.) The typical client of the scanline decoder (region decoder)
uses an SkMemoryStream, so the duplication is cheap, although we
should consider the extra time to reread the header/recreate the state
machine. (If/when we use the scanline decoder for other purposes,
where the stream may not be cheaply duplicated, we should consider
passing the state machine.)
One (intended) result of this change is that a client can create a
new scanline decoder in a new thread, and decode different pieces of
the image simultaneously.
In SkPngCodec::decodePalette, use fBitDepth rather than a parameter.
Review URL: https://codereview.chromium.org/1230033004
2015-07-10 19:07:02 +00:00
|
|
|
/**
|
|
|
|
* Compute the digest for bm and compare it to a known good digest.
|
|
|
|
* @param r Reporter to assert that bm's digest matches goodDigest.
|
|
|
|
* @param goodDigest The known good digest to compare to.
|
|
|
|
* @param bm The bitmap to test.
|
|
|
|
*/
|
|
|
|
static void compare_to_good_digest(skiatest::Reporter* r, const SkMD5::Digest& goodDigest,
|
|
|
|
const SkBitmap& bm) {
|
|
|
|
SkMD5::Digest digest;
|
|
|
|
md5(bm, &digest);
|
|
|
|
REPORTER_ASSERT(r, digest == goodDigest);
|
|
|
|
}
|
|
|
|
|
2015-08-12 15:31:44 +00:00
|
|
|
/**
|
|
|
|
* Test decoding an SkCodec to a particular SkImageInfo.
|
|
|
|
*
|
2015-08-27 14:41:13 +00:00
|
|
|
* Calling getPixels(info) should return expectedResult, and if goodDigest is non nullptr,
|
2015-08-12 15:31:44 +00:00
|
|
|
* the resulting decode should match.
|
|
|
|
*/
|
|
|
|
static void test_info(skiatest::Reporter* r, SkCodec* codec, const SkImageInfo& info,
|
|
|
|
SkCodec::Result expectedResult, const SkMD5::Digest* goodDigest) {
|
|
|
|
SkBitmap bm;
|
|
|
|
bm.allocPixels(info);
|
|
|
|
SkAutoLockPixels autoLockPixels(bm);
|
|
|
|
|
|
|
|
SkCodec::Result result = codec->getPixels(info, bm.getPixels(), bm.rowBytes());
|
|
|
|
REPORTER_ASSERT(r, result == expectedResult);
|
|
|
|
|
|
|
|
if (goodDigest) {
|
|
|
|
compare_to_good_digest(r, *goodDigest, bm);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-21 17:27:10 +00:00
|
|
|
static void test_android_info(skiatest::Reporter* r, SkAndroidCodec* codec, const SkImageInfo& info,
|
|
|
|
SkCodec::Result expectedResult, const SkMD5::Digest* goodDigest) {
|
|
|
|
SkBitmap bm;
|
|
|
|
bm.allocPixels(info);
|
|
|
|
SkAutoLockPixels autoLockPixels(bm);
|
|
|
|
|
|
|
|
SkCodec::Result result = codec->getAndroidPixels(info, bm.getPixels(), bm.rowBytes());
|
|
|
|
REPORTER_ASSERT(r, result == expectedResult);
|
|
|
|
|
|
|
|
if (goodDigest) {
|
|
|
|
compare_to_good_digest(r, *goodDigest, bm);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-22 14:16:20 +00:00
|
|
|
SkIRect generate_random_subset(SkRandom* rand, int w, int h) {
|
|
|
|
SkIRect rect;
|
|
|
|
do {
|
|
|
|
rect.fLeft = rand->nextRangeU(0, w);
|
|
|
|
rect.fTop = rand->nextRangeU(0, h);
|
|
|
|
rect.fRight = rand->nextRangeU(0, w);
|
|
|
|
rect.fBottom = rand->nextRangeU(0, h);
|
|
|
|
rect.sort();
|
|
|
|
} while (rect.isEmpty());
|
|
|
|
return rect;
|
|
|
|
}
|
|
|
|
|
2015-10-05 21:20:27 +00:00
|
|
|
static void test_codec(skiatest::Reporter* r, SkCodec* codec, SkBitmap& bm, const SkImageInfo& info,
|
2015-10-27 15:14:46 +00:00
|
|
|
const SkISize& size, SkCodec::Result expectedResult, SkMD5::Digest* digest,
|
|
|
|
const SkMD5::Digest* goodDigest) {
|
2015-10-09 18:07:34 +00:00
|
|
|
|
2015-03-27 19:16:53 +00:00
|
|
|
REPORTER_ASSERT(r, info.dimensions() == size);
|
|
|
|
bm.allocPixels(info);
|
|
|
|
SkAutoLockPixels autoLockPixels(bm);
|
2015-10-05 21:20:27 +00:00
|
|
|
|
|
|
|
SkCodec::Result result = codec->getPixels(info, bm.getPixels(), bm.rowBytes());
|
2015-10-09 18:07:34 +00:00
|
|
|
REPORTER_ASSERT(r, result == expectedResult);
|
2015-03-27 19:16:53 +00:00
|
|
|
|
2015-10-05 21:20:27 +00:00
|
|
|
md5(bm, digest);
|
|
|
|
if (goodDigest) {
|
|
|
|
REPORTER_ASSERT(r, *digest == *goodDigest);
|
|
|
|
}
|
2015-03-27 19:16:53 +00:00
|
|
|
|
2015-09-18 19:06:04 +00:00
|
|
|
{
|
|
|
|
// Test decoding to 565
|
|
|
|
SkImageInfo info565 = info.makeColorType(kRGB_565_SkColorType);
|
2015-10-27 15:14:46 +00:00
|
|
|
SkCodec::Result expected565 = info.alphaType() == kOpaque_SkAlphaType ?
|
2015-10-09 18:07:34 +00:00
|
|
|
expectedResult : SkCodec::kInvalidConversion;
|
|
|
|
test_info(r, codec, info565, expected565, nullptr);
|
2015-09-18 19:06:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that re-decoding gives the same result. It is interesting to check this after
|
|
|
|
// a decode to 565, since choosing to decode to 565 may result in some of the decode
|
|
|
|
// options being modified. These options should return to their defaults on another
|
|
|
|
// decode to kN32, so the new digest should match the old digest.
|
2015-10-09 18:07:34 +00:00
|
|
|
test_info(r, codec, info, expectedResult, digest);
|
2015-03-27 19:16:53 +00:00
|
|
|
|
2015-08-12 15:31:44 +00:00
|
|
|
{
|
|
|
|
// Check alpha type conversions
|
|
|
|
if (info.alphaType() == kOpaque_SkAlphaType) {
|
|
|
|
test_info(r, codec, info.makeAlphaType(kUnpremul_SkAlphaType),
|
2015-08-27 14:41:13 +00:00
|
|
|
SkCodec::kInvalidConversion, nullptr);
|
2015-08-12 15:31:44 +00:00
|
|
|
test_info(r, codec, info.makeAlphaType(kPremul_SkAlphaType),
|
2015-08-27 14:41:13 +00:00
|
|
|
SkCodec::kInvalidConversion, nullptr);
|
2015-08-12 15:31:44 +00:00
|
|
|
} else {
|
|
|
|
// Decoding to opaque should fail
|
|
|
|
test_info(r, codec, info.makeAlphaType(kOpaque_SkAlphaType),
|
2015-08-27 14:41:13 +00:00
|
|
|
SkCodec::kInvalidConversion, nullptr);
|
2015-08-12 15:31:44 +00:00
|
|
|
SkAlphaType otherAt = info.alphaType();
|
|
|
|
if (kPremul_SkAlphaType == otherAt) {
|
|
|
|
otherAt = kUnpremul_SkAlphaType;
|
|
|
|
} else {
|
|
|
|
otherAt = kPremul_SkAlphaType;
|
|
|
|
}
|
|
|
|
// The other non-opaque alpha type should always succeed, but not match.
|
2015-10-09 18:07:34 +00:00
|
|
|
test_info(r, codec, info.makeAlphaType(otherAt), expectedResult, nullptr);
|
2015-08-12 15:31:44 +00:00
|
|
|
}
|
|
|
|
}
|
2015-10-05 21:20:27 +00:00
|
|
|
}
|
2015-03-27 19:16:53 +00:00
|
|
|
|
2015-10-21 17:27:10 +00:00
|
|
|
static void test_android_codec(skiatest::Reporter* r, SkAndroidCodec* codec, SkBitmap& bm,
|
2015-10-27 15:14:46 +00:00
|
|
|
const SkImageInfo& info, const SkISize& size, SkCodec::Result expectedResult,
|
|
|
|
SkMD5::Digest* digest, const SkMD5::Digest* goodDigest) {
|
2015-10-21 17:27:10 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(r, info.dimensions() == size);
|
|
|
|
bm.allocPixels(info);
|
|
|
|
SkAutoLockPixels autoLockPixels(bm);
|
|
|
|
|
|
|
|
SkCodec::Result result = codec->getAndroidPixels(info, bm.getPixels(), bm.rowBytes());
|
|
|
|
REPORTER_ASSERT(r, result == expectedResult);
|
|
|
|
|
|
|
|
md5(bm, digest);
|
|
|
|
if (goodDigest) {
|
|
|
|
REPORTER_ASSERT(r, *digest == *goodDigest);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
// Test decoding to 565
|
|
|
|
SkImageInfo info565 = info.makeColorType(kRGB_565_SkColorType);
|
2015-10-27 15:14:46 +00:00
|
|
|
SkCodec::Result expected565 = info.alphaType() == kOpaque_SkAlphaType ?
|
2015-10-21 17:27:10 +00:00
|
|
|
expectedResult : SkCodec::kInvalidConversion;
|
|
|
|
test_android_info(r, codec, info565, expected565, nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that re-decoding gives the same result. It is interesting to check this after
|
|
|
|
// a decode to 565, since choosing to decode to 565 may result in some of the decode
|
|
|
|
// options being modified. These options should return to their defaults on another
|
|
|
|
// decode to kN32, so the new digest should match the old digest.
|
|
|
|
test_android_info(r, codec, info, expectedResult, digest);
|
|
|
|
|
|
|
|
{
|
|
|
|
// Check alpha type conversions
|
|
|
|
if (info.alphaType() == kOpaque_SkAlphaType) {
|
|
|
|
test_android_info(r, codec, info.makeAlphaType(kUnpremul_SkAlphaType),
|
|
|
|
SkCodec::kInvalidConversion, nullptr);
|
|
|
|
test_android_info(r, codec, info.makeAlphaType(kPremul_SkAlphaType),
|
|
|
|
SkCodec::kInvalidConversion, nullptr);
|
|
|
|
} else {
|
|
|
|
// Decoding to opaque should fail
|
|
|
|
test_android_info(r, codec, info.makeAlphaType(kOpaque_SkAlphaType),
|
|
|
|
SkCodec::kInvalidConversion, nullptr);
|
|
|
|
SkAlphaType otherAt = info.alphaType();
|
|
|
|
if (kPremul_SkAlphaType == otherAt) {
|
|
|
|
otherAt = kUnpremul_SkAlphaType;
|
|
|
|
} else {
|
|
|
|
otherAt = kPremul_SkAlphaType;
|
|
|
|
}
|
|
|
|
// The other non-opaque alpha type should always succeed, but not match.
|
|
|
|
test_android_info(r, codec, info.makeAlphaType(otherAt), expectedResult, nullptr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-09 15:40:59 +00:00
|
|
|
// FIXME: SkScaledCodec is currently only supported for types used by BRD
|
|
|
|
// skbug.com/4428
|
|
|
|
static bool supports_scaled_codec(const char path[]) {
|
|
|
|
static const char* const exts[] = {
|
|
|
|
"jpg", "jpeg", "png", "webp"
|
|
|
|
"JPG", "JPEG", "PNG", "WEBP"
|
|
|
|
};
|
|
|
|
|
|
|
|
for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
|
|
|
|
if (SkStrEndsWith(path, exts[i])) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-10-05 21:20:27 +00:00
|
|
|
static void check(skiatest::Reporter* r,
|
|
|
|
const char path[],
|
|
|
|
SkISize size,
|
|
|
|
bool supportsScanlineDecoding,
|
|
|
|
bool supportsSubsetDecoding,
|
2015-10-09 18:07:34 +00:00
|
|
|
bool supportsIncomplete = true) {
|
2015-04-01 18:25:20 +00:00
|
|
|
|
2015-10-05 21:20:27 +00:00
|
|
|
SkAutoTDelete<SkStream> stream(resource(path));
|
|
|
|
if (!stream) {
|
|
|
|
SkDebugf("Missing resource '%s'\n", path);
|
|
|
|
return;
|
|
|
|
}
|
2015-10-09 18:07:34 +00:00
|
|
|
|
|
|
|
SkAutoTDelete<SkCodec> codec(nullptr);
|
|
|
|
bool isIncomplete = supportsIncomplete;
|
|
|
|
if (isIncomplete) {
|
|
|
|
size_t size = stream->getLength();
|
|
|
|
SkAutoTUnref<SkData> data((SkData::NewFromStream(stream, 2 * size / 3)));
|
|
|
|
codec.reset(SkCodec::NewFromData(data));
|
|
|
|
} else {
|
|
|
|
codec.reset(SkCodec::NewFromStream(stream.detach()));
|
|
|
|
}
|
2015-10-05 21:20:27 +00:00
|
|
|
if (!codec) {
|
|
|
|
ERRORF(r, "Unable to decode '%s'", path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Test full image decodes with SkCodec
|
|
|
|
SkMD5::Digest codecDigest;
|
|
|
|
SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);
|
|
|
|
SkBitmap bm;
|
2015-10-09 18:07:34 +00:00
|
|
|
SkCodec::Result expectedResult = isIncomplete ? SkCodec::kIncompleteInput : SkCodec::kSuccess;
|
2015-10-27 15:14:46 +00:00
|
|
|
test_codec(r, codec, bm, info, size, expectedResult, &codecDigest, nullptr);
|
2015-10-05 21:20:27 +00:00
|
|
|
|
|
|
|
// Scanline decoding follows.
|
|
|
|
// Need to call startScanlineDecode() first.
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, codec->getScanlines(bm.getAddr(0, 0), 1, 0)
|
2015-10-09 18:07:34 +00:00
|
|
|
== 0);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, codec->skipScanlines(1)
|
2015-10-09 18:07:34 +00:00
|
|
|
== 0);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
|
|
|
|
const SkCodec::Result startResult = codec->startScanlineDecode(info);
|
2015-04-01 18:25:20 +00:00
|
|
|
if (supportsScanlineDecoding) {
|
|
|
|
bm.eraseColor(SK_ColorYELLOW);
|
2015-07-01 13:50:35 +00:00
|
|
|
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, startResult == SkCodec::kSuccess);
|
Allow creating multiple scanline decoders.
Make getScanlineDecoder return a new object each time, which is
owned by the caller, and independent from any existing scanline
decoders and the SkCodec itself.
Since the SkCodec already contains the entire state machine, and it
is used by the scanline decoders, simply create a new SkCodec which
is now owned by the scanline decoder.
Move code that cleans up after using a scanline decoder into its
destructor
One side effect is that creating the first scanline decoder requires
a duplication of the stream and re-reading the header. (With some
more complexity/changes, we could pass the state machine to the
scanline decoder and make the SkCodec recreate its own state machine
instead.) The typical client of the scanline decoder (region decoder)
uses an SkMemoryStream, so the duplication is cheap, although we
should consider the extra time to reread the header/recreate the state
machine. (If/when we use the scanline decoder for other purposes,
where the stream may not be cheaply duplicated, we should consider
passing the state machine.)
One (intended) result of this change is that a client can create a
new scanline decoder in a new thread, and decode different pieces of
the image simultaneously.
In SkPngCodec::decodePalette, use fBitDepth rather than a parameter.
Review URL: https://codereview.chromium.org/1230033004
2015-07-10 19:07:02 +00:00
|
|
|
|
2015-04-01 18:25:20 +00:00
|
|
|
for (int y = 0; y < info.height(); y++) {
|
2015-10-09 18:07:34 +00:00
|
|
|
const int lines = codec->getScanlines(bm.getAddr(0, y), 1, 0);
|
|
|
|
if (!isIncomplete) {
|
|
|
|
REPORTER_ASSERT(r, 1 == lines);
|
|
|
|
}
|
2015-04-01 18:25:20 +00:00
|
|
|
}
|
|
|
|
// verify that scanline decoding gives the same result.
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
if (SkCodec::kTopDown_SkScanlineOrder == codec->getScanlineOrder()) {
|
2015-10-05 21:20:27 +00:00
|
|
|
compare_to_good_digest(r, codecDigest, bm);
|
2015-08-31 13:55:13 +00:00
|
|
|
}
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
|
|
|
|
// Cannot continue to decode scanlines beyond the end
|
|
|
|
REPORTER_ASSERT(r, codec->getScanlines(bm.getAddr(0, 0), 1, 0)
|
2015-10-09 18:07:34 +00:00
|
|
|
== 0);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
|
|
|
|
// Interrupting a scanline decode with a full decode starts from
|
|
|
|
// scratch
|
|
|
|
REPORTER_ASSERT(r, codec->startScanlineDecode(info) == SkCodec::kSuccess);
|
2015-10-09 18:07:34 +00:00
|
|
|
const int lines = codec->getScanlines(bm.getAddr(0, 0), 1, 0);
|
|
|
|
if (!isIncomplete) {
|
|
|
|
REPORTER_ASSERT(r, lines == 1);
|
|
|
|
}
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, codec->getPixels(bm.info(), bm.getPixels(), bm.rowBytes())
|
2015-10-09 18:07:34 +00:00
|
|
|
== expectedResult);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, codec->getScanlines(bm.getAddr(0, 0), 1, 0)
|
2015-10-09 18:07:34 +00:00
|
|
|
== 0);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, codec->skipScanlines(1)
|
2015-10-09 18:07:34 +00:00
|
|
|
== 0);
|
2015-10-16 17:54:12 +00:00
|
|
|
|
|
|
|
// Test partial scanline decodes
|
|
|
|
if (supports_scaled_codec(path) && info.width() >= 3) {
|
|
|
|
SkCodec::Options options;
|
|
|
|
int width = info.width();
|
|
|
|
int height = info.height();
|
|
|
|
SkIRect subset = SkIRect::MakeXYWH(2 * (width / 3), 0, width / 3, height);
|
|
|
|
options.fSubset = ⊂
|
|
|
|
|
|
|
|
const SkCodec::Result partialStartResult = codec->startScanlineDecode(info, &options,
|
|
|
|
nullptr, nullptr);
|
|
|
|
REPORTER_ASSERT(r, partialStartResult == SkCodec::kSuccess);
|
|
|
|
|
|
|
|
for (int y = 0; y < height; y++) {
|
|
|
|
const int lines = codec->getScanlines(bm.getAddr(0, y), 1, 0);
|
|
|
|
if (!isIncomplete) {
|
|
|
|
REPORTER_ASSERT(r, 1 == lines);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-04-01 18:25:20 +00:00
|
|
|
} else {
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
REPORTER_ASSERT(r, startResult == SkCodec::kUnimplemented);
|
2015-03-27 19:16:53 +00:00
|
|
|
}
|
2015-07-22 14:16:20 +00:00
|
|
|
|
|
|
|
// The rest of this function tests decoding subsets, and will decode an arbitrary number of
|
|
|
|
// random subsets.
|
|
|
|
// Do not attempt to decode subsets of an image of only once pixel, since there is no
|
|
|
|
// meaningful subset.
|
|
|
|
if (size.width() * size.height() == 1) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
SkRandom rand;
|
|
|
|
SkIRect subset;
|
|
|
|
SkCodec::Options opts;
|
|
|
|
opts.fSubset = ⊂
|
|
|
|
for (int i = 0; i < 5; i++) {
|
|
|
|
subset = generate_random_subset(&rand, size.width(), size.height());
|
|
|
|
SkASSERT(!subset.isEmpty());
|
|
|
|
const bool supported = codec->getValidSubset(&subset);
|
|
|
|
REPORTER_ASSERT(r, supported == supportsSubsetDecoding);
|
|
|
|
|
|
|
|
SkImageInfo subsetInfo = info.makeWH(subset.width(), subset.height());
|
|
|
|
SkBitmap bm;
|
|
|
|
bm.allocPixels(subsetInfo);
|
|
|
|
const SkCodec::Result result = codec->getPixels(bm.info(), bm.getPixels(), bm.rowBytes(),
|
2015-08-27 14:41:13 +00:00
|
|
|
&opts, nullptr, nullptr);
|
2015-07-22 14:16:20 +00:00
|
|
|
|
|
|
|
if (supportsSubsetDecoding) {
|
2015-10-09 18:07:34 +00:00
|
|
|
REPORTER_ASSERT(r, result == expectedResult);
|
2015-07-22 14:16:20 +00:00
|
|
|
// Webp is the only codec that supports subsets, and it will have modified the subset
|
|
|
|
// to have even left/top.
|
|
|
|
REPORTER_ASSERT(r, SkIsAlign2(subset.fLeft) && SkIsAlign2(subset.fTop));
|
|
|
|
} else {
|
|
|
|
// No subsets will work.
|
|
|
|
REPORTER_ASSERT(r, result == SkCodec::kUnimplemented);
|
|
|
|
}
|
|
|
|
}
|
2015-10-05 21:20:27 +00:00
|
|
|
|
|
|
|
// SkScaledCodec tests
|
2015-10-09 15:40:59 +00:00
|
|
|
if ((supportsScanlineDecoding || supportsSubsetDecoding) && supports_scaled_codec(path)) {
|
|
|
|
|
2015-10-05 21:20:27 +00:00
|
|
|
SkAutoTDelete<SkStream> stream(resource(path));
|
|
|
|
if (!stream) {
|
|
|
|
SkDebugf("Missing resource '%s'\n", path);
|
|
|
|
return;
|
|
|
|
}
|
2015-10-09 18:07:34 +00:00
|
|
|
|
2015-10-21 17:27:10 +00:00
|
|
|
SkAutoTDelete<SkAndroidCodec> codec(nullptr);
|
2015-10-09 18:07:34 +00:00
|
|
|
if (isIncomplete) {
|
|
|
|
size_t size = stream->getLength();
|
|
|
|
SkAutoTUnref<SkData> data((SkData::NewFromStream(stream, 2 * size / 3)));
|
2015-10-21 17:27:10 +00:00
|
|
|
codec.reset(SkAndroidCodec::NewFromData(data));
|
2015-10-09 18:07:34 +00:00
|
|
|
} else {
|
2015-10-21 17:27:10 +00:00
|
|
|
codec.reset(SkAndroidCodec::NewFromStream(stream.detach()));
|
2015-10-09 18:07:34 +00:00
|
|
|
}
|
2015-10-05 21:20:27 +00:00
|
|
|
if (!codec) {
|
|
|
|
ERRORF(r, "Unable to decode '%s'", path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
SkBitmap bm;
|
|
|
|
SkMD5::Digest scaledCodecDigest;
|
2015-10-27 15:14:46 +00:00
|
|
|
test_android_codec(r, codec, bm, info, size, expectedResult,
|
2015-10-21 17:27:10 +00:00
|
|
|
&scaledCodecDigest, &codecDigest);
|
2015-10-09 18:07:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// If we've just tested incomplete decodes, let's run the same test again on full decodes.
|
|
|
|
if (isIncomplete) {
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, path, size, supportsScanlineDecoding, supportsSubsetDecoding, false);
|
2015-10-05 21:20:27 +00:00
|
|
|
}
|
2015-03-27 19:16:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(Codec, r) {
|
|
|
|
// WBMP
|
2015-08-05 19:58:26 +00:00
|
|
|
check(r, "mandrill.wbmp", SkISize::Make(512, 512), true, false);
|
2015-03-27 19:16:53 +00:00
|
|
|
|
2015-06-18 19:53:43 +00:00
|
|
|
// WEBP
|
2015-07-22 14:16:20 +00:00
|
|
|
check(r, "baby_tux.webp", SkISize::Make(386, 395), false, true);
|
|
|
|
check(r, "color_wheel.webp", SkISize::Make(128, 128), false, true);
|
|
|
|
check(r, "yellow_rose.webp", SkISize::Make(400, 301), false, true);
|
2015-06-18 19:53:43 +00:00
|
|
|
|
2015-03-27 19:16:53 +00:00
|
|
|
// BMP
|
2015-08-31 13:55:13 +00:00
|
|
|
check(r, "randPixels.bmp", SkISize::Make(8, 8), true, false);
|
2015-03-27 19:16:53 +00:00
|
|
|
|
|
|
|
// ICO
|
2015-10-09 18:07:34 +00:00
|
|
|
// FIXME: We are not ready to test incomplete ICOs
|
2015-04-01 19:09:21 +00:00
|
|
|
// These two tests examine interestingly different behavior:
|
|
|
|
// Decodes an embedded BMP image
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "color_wheel.ico", SkISize::Make(128, 128), false, false, false);
|
2015-04-01 19:09:21 +00:00
|
|
|
// Decodes an embedded PNG image
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "google_chrome.ico", SkISize::Make(256, 256), false, false, false);
|
2015-03-27 19:16:53 +00:00
|
|
|
|
2015-04-09 19:43:10 +00:00
|
|
|
// GIF
|
2015-10-09 18:07:34 +00:00
|
|
|
// FIXME: We are not ready to test incomplete GIFs
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "box.gif", SkISize::Make(200, 55), true, false, false);
|
|
|
|
check(r, "color_wheel.gif", SkISize::Make(128, 128), true, false, false);
|
2015-10-09 18:07:34 +00:00
|
|
|
// randPixels.gif is too small to test incomplete
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "randPixels.gif", SkISize::Make(8, 8), true, false, false);
|
2015-04-09 19:43:10 +00:00
|
|
|
|
2015-04-15 14:32:19 +00:00
|
|
|
// JPG
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "CMYK.jpg", SkISize::Make(642, 516), true, false);
|
2015-07-22 14:16:20 +00:00
|
|
|
check(r, "color_wheel.jpg", SkISize::Make(128, 128), true, false);
|
2015-10-09 18:07:34 +00:00
|
|
|
// grayscale.jpg is too small to test incomplete
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "grayscale.jpg", SkISize::Make(128, 128), true, false, false);
|
2015-07-22 14:16:20 +00:00
|
|
|
check(r, "mandrill_512_q075.jpg", SkISize::Make(512, 512), true, false);
|
2015-10-09 18:07:34 +00:00
|
|
|
// randPixels.jpg is too small to test incomplete
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "randPixels.jpg", SkISize::Make(8, 8), true, false, false);
|
2015-04-15 14:32:19 +00:00
|
|
|
|
2015-03-27 19:16:53 +00:00
|
|
|
// PNG
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "arrow.png", SkISize::Make(187, 312), true, false, false);
|
|
|
|
check(r, "baby_tux.png", SkISize::Make(240, 246), true, false, false);
|
|
|
|
check(r, "color_wheel.png", SkISize::Make(128, 128), true, false, false);
|
|
|
|
check(r, "half-transparent-white-pixel.png", SkISize::Make(1, 1), true, false, false);
|
|
|
|
check(r, "mandrill_128.png", SkISize::Make(128, 128), true, false, false);
|
|
|
|
check(r, "mandrill_16.png", SkISize::Make(16, 16), true, false, false);
|
|
|
|
check(r, "mandrill_256.png", SkISize::Make(256, 256), true, false, false);
|
|
|
|
check(r, "mandrill_32.png", SkISize::Make(32, 32), true, false, false);
|
|
|
|
check(r, "mandrill_512.png", SkISize::Make(512, 512), true, false, false);
|
|
|
|
check(r, "mandrill_64.png", SkISize::Make(64, 64), true, false, false);
|
|
|
|
check(r, "plane.png", SkISize::Make(250, 126), true, false, false);
|
2015-10-09 18:07:34 +00:00
|
|
|
// FIXME: We are not ready to test incomplete interlaced pngs
|
2015-10-27 15:14:46 +00:00
|
|
|
check(r, "plane_interlaced.png", SkISize::Make(250, 126), true, false, false);
|
|
|
|
check(r, "randPixels.png", SkISize::Make(8, 8), true, false, false);
|
|
|
|
check(r, "yellow_rose.png", SkISize::Make(400, 301), true, false, false);
|
2015-03-27 19:16:53 +00:00
|
|
|
}
|
2015-04-03 14:22:22 +00:00
|
|
|
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
// Test interlaced PNG in stripes, similar to DM's kStripe_Mode
|
|
|
|
DEF_TEST(Codec_stripes, r) {
|
|
|
|
const char * path = "plane_interlaced.png";
|
|
|
|
SkAutoTDelete<SkStream> stream(resource(path));
|
|
|
|
if (!stream) {
|
|
|
|
SkDebugf("Missing resource '%s'\n", path);
|
|
|
|
}
|
|
|
|
|
|
|
|
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
|
|
|
|
REPORTER_ASSERT(r, codec);
|
|
|
|
|
|
|
|
if (!codec) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (codec->getScanlineOrder()) {
|
|
|
|
case SkCodec::kBottomUp_SkScanlineOrder:
|
|
|
|
case SkCodec::kOutOfOrder_SkScanlineOrder:
|
|
|
|
ERRORF(r, "This scanline order will not match the original.");
|
|
|
|
return;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Baseline for what the image should look like, using N32.
|
|
|
|
const SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);
|
|
|
|
|
|
|
|
SkBitmap bm;
|
|
|
|
bm.allocPixels(info);
|
|
|
|
SkAutoLockPixels autoLockPixels(bm);
|
|
|
|
SkCodec::Result result = codec->getPixels(info, bm.getPixels(), bm.rowBytes());
|
|
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
|
|
|
|
|
|
SkMD5::Digest digest;
|
|
|
|
md5(bm, &digest);
|
|
|
|
|
|
|
|
// Now decode in stripes
|
|
|
|
const int height = info.height();
|
|
|
|
const int numStripes = 4;
|
|
|
|
int stripeHeight;
|
|
|
|
int remainingLines;
|
|
|
|
SkTDivMod(height, numStripes, &stripeHeight, &remainingLines);
|
|
|
|
|
|
|
|
bm.eraseColor(SK_ColorYELLOW);
|
|
|
|
|
|
|
|
result = codec->startScanlineDecode(info);
|
|
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
|
|
|
|
|
|
// Odd stripes
|
|
|
|
for (int i = 1; i < numStripes; i += 2) {
|
|
|
|
// Skip the even stripes
|
2015-10-09 18:07:34 +00:00
|
|
|
bool skipResult = codec->skipScanlines(stripeHeight);
|
|
|
|
REPORTER_ASSERT(r, skipResult);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
|
2015-10-09 18:07:34 +00:00
|
|
|
int linesDecoded = codec->getScanlines(bm.getAddr(0, i * stripeHeight), stripeHeight,
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
bm.rowBytes());
|
2015-10-09 18:07:34 +00:00
|
|
|
REPORTER_ASSERT(r, linesDecoded == stripeHeight);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Even stripes
|
|
|
|
result = codec->startScanlineDecode(info);
|
|
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
|
|
|
|
|
|
for (int i = 0; i < numStripes; i += 2) {
|
2015-10-09 18:07:34 +00:00
|
|
|
int linesDecoded = codec->getScanlines(bm.getAddr(0, i * stripeHeight), stripeHeight,
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
bm.rowBytes());
|
2015-10-09 18:07:34 +00:00
|
|
|
REPORTER_ASSERT(r, linesDecoded == stripeHeight);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
|
|
|
|
// Skip the odd stripes
|
|
|
|
if (i + 1 < numStripes) {
|
2015-10-09 18:07:34 +00:00
|
|
|
bool skipResult = codec->skipScanlines(stripeHeight);
|
|
|
|
REPORTER_ASSERT(r, skipResult);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remainder at the end
|
|
|
|
if (remainingLines > 0) {
|
|
|
|
result = codec->startScanlineDecode(info);
|
|
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
|
|
|
2015-10-09 18:07:34 +00:00
|
|
|
bool skipResult = codec->skipScanlines(height - remainingLines);
|
|
|
|
REPORTER_ASSERT(r, skipResult);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
|
2015-10-09 18:07:34 +00:00
|
|
|
int linesDecoded = codec->getScanlines(bm.getAddr(0, height - remainingLines),
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
remainingLines, bm.rowBytes());
|
2015-10-09 18:07:34 +00:00
|
|
|
REPORTER_ASSERT(r, linesDecoded == remainingLines);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
compare_to_good_digest(r, digest, bm);
|
|
|
|
}
|
|
|
|
|
2015-04-03 14:22:22 +00:00
|
|
|
static void test_invalid_stream(skiatest::Reporter* r, const void* stream, size_t len) {
|
2015-10-09 15:40:59 +00:00
|
|
|
// Neither of these calls should return a codec. Bots should catch us if we leaked anything.
|
2015-04-03 14:22:22 +00:00
|
|
|
SkCodec* codec = SkCodec::NewFromStream(new SkMemoryStream(stream, len, false));
|
2015-10-09 15:40:59 +00:00
|
|
|
REPORTER_ASSERT(r, !codec);
|
|
|
|
|
2015-10-21 17:27:10 +00:00
|
|
|
SkAndroidCodec* androidCodec =
|
|
|
|
SkAndroidCodec::NewFromStream(new SkMemoryStream(stream, len, false));
|
|
|
|
REPORTER_ASSERT(r, !androidCodec);
|
2015-04-03 14:22:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Ensure that SkCodec::NewFromStream handles freeing the passed in SkStream,
|
|
|
|
// even on failure. Test some bad streams.
|
|
|
|
DEF_TEST(Codec_leaks, r) {
|
|
|
|
// No codec should claim this as their format, so this tests SkCodec::NewFromStream.
|
|
|
|
const char nonSupportedStream[] = "hello world";
|
|
|
|
// The other strings should look like the beginning of a file type, so we'll call some
|
|
|
|
// internal version of NewFromStream, which must also delete the stream on failure.
|
|
|
|
const unsigned char emptyPng[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
|
|
|
|
const unsigned char emptyJpeg[] = { 0xFF, 0xD8, 0xFF };
|
|
|
|
const char emptyWebp[] = "RIFF1234WEBPVP";
|
|
|
|
const char emptyBmp[] = { 'B', 'M' };
|
|
|
|
const char emptyIco[] = { '\x00', '\x00', '\x01', '\x00' };
|
|
|
|
const char emptyGif[] = "GIFVER";
|
|
|
|
|
|
|
|
test_invalid_stream(r, nonSupportedStream, sizeof(nonSupportedStream));
|
|
|
|
test_invalid_stream(r, emptyPng, sizeof(emptyPng));
|
|
|
|
test_invalid_stream(r, emptyJpeg, sizeof(emptyJpeg));
|
|
|
|
test_invalid_stream(r, emptyWebp, sizeof(emptyWebp));
|
|
|
|
test_invalid_stream(r, emptyBmp, sizeof(emptyBmp));
|
|
|
|
test_invalid_stream(r, emptyIco, sizeof(emptyIco));
|
|
|
|
test_invalid_stream(r, emptyGif, sizeof(emptyGif));
|
|
|
|
}
|
2015-04-15 14:32:19 +00:00
|
|
|
|
2015-10-09 15:40:59 +00:00
|
|
|
DEF_TEST(Codec_null, r) {
|
|
|
|
// Attempting to create an SkCodec or an SkScaledCodec with null should not
|
|
|
|
// crash.
|
|
|
|
SkCodec* codec = SkCodec::NewFromStream(nullptr);
|
|
|
|
REPORTER_ASSERT(r, !codec);
|
|
|
|
|
2015-10-21 17:27:10 +00:00
|
|
|
SkAndroidCodec* androidCodec = SkAndroidCodec::NewFromStream(nullptr);
|
|
|
|
REPORTER_ASSERT(r, !androidCodec);
|
2015-10-09 15:40:59 +00:00
|
|
|
}
|
|
|
|
|
2015-04-15 14:32:19 +00:00
|
|
|
static void test_dimensions(skiatest::Reporter* r, const char path[]) {
|
|
|
|
// Create the codec from the resource file
|
|
|
|
SkAutoTDelete<SkStream> stream(resource(path));
|
|
|
|
if (!stream) {
|
|
|
|
SkDebugf("Missing resource '%s'\n", path);
|
|
|
|
return;
|
|
|
|
}
|
2015-10-21 17:27:10 +00:00
|
|
|
SkAutoTDelete<SkAndroidCodec> codec(SkAndroidCodec::NewFromStream(stream.detach()));
|
2015-04-15 14:32:19 +00:00
|
|
|
if (!codec) {
|
|
|
|
ERRORF(r, "Unable to create codec '%s'", path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the decode is successful for a variety of scales
|
2015-11-03 15:55:11 +00:00
|
|
|
for (int sampleSize = 1; sampleSize < 32; sampleSize++) {
|
2015-04-15 14:32:19 +00:00
|
|
|
// Scale the output dimensions
|
2015-10-21 17:27:10 +00:00
|
|
|
SkISize scaledDims = codec->getSampledDimensions(sampleSize);
|
2015-08-18 20:22:46 +00:00
|
|
|
SkImageInfo scaledInfo = codec->getInfo()
|
|
|
|
.makeWH(scaledDims.width(), scaledDims.height())
|
|
|
|
.makeColorType(kN32_SkColorType);
|
2015-04-15 14:32:19 +00:00
|
|
|
|
|
|
|
// Set up for the decode
|
|
|
|
size_t rowBytes = scaledDims.width() * sizeof(SkPMColor);
|
|
|
|
size_t totalBytes = scaledInfo.getSafeSize(rowBytes);
|
|
|
|
SkAutoTMalloc<SkPMColor> pixels(totalBytes);
|
|
|
|
|
2015-10-21 17:27:10 +00:00
|
|
|
SkAndroidCodec::AndroidOptions options;
|
|
|
|
options.fSampleSize = sampleSize;
|
SkCodec no longer inherits from SkImageGenerator.
SkImageGenerator makes some assumptions that are not necessarily valid
for SkCodec. For example, SkCodec does not assume that it can always be
rewound.
We also have an ongoing question of what an SkCodec should report as
its default settings (i.e. the return from getInfo). It makes sense for
an SkCodec to report that its pixels are unpremultiplied, if that is
the case for the underlying data, but if a client of SkImageGenerator
uses the default settings (as many do), they will receive
unpremultiplied pixels which cannot (currently) be drawn with Skia. We
may ultimately decide to revisit SkCodec reporting an SkImageInfo, but
I have left it unchanged for now.
Import features of SkImageGenerator used by SkCodec into SkCodec.
I have left SkImageGenerator unchanged for now, but it no longer needs
Result or Options. This will require changes to Chromium.
Manually handle the lifetime of fScanlineDecoder, so SkScanlineDecoder.h
can include SkCodec.h (where Result is), and SkCodec.h does not need
to include it (to delete fScanlineDecoder).
In many places, make the following simple changes:
- Now include SkScanlineDecoder.h, which is no longer included by
SkCodec.h
- Use the enums in SkCodec, rather than SkImageGenerator
- Stop including SkImageGenerator.h where no longer needed
Review URL: https://codereview.chromium.org/1220733013
2015-07-09 15:16:03 +00:00
|
|
|
SkCodec::Result result =
|
2015-10-21 17:27:10 +00:00
|
|
|
codec->getAndroidPixels(scaledInfo, pixels.get(), rowBytes, &options);
|
SkCodec no longer inherits from SkImageGenerator.
SkImageGenerator makes some assumptions that are not necessarily valid
for SkCodec. For example, SkCodec does not assume that it can always be
rewound.
We also have an ongoing question of what an SkCodec should report as
its default settings (i.e. the return from getInfo). It makes sense for
an SkCodec to report that its pixels are unpremultiplied, if that is
the case for the underlying data, but if a client of SkImageGenerator
uses the default settings (as many do), they will receive
unpremultiplied pixels which cannot (currently) be drawn with Skia. We
may ultimately decide to revisit SkCodec reporting an SkImageInfo, but
I have left it unchanged for now.
Import features of SkImageGenerator used by SkCodec into SkCodec.
I have left SkImageGenerator unchanged for now, but it no longer needs
Result or Options. This will require changes to Chromium.
Manually handle the lifetime of fScanlineDecoder, so SkScanlineDecoder.h
can include SkCodec.h (where Result is), and SkCodec.h does not need
to include it (to delete fScanlineDecoder).
In many places, make the following simple changes:
- Now include SkScanlineDecoder.h, which is no longer included by
SkCodec.h
- Use the enums in SkCodec, rather than SkImageGenerator
- Stop including SkImageGenerator.h where no longer needed
Review URL: https://codereview.chromium.org/1220733013
2015-07-09 15:16:03 +00:00
|
|
|
REPORTER_ASSERT(r, SkCodec::kSuccess == result);
|
2015-04-15 14:32:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ensure that onGetScaledDimensions returns valid image dimensions to use for decodes
|
|
|
|
DEF_TEST(Codec_Dimensions, r) {
|
|
|
|
// JPG
|
|
|
|
test_dimensions(r, "CMYK.jpg");
|
|
|
|
test_dimensions(r, "color_wheel.jpg");
|
|
|
|
test_dimensions(r, "grayscale.jpg");
|
|
|
|
test_dimensions(r, "mandrill_512_q075.jpg");
|
|
|
|
test_dimensions(r, "randPixels.jpg");
|
2015-08-18 20:22:46 +00:00
|
|
|
|
|
|
|
// Decoding small images with very large scaling factors is a potential
|
|
|
|
// source of bugs and crashes. We disable these tests in Gold because
|
|
|
|
// tiny images are not very useful to look at.
|
|
|
|
// Here we make sure that we do not crash or access illegal memory when
|
|
|
|
// performing scaled decodes on small images.
|
|
|
|
test_dimensions(r, "1x1.png");
|
|
|
|
test_dimensions(r, "2x2.png");
|
|
|
|
test_dimensions(r, "3x3.png");
|
|
|
|
test_dimensions(r, "3x1.png");
|
|
|
|
test_dimensions(r, "1x1.png");
|
|
|
|
test_dimensions(r, "16x1.png");
|
|
|
|
test_dimensions(r, "1x16.png");
|
|
|
|
test_dimensions(r, "mandrill_16.png");
|
|
|
|
|
2015-04-15 14:32:19 +00:00
|
|
|
}
|
|
|
|
|
2015-08-12 15:08:56 +00:00
|
|
|
static void test_invalid(skiatest::Reporter* r, const char path[]) {
|
2015-04-23 15:53:39 +00:00
|
|
|
SkAutoTDelete<SkStream> stream(resource(path));
|
|
|
|
if (!stream) {
|
|
|
|
SkDebugf("Missing resource '%s'\n", path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(r, nullptr == codec);
|
2015-04-23 15:53:39 +00:00
|
|
|
}
|
2015-04-15 14:32:19 +00:00
|
|
|
|
2015-04-23 15:53:39 +00:00
|
|
|
DEF_TEST(Codec_Empty, r) {
|
|
|
|
// Test images that should not be able to create a codec
|
2015-08-12 15:08:56 +00:00
|
|
|
test_invalid(r, "empty_images/zero-dims.gif");
|
|
|
|
test_invalid(r, "empty_images/zero-embedded.ico");
|
|
|
|
test_invalid(r, "empty_images/zero-width.bmp");
|
|
|
|
test_invalid(r, "empty_images/zero-height.bmp");
|
|
|
|
test_invalid(r, "empty_images/zero-width.jpg");
|
|
|
|
test_invalid(r, "empty_images/zero-height.jpg");
|
|
|
|
test_invalid(r, "empty_images/zero-width.png");
|
|
|
|
test_invalid(r, "empty_images/zero-height.png");
|
|
|
|
test_invalid(r, "empty_images/zero-width.wbmp");
|
|
|
|
test_invalid(r, "empty_images/zero-height.wbmp");
|
|
|
|
// This image is an ico with an embedded mask-bmp. This is illegal.
|
|
|
|
test_invalid(r, "invalid_images/mask-bmp-ico.ico");
|
2015-04-23 15:53:39 +00:00
|
|
|
}
|
2015-08-05 19:58:26 +00:00
|
|
|
|
|
|
|
static void test_invalid_parameters(skiatest::Reporter* r, const char path[]) {
|
|
|
|
SkAutoTDelete<SkStream> stream(resource(path));
|
|
|
|
if (!stream) {
|
|
|
|
SkDebugf("Missing resource '%s'\n", path);
|
|
|
|
return;
|
|
|
|
}
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
SkAutoTDelete<SkCodec> decoder(SkCodec::NewFromStream(stream.detach()));
|
2015-08-05 19:58:26 +00:00
|
|
|
|
|
|
|
// This should return kSuccess because kIndex8 is supported.
|
|
|
|
SkPMColor colorStorage[256];
|
|
|
|
int colorCount;
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
SkCodec::Result result = decoder->startScanlineDecode(
|
2015-08-27 14:41:13 +00:00
|
|
|
decoder->getInfo().makeColorType(kIndex_8_SkColorType), nullptr, colorStorage, &colorCount);
|
2015-08-05 19:58:26 +00:00
|
|
|
REPORTER_ASSERT(r, SkCodec::kSuccess == result);
|
|
|
|
// The rest of the test is uninteresting if kIndex8 is not supported
|
|
|
|
if (SkCodec::kSuccess != result) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This should return kInvalidParameters because, in kIndex_8 mode, we must pass in a valid
|
|
|
|
// colorPtr and a valid colorCountPtr.
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
result = decoder->startScanlineDecode(
|
2015-08-27 14:41:13 +00:00
|
|
|
decoder->getInfo().makeColorType(kIndex_8_SkColorType), nullptr, nullptr, nullptr);
|
2015-08-05 19:58:26 +00:00
|
|
|
REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
|
Merge SkCodec with SkScanlineDecoder
Benefits:
- This mimics other decoding APIs (including the ones SkCodec relies
on, e.g. a png_struct, which can be used to decode an entire image or
one line at a time).
- It allows a client to ask us to do what we can do efficiently - i.e.
start from encoded data and either decode the whole thing or scanlines.
- It removes the duplicate methods which appeared in both SkCodec and
SkScanlineDecoder (some of which, e.g. in SkJpegScanlineDecoder, just
call fCodec->sameMethod()).
- It simplifies moving more checks into the base class (e.g. the
examples in skbug.com/4284).
BUG=skia:4175
BUG=skia:4284
=====================================================================
SkScanlineDecoder.h/.cpp:
Removed.
SkCodec.h/.cpp:
Add methods, enums, and variables which were previously in
SkScanlineDecoder.
Default fCurrScanline to -1, as a sentinel that start has not been
called.
General changes:
Convert SkScanlineDecoders to SkCodecs.
General changes in SkCodec subclasses:
Merge SkScanlineDecoder implementation into SkCodec. Most (all?) owned
an SkCodec, so they now call this-> instead of fCodec->.
SkBmpCodec.h/.cpp:
Replace the unused rowOrder method with an override for
onGetScanlineOrder.
Make getDstRow const, since it is called by onGetY, which is const.
SkCodec_libpng.h/.cpp:
Make SkPngCodec an abstract class, with two subclasses which handle
scanline decoding separately (they share code for decoding the entire
image). Reimplement onReallyHasAlpha so that it can return the most
recent result (e.g. after a scanline decode which only decoded part
of the image) or a better answer (e.g. if the whole image is known to
be opaque).
Compute fNumberPasses early, so we know which subclass to instantiate.
Make SkPngInterlaceScanlineDecoder use the base class' fCurrScanline
rather than a separate variable.
CodexTest.cpp:
Add tests for the state changes in SkCodec (need to call start before
decoding scanlines; calling getPixels means that start will need to
be called again before decoding more scanlines).
Add a test which decodes in stripes, currently only used for an
interlaced PNG.
TODO: Add tests for onReallyHasAlpha.
Review URL: https://codereview.chromium.org/1365313002
2015-09-30 15:57:13 +00:00
|
|
|
result = decoder->startScanlineDecode(
|
2015-08-05 19:58:26 +00:00
|
|
|
decoder->getInfo().makeColorType(kIndex_8_SkColorType));
|
|
|
|
REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(Codec_Params, r) {
|
|
|
|
test_invalid_parameters(r, "index8.png");
|
|
|
|
test_invalid_parameters(r, "mandrill.wbmp");
|
|
|
|
}
|