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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1812273003: Eliminate copies of encoded image data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months 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
« third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp ('K') | « third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp ('k') | third_party/WebKit/Source/web/ImageDecodeBench.cpp » ('j') | third_party/WebKit/Source/web/WebImageDecoder.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
index 4caecf6debb1913a45015a3ca5c90168da536511..e910e7c98a175c787be5be0b03b74b2ba7228580 100644
--- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
@@ -33,6 +33,7 @@
#include "platform/RuntimeEnabledFeatures.h"
#include "platform/SharedBuffer.h"
#include "platform/image-decoders/ImageDecoderTestHelpers.h"
+#include "platform/image-decoders/SharedBufferSegmentReader.h"
#include "public/platform/WebData.h"
#include "public/platform/WebSize.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -67,7 +68,8 @@ void testRandomFrameDecode(const char* webpFile)
// Random decoding should get the same results as sequential decoding.
OwnPtr<ImageDecoder> decoder = createDecoder();
- decoder->setData(fullData.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(fullData));
+ decoder->setData(segmentReader.get(), true);
const size_t skippingStep = 5;
for (size_t i = 0; i < skippingStep; ++i) {
for (size_t j = i; j < frameCount; j += skippingStep) {
@@ -79,7 +81,7 @@ void testRandomFrameDecode(const char* webpFile)
// Decoding in reverse order.
decoder = createDecoder();
- decoder->setData(fullData.get(), true);
+ decoder->setData(segmentReader.get(), true);
for (size_t i = frameCount; i; --i) {
SCOPED_TRACE(testing::Message() << "Reverse i:" << i);
ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
@@ -98,7 +100,8 @@ void testRandomDecodeAfterClearFrameBufferCache(const char* webpFile)
size_t frameCount = baselineHashes.size();
OwnPtr<ImageDecoder> decoder = createDecoder();
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount; ++clearExceptFrame) {
decoder->clearCacheExceptFrame(clearExceptFrame);
const size_t skippingStep = 5;
@@ -119,14 +122,16 @@ void testDecodeAfterReallocatingData(const char* webpFile)
ASSERT_TRUE(data.get());
// Parse from 'data'.
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
size_t frameCount = decoder->frameCount();
// ... and then decode frames from 'reallocatedData'.
RefPtr<SharedBuffer> reallocatedData = data.get()->copy();
ASSERT_TRUE(reallocatedData.get());
data.clear();
- decoder->setData(reallocatedData.get(), true);
+ segmentReader = adoptRef(new SharedBufferSegmentReader(reallocatedData));
+ decoder->setData(segmentReader.get(), true);
for (size_t i = 0; i < frameCount; ++i) {
const ImageFrame* const frame = decoder->frameBufferAtIndex(i);
@@ -147,7 +152,8 @@ void testByteByByteSizeAvailable(const char* webpFile, size_t frameOffset, bool
for (size_t length = 1; length <= frameOffset; ++length) {
RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
- decoder->setData(tempData.get(), false);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(tempData));
+ decoder->setData(segmentReader.get(), false);
if (length < frameOffset) {
EXPECT_FALSE(decoder->isSizeAvailable());
@@ -185,7 +191,8 @@ void testInvalidImage(const char* webpFile, bool parseErrorExpected)
RefPtr<SharedBuffer> data = readFile(webpFile);
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
if (parseErrorExpected) {
EXPECT_EQ(0u, decoder->frameCount());
@@ -241,12 +248,13 @@ void testAlphaBlending(const char* webpFile)
{
RefPtr<SharedBuffer> data = readFile(webpFile);
ASSERT_TRUE(data.get());
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
OwnPtr<ImageDecoder> decoderA = createDecoder(ImageDecoder::AlphaPremultiplied);
- decoderA->setData(data.get(), true);
+ decoderA->setData(segmentReader.get(), true);
OwnPtr<ImageDecoder> decoderB = createDecoder(ImageDecoder::AlphaNotPremultiplied);
- decoderB->setData(data.get(), true);
+ decoderB->setData(segmentReader.get(), true);
size_t frameCount = decoderA->frameCount();
ASSERT_EQ(frameCount, decoderB->frameCount());
@@ -263,7 +271,8 @@ TEST(AnimatedWebPTests, uniqueGenerationIDs)
RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/webp-animated.webp");
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
ImageFrame* frame = decoder->frameBufferAtIndex(0);
uint32_t generationID0 = frame->getSkBitmap().getGenerationID();
@@ -280,7 +289,8 @@ TEST(AnimatedWebPTests, verifyAnimationParametersTransparentImage)
RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/webp-animated.webp");
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
const int canvasWidth = 11;
const int canvasHeight = 29;
@@ -322,7 +332,8 @@ TEST(AnimatedWebPTests, verifyAnimationParametersOpaqueFramesTransparentBackgrou
RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/webp-animated-opaque.webp");
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
const int canvasWidth = 94;
const int canvasHeight = 87;
@@ -365,7 +376,8 @@ TEST(AnimatedWebPTests, verifyAnimationParametersBlendOverwrite)
RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/webp-animated-no-blend.webp");
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
const int canvasWidth = 94;
const int canvasHeight = 87;
@@ -421,7 +433,8 @@ TEST(AnimatedWebPTests, truncatedLastFrame)
RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/invalid-animated-webp2.webp");
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
size_t frameCount = 8;
EXPECT_EQ(frameCount, decoder->frameCount());
@@ -445,7 +458,8 @@ TEST(AnimatedWebPTests, truncatedInBetweenFrame)
RefPtr<SharedBuffer> fullData = readFile("/LayoutTests/fast/images/resources/invalid-animated-webp4.webp");
ASSERT_TRUE(fullData.get());
RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), fullData->size() - 1);
- decoder->setData(data.get(), false);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), false);
ImageFrame* frame = decoder->frameBufferAtIndex(1);
ASSERT_TRUE(frame);
@@ -468,7 +482,8 @@ TEST(AnimatedWebPTests, reproCrash)
const size_t partialSize = 32768;
ASSERT_GT(fullData->size(), partialSize);
RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), partialSize);
- decoder->setData(data.get(), false);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), false);
EXPECT_EQ(1u, decoder->frameCount());
ImageFrame* frame = decoder->frameBufferAtIndex(0);
ASSERT_TRUE(frame);
@@ -476,7 +491,8 @@ TEST(AnimatedWebPTests, reproCrash)
EXPECT_FALSE(decoder->failed());
// Parse full data now. The error in bitstream should now be detected.
- decoder->setData(fullData.get(), true);
+ segmentReader = adoptRef(new SharedBufferSegmentReader(fullData));
+ decoder->setData(segmentReader.get(), true);
EXPECT_EQ(1u, decoder->frameCount());
frame = decoder->frameBufferAtIndex(0);
ASSERT_TRUE(frame);
@@ -502,7 +518,8 @@ TEST(AnimatedWebPTests, progressiveDecode)
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);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), i == fullLength);
frame = decoder->frameBufferAtIndex(0);
if (!frame) {
truncatedHashes.append(0);
@@ -515,7 +532,8 @@ TEST(AnimatedWebPTests, progressiveDecode)
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);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), i == fullLength);
frame = decoder->frameBufferAtIndex(0);
if (!frame) {
progressiveHashes.append(0);
@@ -543,7 +561,8 @@ TEST(AnimatedWebPTests, frameIsCompleteAndDuration)
ASSERT_GE(data->size(), 10u);
RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), data->size() - 10);
- decoder->setData(tempData.get(), false);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(tempData));
+ decoder->setData(segmentReader.get(), false);
EXPECT_EQ(2u, decoder->frameCount());
EXPECT_FALSE(decoder->failed());
@@ -552,7 +571,8 @@ TEST(AnimatedWebPTests, frameIsCompleteAndDuration)
EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
EXPECT_EQ(500, decoder->frameDurationAtIndex(1));
- decoder->setData(data.get(), true);
+ segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
EXPECT_EQ(3u, decoder->frameCount());
EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
EXPECT_EQ(1000, decoder->frameDurationAtIndex(0));
@@ -574,7 +594,8 @@ TEST(AnimatedWebPTests, updateRequiredPreviousFrameAfterFirstDecode)
size_t partialSize = 1;
do {
RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), partialSize);
- decoder->setData(data.get(), false);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), false);
++partialSize;
} while (!decoder->frameCount() || decoder->frameBufferAtIndex(0)->status() == ImageFrame::FrameEmpty);
@@ -583,7 +604,8 @@ TEST(AnimatedWebPTests, updateRequiredPreviousFrameAfterFirstDecode)
for (size_t i = 1; i < frameCount; ++i)
EXPECT_EQ(i - 1, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
- decoder->setData(fullData.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(fullData));
+ decoder->setData(segmentReader.get(), true);
for (size_t i = 0; i < frameCount; ++i)
EXPECT_EQ(kNotFound, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
}
@@ -618,12 +640,14 @@ TEST(AnimatedWebPTests, DISABLED_resumePartialDecodeAfterClearFrameBufferCache)
size_t partialSize = 1;
do {
RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), partialSize);
- decoder->setData(data.get(), false);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), false);
++partialSize;
} while (!decoder->frameCount() || decoder->frameBufferAtIndex(0)->status() == ImageFrame::FrameEmpty);
// Skip to the last frame and clear.
- decoder->setData(fullData.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(fullData));
+ decoder->setData(segmentReader.get(), true);
EXPECT_EQ(frameCount, decoder->frameCount());
ImageFrame* lastFrame = decoder->frameBufferAtIndex(frameCount - 1);
EXPECT_EQ(baselineHashes[frameCount - 1], hashBitmap(lastFrame->getSkBitmap()));
@@ -682,7 +706,8 @@ TEST(StaticWebPTests, notAnimated)
OwnPtr<ImageDecoder> decoder = createDecoder();
RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/webp-color-profile-lossy.webp");
ASSERT_TRUE(data.get());
- decoder->setData(data.get(), true);
+ RefPtr<SharedBufferSegmentReader> segmentReader = adoptRef(new SharedBufferSegmentReader(data));
+ decoder->setData(segmentReader.get(), true);
EXPECT_EQ(1u, decoder->frameCount());
EXPECT_EQ(cAnimationNone, decoder->repetitionCount());
}
« third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp ('K') | « third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp ('k') | third_party/WebKit/Source/web/ImageDecodeBench.cpp » ('j') | third_party/WebKit/Source/web/WebImageDecoder.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698