0933bc9b67
This reverts commitcca2300559
. Reason for revert: think I guessed wrong about g32 -- unreverting Original change's description: > Revert "resources: remove most uses of GetResourcePath()" > > This reverts commit5093a539de
. > > Reason for revert: google3 seems broken > > Original change's description: > > resources: remove most uses of GetResourcePath() > > > > Going forward, we will standardize on GetResourceAsData(), which will > > make it easier to run tests in environments without access to the > > filesystem. > > > > Also: GetResourceAsData() complains when a resource is missing. > > This is usually an error. > > > > Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188 > > Reviewed-on: https://skia-review.googlesource.com/82642 > > Reviewed-by: Hal Canary <halcanary@google.com> > > Commit-Queue: Hal Canary <halcanary@google.com> > > TBR=halcanary@google.com,scroggo@google.com > > Change-Id: Ic5a7c0167c995a672e6b06dc92abe00564432214 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/83001 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> TBR=halcanary@google.com,scroggo@google.com,reed@google.com Change-Id: I5a46e4de61186a8a5eb9cacd3275e24e311d5a07 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/82942 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
284 lines
11 KiB
C++
284 lines
11 KiB
C++
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "CodecPriv.h"
|
|
#include "Resources.h"
|
|
#include "SkAndroidCodec.h"
|
|
#include "SkBitmap.h"
|
|
#include "SkData.h"
|
|
#include "SkImage.h"
|
|
#include "SkStream.h"
|
|
#include "SkTypes.h"
|
|
#include "Test.h"
|
|
|
|
static unsigned char gGIFData[] = {
|
|
0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x03, 0x00, 0x03, 0x00, 0xe3, 0x08,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00,
|
|
0xff, 0x80, 0x80, 0x80, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
|
|
0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x04,
|
|
0x07, 0x50, 0x1c, 0x43, 0x40, 0x41, 0x23, 0x44, 0x00, 0x3b
|
|
};
|
|
|
|
static unsigned char gGIFDataNoColormap[] = {
|
|
// Header
|
|
0x47, 0x49, 0x46, 0x38, 0x39, 0x61,
|
|
// Screen descriptor
|
|
0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
|
|
// Graphics control extension
|
|
0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00,
|
|
// Image descriptor
|
|
0x2c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
|
|
// Image data
|
|
0x02, 0x02, 0x4c, 0x01, 0x00,
|
|
// Trailer
|
|
0x3b
|
|
};
|
|
|
|
static unsigned char gInterlacedGIF[] = {
|
|
0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x09, 0x00, 0x09, 0x00, 0xe3, 0x08, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x80,
|
|
0x80, 0x80, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00, 0x00,
|
|
0x00, 0x09, 0x00, 0x09, 0x00, 0x40, 0x04, 0x1b, 0x50, 0x1c, 0x23, 0xe9, 0x44,
|
|
0x23, 0x60, 0x9d, 0x09, 0x28, 0x1e, 0xf8, 0x6d, 0x64, 0x56, 0x9d, 0x53, 0xa8,
|
|
0x7e, 0xa8, 0x65, 0x94, 0x5c, 0xb0, 0x8a, 0x45, 0x04, 0x00, 0x3b
|
|
};
|
|
|
|
static void test_gif_data_no_colormap(skiatest::Reporter* r,
|
|
void* data,
|
|
size_t size) {
|
|
SkBitmap bm;
|
|
bool imageDecodeSuccess = decode_memory(data, size, &bm);
|
|
REPORTER_ASSERT(r, imageDecodeSuccess);
|
|
REPORTER_ASSERT(r, bm.width() == 1);
|
|
REPORTER_ASSERT(r, bm.height() == 1);
|
|
REPORTER_ASSERT(r, !(bm.empty()));
|
|
if (!(bm.empty())) {
|
|
REPORTER_ASSERT(r, bm.getColor(0, 0) == 0x00000000);
|
|
}
|
|
}
|
|
static void test_gif_data(skiatest::Reporter* r, void* data, size_t size) {
|
|
SkBitmap bm;
|
|
bool imageDecodeSuccess = decode_memory(data, size, &bm);
|
|
REPORTER_ASSERT(r, imageDecodeSuccess);
|
|
REPORTER_ASSERT(r, bm.width() == 3);
|
|
REPORTER_ASSERT(r, bm.height() == 3);
|
|
REPORTER_ASSERT(r, !(bm.empty()));
|
|
if (!(bm.empty())) {
|
|
REPORTER_ASSERT(r, bm.getColor(0, 0) == 0xffff0000);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 0) == 0xffffff00);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 0) == 0xff00ffff);
|
|
REPORTER_ASSERT(r, bm.getColor(0, 1) == 0xff808080);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 1) == 0xff000000);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 1) == 0xff00ff00);
|
|
REPORTER_ASSERT(r, bm.getColor(0, 2) == 0xffffffff);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 2) == 0xffff00ff);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 2) == 0xff0000ff);
|
|
}
|
|
}
|
|
static void test_gif_data_dims(skiatest::Reporter* r, void* data, size_t size, int width,
|
|
int height) {
|
|
SkBitmap bm;
|
|
bool imageDecodeSuccess = decode_memory(data, size, &bm);
|
|
REPORTER_ASSERT(r, imageDecodeSuccess);
|
|
REPORTER_ASSERT(r, bm.width() == width);
|
|
REPORTER_ASSERT(r, bm.height() == height);
|
|
REPORTER_ASSERT(r, !(bm.empty()));
|
|
}
|
|
static void test_interlaced_gif_data(skiatest::Reporter* r,
|
|
void* data,
|
|
size_t size) {
|
|
SkBitmap bm;
|
|
bool imageDecodeSuccess = decode_memory(data, size, &bm);
|
|
REPORTER_ASSERT(r, imageDecodeSuccess);
|
|
REPORTER_ASSERT(r, bm.width() == 9);
|
|
REPORTER_ASSERT(r, bm.height() == 9);
|
|
REPORTER_ASSERT(r, !(bm.empty()));
|
|
if (!(bm.empty())) {
|
|
REPORTER_ASSERT(r, bm.getColor(0, 0) == 0xffff0000);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 0) == 0xffffff00);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 0) == 0xff00ffff);
|
|
|
|
REPORTER_ASSERT(r, bm.getColor(0, 2) == 0xffffffff);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 2) == 0xffff00ff);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 2) == 0xff0000ff);
|
|
|
|
REPORTER_ASSERT(r, bm.getColor(0, 4) == 0xff808080);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 4) == 0xff000000);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 4) == 0xff00ff00);
|
|
|
|
REPORTER_ASSERT(r, bm.getColor(0, 6) == 0xffff0000);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 6) == 0xffffff00);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 6) == 0xff00ffff);
|
|
|
|
REPORTER_ASSERT(r, bm.getColor(0, 8) == 0xffffffff);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 8) == 0xffff00ff);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 8) == 0xff0000ff);
|
|
}
|
|
}
|
|
|
|
static void test_gif_data_short(skiatest::Reporter* r,
|
|
void* data,
|
|
size_t size) {
|
|
SkBitmap bm;
|
|
bool imageDecodeSuccess = decode_memory(data, size, &bm);
|
|
REPORTER_ASSERT(r, imageDecodeSuccess);
|
|
REPORTER_ASSERT(r, bm.width() == 3);
|
|
REPORTER_ASSERT(r, bm.height() == 3);
|
|
REPORTER_ASSERT(r, !(bm.empty()));
|
|
if (!(bm.empty())) {
|
|
REPORTER_ASSERT(r, bm.getColor(0, 0) == 0xffff0000);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 0) == 0xffffff00);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 0) == 0xff00ffff);
|
|
REPORTER_ASSERT(r, bm.getColor(0, 1) == 0xff808080);
|
|
REPORTER_ASSERT(r, bm.getColor(1, 1) == 0xff000000);
|
|
REPORTER_ASSERT(r, bm.getColor(2, 1) == 0xff00ff00);
|
|
}
|
|
}
|
|
|
|
/**
|
|
This test will test the ability of the SkCodec to deal with
|
|
GIF files which have been mangled somehow. We want to display as
|
|
much of the GIF as possible.
|
|
*/
|
|
DEF_TEST(Gif, reporter) {
|
|
// test perfectly good images.
|
|
test_gif_data(reporter, static_cast<void *>(gGIFData), sizeof(gGIFData));
|
|
test_interlaced_gif_data(reporter, static_cast<void *>(gInterlacedGIF),
|
|
sizeof(gInterlacedGIF));
|
|
|
|
unsigned char badData[sizeof(gGIFData)];
|
|
|
|
memcpy(badData, gGIFData, sizeof(gGIFData));
|
|
badData[6] = 0x01; // image too wide
|
|
test_gif_data(reporter, static_cast<void *>(badData), sizeof(gGIFData));
|
|
// "libgif warning [image too wide, expanding output to size]"
|
|
|
|
memcpy(badData, gGIFData, sizeof(gGIFData));
|
|
badData[8] = 0x01; // image too tall
|
|
test_gif_data(reporter, static_cast<void *>(badData), sizeof(gGIFData));
|
|
// "libgif warning [image too tall, expanding output to size]"
|
|
|
|
memcpy(badData, gGIFData, sizeof(gGIFData));
|
|
badData[62] = 0x01; // image shifted right
|
|
test_gif_data_dims(reporter, static_cast<void *>(badData), sizeof(gGIFData), 4, 3);
|
|
|
|
memcpy(badData, gGIFData, sizeof(gGIFData));
|
|
badData[64] = 0x01; // image shifted down
|
|
test_gif_data_dims(reporter, static_cast<void *>(badData), sizeof(gGIFData), 3, 4);
|
|
|
|
memcpy(badData, gGIFData, sizeof(gGIFData));
|
|
badData[62] = 0xff; // image shifted right
|
|
badData[63] = 0xff;
|
|
test_gif_data_dims(reporter, static_cast<void *>(badData), sizeof(gGIFData), 3 + 0xFFFF, 3);
|
|
|
|
memcpy(badData, gGIFData, sizeof(gGIFData));
|
|
badData[64] = 0xff; // image shifted down
|
|
badData[65] = 0xff;
|
|
test_gif_data_dims(reporter, static_cast<void *>(badData), sizeof(gGIFData), 3, 3 + 0xFFFF);
|
|
|
|
test_gif_data_no_colormap(reporter, static_cast<void *>(gGIFDataNoColormap),
|
|
sizeof(gGIFDataNoColormap));
|
|
|
|
// Since there is no color map, we do not even need to parse the image data
|
|
// to know that we should draw transparent. Truncate the file before the
|
|
// data. This should still succeed.
|
|
test_gif_data_no_colormap(reporter, static_cast<void *>(gGIFDataNoColormap), 31);
|
|
|
|
// Likewise, incremental decoding should succeed here.
|
|
{
|
|
sk_sp<SkData> data = SkData::MakeWithoutCopy(gGIFDataNoColormap, 31);
|
|
std::unique_ptr<SkCodec> codec(SkCodec::MakeFromData(data));
|
|
REPORTER_ASSERT(reporter, codec);
|
|
if (codec) {
|
|
auto info = codec->getInfo().makeColorType(kN32_SkColorType);
|
|
SkBitmap bm;
|
|
bm.allocPixels(info);
|
|
REPORTER_ASSERT(reporter, SkCodec::kSuccess == codec->startIncrementalDecode(
|
|
info, bm.getPixels(), bm.rowBytes()));
|
|
REPORTER_ASSERT(reporter, SkCodec::kSuccess == codec->incrementalDecode());
|
|
REPORTER_ASSERT(reporter, bm.width() == 1);
|
|
REPORTER_ASSERT(reporter, bm.height() == 1);
|
|
REPORTER_ASSERT(reporter, !(bm.empty()));
|
|
if (!(bm.empty())) {
|
|
REPORTER_ASSERT(reporter, bm.getColor(0, 0) == 0x00000000);
|
|
}
|
|
}
|
|
}
|
|
|
|
// test short Gif. 80 is missing a few bytes.
|
|
test_gif_data_short(reporter, static_cast<void *>(gGIFData), 80);
|
|
// "libgif warning [DGifGetLine]"
|
|
|
|
test_interlaced_gif_data(reporter, static_cast<void *>(gInterlacedGIF),
|
|
100); // 100 is missing a few bytes
|
|
// "libgif warning [interlace DGifGetLine]"
|
|
}
|
|
|
|
// Regression test for decoding a gif image with sampleSize of 4, which was
|
|
// previously crashing.
|
|
DEF_TEST(Gif_Sampled, r) {
|
|
auto data = GetResourceAsData("images/test640x479.gif");
|
|
REPORTER_ASSERT(r, data);
|
|
if (!data) {
|
|
return;
|
|
}
|
|
std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(std::move(data)));
|
|
std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::MakeFromStream(std::move(stream)));
|
|
REPORTER_ASSERT(r, codec);
|
|
if (!codec) {
|
|
return;
|
|
}
|
|
|
|
SkAndroidCodec::AndroidOptions options;
|
|
options.fSampleSize = 4;
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(codec->getInfo());
|
|
const SkCodec::Result result = codec->getAndroidPixels(codec->getInfo(), bm.getPixels(),
|
|
bm.rowBytes(), &options);
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
}
|
|
|
|
// If a GIF file is truncated before the header for the first image is defined,
|
|
// we should not create an SkCodec.
|
|
DEF_TEST(Codec_GifTruncated, r) {
|
|
sk_sp<SkData> data(GetResourceAsData("images/test640x479.gif"));
|
|
if (!data) {
|
|
return;
|
|
}
|
|
|
|
// This is right before the header for the first image.
|
|
data = SkData::MakeSubset(data.get(), 0, 446);
|
|
std::unique_ptr<SkCodec> codec(SkCodec::MakeFromData(data));
|
|
REPORTER_ASSERT(r, !codec);
|
|
}
|
|
|
|
DEF_TEST(Codec_GifTruncated2, r) {
|
|
sk_sp<SkData> data(GetResourceAsData("images/box.gif"));
|
|
if (!data) {
|
|
return;
|
|
}
|
|
|
|
// This is after the header, but before the color table.
|
|
data = SkData::MakeSubset(data.get(), 0, 23);
|
|
std::unique_ptr<SkCodec> codec(SkCodec::MakeFromData(data));
|
|
if (!codec) {
|
|
ERRORF(r, "Failed to create codec with partial data");
|
|
return;
|
|
}
|
|
|
|
// Although we correctly created a codec, no frame is
|
|
// complete enough that it has its metadata. Returning 0
|
|
// ensures that Chromium will not try to create a frame
|
|
// too early.
|
|
REPORTER_ASSERT(r, codec->getFrameCount() == 0);
|
|
}
|