Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1022)

Unified Diff: third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp

Issue 2490473005: Pull up equivalent image decoding tests (Closed)
Patch Set: Removed unnecessary header Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
index 6edafe91c786f962b573cfc088a2cd439ebb822b..63c062687e16c6666dedca1da6eed3b053ff0e26 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp
@@ -55,16 +55,14 @@ void createDecodingBaseline(DecoderCreator createDecoder,
}
}
-void testByteByByteDecode(DecoderCreator createDecoder,
- const char* file,
- size_t expectedFrameCount,
- int expectedRepetitionCount) {
- RefPtr<SharedBuffer> data = readFile(file);
- ASSERT_TRUE(data.get());
+static void testByteByByteDecode(DecoderCreator createDecoder,
+ SharedBuffer* data,
+ size_t expectedFrameCount,
+ int expectedRepetitionCount) {
ASSERT_TRUE(data->data());
Vector<unsigned> baselineHashes;
- createDecodingBaseline(createDecoder, data.get(), &baselineHashes);
+ createDecodingBaseline(createDecoder, data, &baselineHashes);
std::unique_ptr<ImageDecoder> decoder = createDecoder();
@@ -118,11 +116,8 @@ void testByteByByteDecode(DecoderCreator createDecoder,
// not break decoding at a critical point: in between a call to decode the size
// (when the decoder stops while it may still have input data to read) and a
// call to do a full decode.
-void testMergeBuffer(DecoderCreator createDecoder, const char* file) {
- RefPtr<SharedBuffer> data = readFile(file);
- ASSERT_TRUE(data);
-
- const unsigned hash = createDecodingBaseline(createDecoder, data.get());
+static void testMergeBuffer(DecoderCreator createDecoder, SharedBuffer* data) {
+ const unsigned hash = createDecodingBaseline(createDecoder, data);
// In order to do any verification, this test needs to move the data owned
// by the SharedBuffer. A way to guarantee that is to create a new one, and
@@ -148,4 +143,277 @@ void testMergeBuffer(DecoderCreator createDecoder, const char* file) {
EXPECT_EQ(hashBitmap(frame->bitmap()), hash);
}
+static void testRandomFrameDecode(DecoderCreator createDecoder,
+ SharedBuffer* fullData,
+ size_t skippingStep) {
+ Vector<unsigned> baselineHashes;
+ createDecodingBaseline(createDecoder, fullData, &baselineHashes);
+ size_t frameCount = baselineHashes.size();
+
+ // Random decoding should get the same results as sequential decoding.
+ std::unique_ptr<ImageDecoder> decoder = createDecoder();
+ decoder->setData(fullData, true);
+ for (size_t i = 0; i < skippingStep; ++i) {
+ for (size_t j = i; j < frameCount; j += skippingStep) {
+ SCOPED_TRACE(::testing::Message() << "Random i:" << i << " j:" << j);
+ ImageFrame* frame = decoder->frameBufferAtIndex(j);
+ EXPECT_EQ(baselineHashes[j], hashBitmap(frame->bitmap()));
+ }
+ }
+
+ // Decoding in reverse order.
+ decoder = createDecoder();
+ decoder->setData(fullData, true);
+ for (size_t i = frameCount; i; --i) {
+ SCOPED_TRACE(::testing::Message() << "Reverse i:" << i);
+ ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
+ EXPECT_EQ(baselineHashes[i - 1], hashBitmap(frame->bitmap()));
+ }
+}
+
+static void testRandomDecodeAfterClearFrameBufferCache(
+ DecoderCreator createDecoder,
+ SharedBuffer* data,
+ size_t skippingStep) {
+ Vector<unsigned> baselineHashes;
+ createDecodingBaseline(createDecoder, data, &baselineHashes);
+ size_t frameCount = baselineHashes.size();
+
+ std::unique_ptr<ImageDecoder> decoder = createDecoder();
+ decoder->setData(data, true);
+ for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount;
+ ++clearExceptFrame) {
+ decoder->clearCacheExceptFrame(clearExceptFrame);
+ for (size_t i = 0; i < skippingStep; ++i) {
+ for (size_t j = 0; j < frameCount; j += skippingStep) {
+ SCOPED_TRACE(::testing::Message() << "Random i:" << i << " j:" << j);
+ ImageFrame* frame = decoder->frameBufferAtIndex(j);
+ EXPECT_EQ(baselineHashes[j], hashBitmap(frame->bitmap()));
+ }
+ }
+ }
+}
+
+static void testDecodeAfterReallocatingData(DecoderCreator createDecoder,
+ SharedBuffer* data) {
+ std::unique_ptr<ImageDecoder> decoder = createDecoder();
+
+ // Parse from 'data'.
+ decoder->setData(data, true);
+ size_t frameCount = decoder->frameCount();
+
+ // ... and then decode frames from 'reallocatedData'.
+ RefPtr<SharedBuffer> reallocatedData = data->copy();
+ ASSERT_TRUE(reallocatedData.get());
+ data->clear();
+ decoder->setData(reallocatedData.get(), true);
+
+ for (size_t i = 0; i < frameCount; ++i) {
+ const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
+ EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
+ }
+}
+
+static void testByteByByteSizeAvailable(DecoderCreator createDecoder,
+ SharedBuffer* data,
+ size_t frameOffset,
+ bool hasColorSpace,
+ int expectedRepetitionCount) {
+ std::unique_ptr<ImageDecoder> decoder = createDecoder();
+ EXPECT_LT(frameOffset, data->size());
+
+ // Send data to the decoder byte-by-byte and use the provided frame offset in
+ // the data to check that isSizeAvailable() changes state only when that
+ // offset is reached. Also check other decoder state.
+ for (size_t length = 1; length <= frameOffset; ++length) {
+ RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
+ decoder->setData(tempData.get(), false);
+
+ if (length < frameOffset) {
+ EXPECT_FALSE(decoder->isSizeAvailable());
+ EXPECT_TRUE(decoder->size().isEmpty());
+ EXPECT_FALSE(decoder->hasEmbeddedColorSpace());
+ EXPECT_EQ(0u, decoder->frameCount());
+ EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
+ EXPECT_FALSE(decoder->frameBufferAtIndex(0));
+ } else {
+ EXPECT_TRUE(decoder->isSizeAvailable());
+ EXPECT_FALSE(decoder->size().isEmpty());
+ EXPECT_EQ(decoder->hasEmbeddedColorSpace(), hasColorSpace);
+ EXPECT_EQ(1u, decoder->frameCount());
+ EXPECT_EQ(expectedRepetitionCount, decoder->repetitionCount());
+ }
+
+ ASSERT_FALSE(decoder->failed());
+ }
+}
+
+static void testProgressiveDecoding(DecoderCreator createDecoder,
+ SharedBuffer* fullData,
+ size_t increment) {
+ const size_t fullLength = fullData->size();
+
+ std::unique_ptr<ImageDecoder> decoder;
+
+ Vector<unsigned> truncatedHashes;
+ Vector<unsigned> progressiveHashes;
+
+ // Compute hashes when the file is truncated.
+ for (size_t i = 1; i <= fullLength; i += increment) {
+ decoder = createDecoder();
+ RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), i);
+ decoder->setData(data.get(), i == fullLength);
+ ImageFrame* frame = decoder->frameBufferAtIndex(0);
+ if (!frame) {
+ truncatedHashes.append(0);
+ continue;
+ }
+ truncatedHashes.append(hashBitmap(frame->bitmap()));
+ }
+
+ // Compute hashes when the file is progressively decoded.
+ decoder = createDecoder();
+ for (size_t i = 1; i <= fullLength; i += increment) {
+ RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), i);
+ decoder->setData(data.get(), i == fullLength);
+ ImageFrame* frame = decoder->frameBufferAtIndex(0);
+ if (!frame) {
+ progressiveHashes.append(0);
+ continue;
+ }
+ progressiveHashes.append(hashBitmap(frame->bitmap()));
+ }
+
+ for (size_t i = 0; i < truncatedHashes.size(); ++i)
+ ASSERT_EQ(truncatedHashes[i], progressiveHashes[i]);
+}
+
+void testByteByByteDecode(DecoderCreator createDecoder,
+ const char* file,
+ size_t expectedFrameCount,
+ int expectedRepetitionCount) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ testByteByByteDecode(createDecoder, data.get(), expectedFrameCount,
+ expectedRepetitionCount);
+}
+void testByteByByteDecode(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file,
+ size_t expectedFrameCount,
+ int expectedRepetitionCount) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ testByteByByteDecode(createDecoder, data.get(), expectedFrameCount,
+ expectedRepetitionCount);
+}
+
+void testMergeBuffer(DecoderCreator createDecoder, const char* file) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ testMergeBuffer(createDecoder, data.get());
+}
+
+void testMergeBuffer(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ testMergeBuffer(createDecoder, data.get());
+}
+
+void testRandomFrameDecode(DecoderCreator createDecoder,
+ const char* file,
+ size_t skippingStep) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ SCOPED_TRACE(file);
+ testRandomFrameDecode(createDecoder, data.get(), skippingStep);
+}
+void testRandomFrameDecode(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file,
+ size_t skippingStep) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ SCOPED_TRACE(file);
+ testRandomFrameDecode(createDecoder, data.get(), skippingStep);
+}
+
+void testRandomDecodeAfterClearFrameBufferCache(DecoderCreator createDecoder,
+ const char* file,
+ size_t skippingStep) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ SCOPED_TRACE(file);
+ testRandomDecodeAfterClearFrameBufferCache(createDecoder, data.get(),
+ skippingStep);
+}
+
+void testRandomDecodeAfterClearFrameBufferCache(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file,
+ size_t skippingStep) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ SCOPED_TRACE(file);
+ testRandomDecodeAfterClearFrameBufferCache(createDecoder, data.get(),
+ skippingStep);
+}
+
+void testDecodeAfterReallocatingData(DecoderCreator createDecoder,
+ const char* file) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ testDecodeAfterReallocatingData(createDecoder, data.get());
+}
+
+void testDecodeAfterReallocatingData(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ testDecodeAfterReallocatingData(createDecoder, data.get());
+}
+
+void testByteByByteSizeAvailable(DecoderCreator createDecoder,
+ const char* file,
+ size_t frameOffset,
+ bool hasColorSpace,
+ int expectedRepetitionCount) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ testByteByByteSizeAvailable(createDecoder, data.get(), frameOffset,
+ hasColorSpace, expectedRepetitionCount);
+}
+
+void testByteByByteSizeAvailable(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file,
+ size_t frameOffset,
+ bool hasColorSpace,
+ int expectedRepetitionCount) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ testByteByByteSizeAvailable(createDecoder, data.get(), frameOffset,
+ hasColorSpace, expectedRepetitionCount);
+}
+
+void testProgressiveDecoding(DecoderCreator createDecoder,
+ const char* file,
+ size_t increment) {
+ RefPtr<SharedBuffer> data = readFile(file);
+ ASSERT_TRUE(data.get());
+ testProgressiveDecoding(createDecoder, data.get(), increment);
+}
+
+void testProgressiveDecoding(DecoderCreator createDecoder,
+ const char* dir,
+ const char* file,
+ size_t increment) {
+ RefPtr<SharedBuffer> data = readFile(dir, file);
+ ASSERT_TRUE(data.get());
+ testProgressiveDecoding(createDecoder, data.get(), increment);
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698