Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Updated the wide-gamut constant and added a unit test for it. #39776

Merged
auto-submit merged 2 commits into from
Feb 22, 2023
Merged

Updated the wide-gamut constant and added a unit test for it. #39776

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42b63c3
Updated the wide-gamut constant and added a unit test for it.
gaaclarke Feb 21, 2023
88862ad
dan feedback
gaaclarke Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/ui/painting/image_decoder_impeller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ float CalculateArea(SkPoint abc[3]) {
b.fX * a.fY);
}

static constexpr float kSrgbD50GamutArea = 0.084f;
// Note: This is defined differently in Skia, in my testing this is the correct
// area and was calculated from SkColorSpace::MakeSRGB().

@dnfield dnfield Feb 21, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: if Skia is updating this, consider linking the skbug for it and mentioning that here.

@gaaclarke gaaclarke Feb 21, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

static constexpr float kSrgbGamutArea = 0.0982f;

// Source:
// https://source.chromium.org/chromium/_/skia/skia.git/+/393fb1ec80f41d8ad7d104921b6920e69749fda1:src/codec/SkAndroidCodec.cpp;l=67;drc=46572b4d445f41943059d0e377afc6d6748cd5ca;bpv=1;bpt=0
Expand All @@ -58,7 +60,8 @@ bool IsWideGamut(const SkColorSpace& color_space) {
color_space.toXYZD50(&xyzd50);
SkPoint rgb[3];
LoadGamut(rgb, xyzd50);
return CalculateArea(rgb) > kSrgbD50GamutArea;
float area = CalculateArea(rgb);
return area > kSrgbGamutArea;
}
} // namespace

Expand Down
22 changes: 22 additions & 0 deletions lib/ui/painting/image_decoder_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,28 @@ TEST_F(ImageDecoderFixtureTest, ImpellerWideGamutDisplayP3) {
#endif // IMPELLER_SUPPORTS_RENDERING
}

TEST_F(ImageDecoderFixtureTest, ImpellerNonWideGamut) {
auto data = OpenFixtureAsSkData("Horizontal.jpg");
auto image = SkImage::MakeFromEncoded(data);
ASSERT_TRUE(image != nullptr);
ASSERT_EQ(SkISize::Make(600, 200), image->dimensions());

ImageGeneratorRegistry registry;
std::shared_ptr<ImageGenerator> generator =
registry.CreateCompatibleGenerator(data);
ASSERT_TRUE(generator);

auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
std::move(generator));

#if IMPELLER_SUPPORTS_RENDERING
std::shared_ptr<SkBitmap> bitmap = ImageDecoderImpeller::DecompressTexture(
descriptor.get(), SkISize::Make(600, 200), {600, 200},
/*supports_wide_gamut=*/true);
ASSERT_EQ(bitmap->colorType(), kRGBA_8888_SkColorType);
#endif // IMPELLER_SUPPORTS_RENDERING
}

TEST_F(ImageDecoderFixtureTest, ExifDataIsRespectedOnDecode) {
auto loop = fml::ConcurrentMessageLoop::Create();
TaskRunners runners(GetCurrentTestName(), // label
Expand Down