mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
f1d1e16669
- Bug 1188569: Drop unneeded MOZ_WARN_UNUSED_RESULT from from LookupBestMatch in SurfaceCache.cpp. r=seth (5e74e0028c) - Bug 1192356 (Part 1) - Take advantage of mozilla::Tie() in SurfaceCache.cpp. r=dholbert (e4908c725d) - Bug 1192356 (Part 2) - Take advantage of mozilla::Tie() in RasterImage.cpp. r=tn (1204189b73) - Bug 1185800 - Add DecoderFlags and SurfaceFlags enum classes and use them instead of imgIContainer flags in all decoder-related code. r=tn (3abdab11f6) - Bug 1196066 (Part 3) - Rewrite nsICODecoder to use StreamingLexer. r=tn (e2ba590c9d) - Bug 1196066 (Part 4) - Enable the ICOMultiChunk test, which now passes. r=tn (9e02611959) - Bug 1124084 - Flip on downscale-during-decode everywhere. r=tn (bd9deff966) - Bug 1160801 - Treat invalid GIF disposal methods as DisposalMethod::NOT_SPECIFIED. r=jrmuizel (e26feaf8fb) - Bug 1201796 (Part 1) - Treat ICOs with wrong widths and heights as corrupt. r=tn (322ba20808) - Bug 1201796 (Part 2) - Add GetFrameAtSize() to support downscale-during-decode for GetFrame() use cases. r=tn (92f5d3a0a7) - Bug 1194906 - Replace 'NS_ENSURE_TRUE(BadImage(..))' warnings with more useful messages. r=tn (cc3b368673) - Bug 1201796 (Part 3) - Enable downscale-during-decode for imgITools::EncodeScaledImage(). r=tn (e2cdb5b520) - Bug 1194472 - Correctly fetch compositor backend in WebGLContext. r=jgilbert (0092052dfc) - Bug 1161913 - Part 1 - Add invalidation state for CaptureStream to Canvas and Contexts. r=mt (0377d6bbe7) - Bug 1168075 - Fix CanvasCaptureMediaStream build fail for bluetooth2. r=pehrsons (53c67c0056) - Bug 1176363 - Part 1: Make a raw copy of each Canvas::CaptureStream frame. r=mattwoodrow (a5df5793d6) - Bug 1194575 - Rename RecoverFromLossOfFrames() to RecoverFromInvalidFrames() to better reflect its role. r=tn (baa6455e79) - Bug 1146663 (Part 1) - Remove HQ scaling, which is now dead code. r=tn (efaddadea0) - Bug 1146663 (Part 2) - Remove the concept of lifetimes from the SurfaceCache. r=dholbert (ab9862d7ee) - Bug 1146663 (Part 3) - Make it impossible to deoptimize imgFrames. r=tn (19e2f1b370) - Bug 1201763 - Add downscale-during-decode support for the ICON decoder. r=tn (33a2b95e5c) - Bug 1194058 (Part 1) - Add Deinterlacer to allow Downscaler to work with interlaced images. r=tn (f7c57b7a8e) - Bug 1194058 (Part 2) - Add downscale-during-decode support for the GIF decoder. r=tn (85622f9d55) - Bug 1201796 (Part 4) - Add downscale-during-decode support for the ICO decoder. r=tn (d09d18b0d9) - Bug 1146663 (Part 4) - Make all RasterImages support downscale-during-decode. r=tn (264642a895) - Bug 1146663 (Part 5) - Require that all image decoders support downscale-during-decode. r=tn (79ad99885d) - Bug 1206836 - When downscaling ICOs, downscale the AND mask as well. r=tn a=KWierso (08ec3d092b) - missing bit of Bug 1138293 - Use malloc/free/realloc/calloc (eb8e5e1b9c) - missing bit of Bug 1146663 (Part 3) - Make it impossible to deoptimize imgFrames. (233befe48f) - Bug 1208935 - Move Deinterlacer to a standalone file. r=seth (b50322abc286)
255 lines
8.8 KiB
C++
255 lines
8.8 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "gtest/gtest.h"
|
|
|
|
#include "Common.h"
|
|
#include "Decoder.h"
|
|
#include "DecoderFactory.h"
|
|
#include "decoders/nsBMPDecoder.h"
|
|
#include "imgIContainer.h"
|
|
#include "imgITools.h"
|
|
#include "ImageFactory.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIInputStream.h"
|
|
#include "nsIRunnable.h"
|
|
#include "nsIThread.h"
|
|
#include "mozilla/nsRefPtr.h"
|
|
#include "nsStreamUtils.h"
|
|
#include "nsString.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "ProgressTracker.h"
|
|
#include "SourceBuffer.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::gfx;
|
|
using namespace mozilla::image;
|
|
|
|
TEST(ImageMetadata, ImageModuleAvailable)
|
|
{
|
|
// We can run into problems if XPCOM modules get initialized in the wrong
|
|
// order. It's important that this test run first, both as a sanity check and
|
|
// to ensure we get the module initialization order we want.
|
|
nsCOMPtr<imgITools> imgTools =
|
|
do_CreateInstance("@mozilla.org/image/tools;1");
|
|
EXPECT_TRUE(imgTools != nullptr);
|
|
}
|
|
|
|
enum class BMPAlpha
|
|
{
|
|
DISABLED,
|
|
ENABLED
|
|
};
|
|
|
|
static void
|
|
CheckMetadata(const ImageTestCase& aTestCase,
|
|
BMPAlpha aBMPAlpha = BMPAlpha::DISABLED)
|
|
{
|
|
nsCOMPtr<nsIInputStream> inputStream = LoadFile(aTestCase.mPath);
|
|
ASSERT_TRUE(inputStream != nullptr);
|
|
|
|
// Figure out how much data we have.
|
|
uint64_t length;
|
|
nsresult rv = inputStream->Available(&length);
|
|
ASSERT_TRUE(NS_SUCCEEDED(rv));
|
|
|
|
// Write the data into a SourceBuffer.
|
|
nsRefPtr<SourceBuffer> sourceBuffer = new SourceBuffer();
|
|
sourceBuffer->ExpectLength(length);
|
|
rv = sourceBuffer->AppendFromInputStream(inputStream, length);
|
|
ASSERT_TRUE(NS_SUCCEEDED(rv));
|
|
sourceBuffer->Complete(NS_OK);
|
|
|
|
// Create a metadata decoder.
|
|
DecoderType decoderType =
|
|
DecoderFactory::GetDecoderType(aTestCase.mMimeType);
|
|
nsRefPtr<Decoder> decoder =
|
|
DecoderFactory::CreateAnonymousMetadataDecoder(decoderType, sourceBuffer);
|
|
ASSERT_TRUE(decoder != nullptr);
|
|
|
|
if (aBMPAlpha == BMPAlpha::ENABLED) {
|
|
static_cast<nsBMPDecoder*>(decoder.get())->SetUseAlphaData(true);
|
|
}
|
|
|
|
// Run the metadata decoder synchronously.
|
|
decoder->Decode();
|
|
|
|
// Ensure that the metadata decoder didn't make progress it shouldn't have
|
|
// (which would indicate that it decoded past the header of the image).
|
|
Progress metadataProgress = decoder->TakeProgress();
|
|
EXPECT_TRUE(0 == (metadataProgress & ~(FLAG_SIZE_AVAILABLE |
|
|
FLAG_HAS_TRANSPARENCY |
|
|
FLAG_IS_ANIMATED)));
|
|
|
|
// If the test case is corrupt, assert what we can and return early.
|
|
if (aTestCase.mFlags & TEST_CASE_HAS_ERROR) {
|
|
EXPECT_TRUE(decoder->GetDecodeDone());
|
|
EXPECT_TRUE(decoder->HasError());
|
|
return;
|
|
}
|
|
|
|
EXPECT_TRUE(decoder->GetDecodeDone() && !decoder->HasError());
|
|
|
|
// Check that we got the expected metadata.
|
|
EXPECT_TRUE(metadataProgress & FLAG_SIZE_AVAILABLE);
|
|
|
|
IntSize metadataSize = decoder->GetSize();
|
|
EXPECT_EQ(aTestCase.mSize.width, metadataSize.width);
|
|
EXPECT_EQ(aTestCase.mSize.height, metadataSize.height);
|
|
|
|
bool expectTransparency = aBMPAlpha == BMPAlpha::ENABLED
|
|
? true
|
|
: bool(aTestCase.mFlags & TEST_CASE_IS_TRANSPARENT);
|
|
EXPECT_EQ(expectTransparency, bool(metadataProgress & FLAG_HAS_TRANSPARENCY));
|
|
|
|
EXPECT_EQ(bool(aTestCase.mFlags & TEST_CASE_IS_ANIMATED),
|
|
bool(metadataProgress & FLAG_IS_ANIMATED));
|
|
|
|
// Create a full decoder, so we can compare the result.
|
|
decoder =
|
|
DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer,
|
|
DefaultSurfaceFlags());
|
|
ASSERT_TRUE(decoder != nullptr);
|
|
|
|
if (aBMPAlpha == BMPAlpha::ENABLED) {
|
|
static_cast<nsBMPDecoder*>(decoder.get())->SetUseAlphaData(true);
|
|
}
|
|
|
|
// Run the full decoder synchronously.
|
|
decoder->Decode();
|
|
|
|
EXPECT_TRUE(decoder->GetDecodeDone() && !decoder->HasError());
|
|
Progress fullProgress = decoder->TakeProgress();
|
|
|
|
// If the metadata decoder set a progress bit, the full decoder should also
|
|
// have set the same bit.
|
|
EXPECT_EQ(fullProgress, metadataProgress | fullProgress);
|
|
|
|
// The full decoder and the metadata decoder should agree on the image's size.
|
|
IntSize fullSize = decoder->GetSize();
|
|
EXPECT_EQ(metadataSize.width, fullSize.width);
|
|
EXPECT_EQ(metadataSize.height, fullSize.height);
|
|
|
|
// We should not discover transparency during the full decode that we didn't
|
|
// discover during the metadata decode, unless the image is animated.
|
|
EXPECT_TRUE(!(fullProgress & FLAG_HAS_TRANSPARENCY) ||
|
|
(metadataProgress & FLAG_HAS_TRANSPARENCY) ||
|
|
(fullProgress & FLAG_IS_ANIMATED));
|
|
}
|
|
|
|
TEST(ImageMetadata, PNG) { CheckMetadata(GreenPNGTestCase()); }
|
|
TEST(ImageMetadata, TransparentPNG) { CheckMetadata(TransparentPNGTestCase()); }
|
|
TEST(ImageMetadata, GIF) { CheckMetadata(GreenGIFTestCase()); }
|
|
TEST(ImageMetadata, TransparentGIF) { CheckMetadata(TransparentGIFTestCase()); }
|
|
TEST(ImageMetadata, JPG) { CheckMetadata(GreenJPGTestCase()); }
|
|
TEST(ImageMetadata, BMP) { CheckMetadata(GreenBMPTestCase()); }
|
|
TEST(ImageMetadata, ICO) { CheckMetadata(GreenICOTestCase()); }
|
|
|
|
TEST(ImageMetadata, AnimatedGIF)
|
|
{
|
|
CheckMetadata(GreenFirstFrameAnimatedGIFTestCase());
|
|
}
|
|
|
|
TEST(ImageMetadata, AnimatedPNG)
|
|
{
|
|
CheckMetadata(GreenFirstFrameAnimatedPNGTestCase());
|
|
}
|
|
|
|
TEST(ImageMetadata, FirstFramePaddingGIF)
|
|
{
|
|
CheckMetadata(FirstFramePaddingGIFTestCase());
|
|
}
|
|
|
|
TEST(ImageMetadata, TransparentBMPWithBMPAlphaOff)
|
|
{
|
|
CheckMetadata(TransparentBMPWhenBMPAlphaEnabledTestCase(), BMPAlpha::ENABLED);
|
|
}
|
|
|
|
TEST(ImageMetadata, TransparentBMPWithBMPAlphaOn)
|
|
{
|
|
CheckMetadata(TransparentBMPWhenBMPAlphaEnabledTestCase(), BMPAlpha::ENABLED);
|
|
}
|
|
|
|
TEST(ImageMetadata, RLE4BMP) { CheckMetadata(RLE4BMPTestCase()); }
|
|
TEST(ImageMetadata, RLE8BMP) { CheckMetadata(RLE8BMPTestCase()); }
|
|
|
|
TEST(ImageMetadata, Corrupt) { CheckMetadata(CorruptTestCase()); }
|
|
|
|
TEST(ImageMetadata, NoFrameDelayGIF)
|
|
{
|
|
CheckMetadata(NoFrameDelayGIFTestCase());
|
|
}
|
|
|
|
TEST(ImageMetadata, NoFrameDelayGIFFullDecode)
|
|
{
|
|
ImageTestCase testCase = NoFrameDelayGIFTestCase();
|
|
|
|
// The previous test (NoFrameDelayGIF) verifies that we *don't* detect that
|
|
// this test case is animated, because it has a zero frame delay for the first
|
|
// frame. This test verifies that when we do a full decode, we detect the
|
|
// animation at that point and successfully decode all the frames.
|
|
|
|
// Create an image.
|
|
nsRefPtr<Image> image =
|
|
ImageFactory::CreateAnonymousImage(nsAutoCString(testCase.mMimeType));
|
|
ASSERT_TRUE(!image->HasError());
|
|
|
|
nsCOMPtr<nsIInputStream> inputStream = LoadFile(testCase.mPath);
|
|
ASSERT_TRUE(inputStream != nullptr);
|
|
|
|
// Figure out how much data we have.
|
|
uint64_t length;
|
|
nsresult rv = inputStream->Available(&length);
|
|
ASSERT_TRUE(NS_SUCCEEDED(rv));
|
|
|
|
// Write the data into the image.
|
|
rv = image->OnImageDataAvailable(nullptr, nullptr, inputStream, 0,
|
|
static_cast<uint32_t>(length));
|
|
ASSERT_TRUE(NS_SUCCEEDED(rv));
|
|
|
|
// Let the image know we've sent all the data.
|
|
rv = image->OnImageDataComplete(nullptr, nullptr, NS_OK, true);
|
|
ASSERT_TRUE(NS_SUCCEEDED(rv));
|
|
|
|
nsRefPtr<ProgressTracker> tracker = image->GetProgressTracker();
|
|
tracker->SyncNotifyProgress(FLAG_LOAD_COMPLETE);
|
|
|
|
// Use GetFrame() to force a sync decode of the image.
|
|
nsRefPtr<SourceSurface> surface =
|
|
image->GetFrame(imgIContainer::FRAME_CURRENT,
|
|
imgIContainer::FLAG_SYNC_DECODE);
|
|
|
|
// Ensure that the image's metadata meets our expectations.
|
|
IntSize imageSize(0, 0);
|
|
rv = image->GetWidth(&imageSize.width);
|
|
EXPECT_TRUE(NS_SUCCEEDED(rv));
|
|
rv = image->GetHeight(&imageSize.height);
|
|
EXPECT_TRUE(NS_SUCCEEDED(rv));
|
|
|
|
EXPECT_EQ(testCase.mSize.width, imageSize.width);
|
|
EXPECT_EQ(testCase.mSize.height, imageSize.height);
|
|
|
|
Progress imageProgress = tracker->GetProgress();
|
|
|
|
EXPECT_TRUE(bool(imageProgress & FLAG_HAS_TRANSPARENCY) == false);
|
|
EXPECT_TRUE(bool(imageProgress & FLAG_IS_ANIMATED) == true);
|
|
|
|
// Ensure that we decoded both frames of the image.
|
|
LookupResult firstFrameLookupResult =
|
|
SurfaceCache::Lookup(ImageKey(image.get()),
|
|
RasterSurfaceKey(imageSize,
|
|
DefaultSurfaceFlags(),
|
|
/* aFrameNum = */ 0));
|
|
EXPECT_EQ(MatchType::EXACT, firstFrameLookupResult.Type());
|
|
|
|
LookupResult secondFrameLookupResult =
|
|
SurfaceCache::Lookup(ImageKey(image.get()),
|
|
RasterSurfaceKey(imageSize,
|
|
DefaultSurfaceFlags(),
|
|
/* aFrameNum = */ 1));
|
|
EXPECT_EQ(MatchType::EXACT, secondFrameLookupResult.Type());
|
|
}
|