RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 10:27:35 +00:00
Code Issues Activity Actions

LibGfx/JPEGXL: Allow ColourEncoding bundles with custom values

Browse source 
We don't do anything particular with images that contain a custom
ColourEncoding yet, but at least it allows us to know how to decode the
metadata of such images.
This commit is contained in:
Lucas CHOLLET 2023-07-30 01:08:10 -04:00 • committed by Andreas Kling
parent a8f041ae11
commit eb6d41d99e
1 changed files with 59 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Userland/Libraries/LibGfx/ImageFormats/JPEGXLLoader.cpp
View file

@ -203,6 +203,22 @@ struct ColourEncoding {
u32 uy {}; u32 uy {};
}; };
enum class TransferFunction {
k709 = 1,
kUnknown = 2,
kLinear = 8,
kSRGB = 13,
kPQ = 16,
kDCI = 17,
kHLG = 18,
};
struct CustomTransferFunction {
bool have_gamma { false };
u32 gamma {};
TransferFunction transfer_function { TransferFunction::kSRGB };
};
bool want_icc = false; bool want_icc = false;
ColourSpace colour_space { ColourSpace::kRGB }; ColourSpace colour_space { ColourSpace::kRGB };
WhitePoint white_point { WhitePoint::kD65 }; WhitePoint white_point { WhitePoint::kD65 };
@ -213,6 +229,8 @@ struct ColourEncoding {
Customxy green {}; Customxy green {};
Customxy blue {}; Customxy blue {};
CustomTransferFunction tf {};
RenderingIntent rendering_intent { RenderingIntent::kRelative }; RenderingIntent rendering_intent { RenderingIntent::kRelative };
}; };
@ -234,13 +252,53 @@ struct ColourEncoding {
return custom_xy; return custom_xy;
} }
static ErrorOr<ColourEncoding::CustomTransferFunction> read_custom_transfer_function(LittleEndianInputBitStream& stream)
{
ColourEncoding::CustomTransferFunction custom_transfer_function;
custom_transfer_function.have_gamma = TRY(stream.read_bit());
if (custom_transfer_function.have_gamma)
custom_transfer_function.gamma = TRY(stream.read_bits(24));
else
custom_transfer_function.transfer_function = TRY(read_enum<ColourEncoding::TransferFunction>(stream));
return custom_transfer_function;
}
static ErrorOr<ColourEncoding> read_colour_encoding(LittleEndianInputBitStream& stream) static ErrorOr<ColourEncoding> read_colour_encoding(LittleEndianInputBitStream& stream)
{ {
ColourEncoding colour_encoding; ColourEncoding colour_encoding;
bool const all_default = TRY(stream.read_bit()); bool const all_default = TRY(stream.read_bit());
if (!all_default) { if (!all_default) {
TODO(); colour_encoding.want_icc = TRY(stream.read_bit());
colour_encoding.colour_space = TRY(read_enum<ColourEncoding::ColourSpace>(stream));
auto const use_desc = !all_default && !colour_encoding.want_icc;
auto const not_xyb = colour_encoding.colour_space != ColourEncoding::ColourSpace::kXYB;
if (use_desc && not_xyb)
colour_encoding.white_point = TRY(read_enum<ColourEncoding::WhitePoint>(stream));
if (colour_encoding.white_point == ColourEncoding::WhitePoint::kCustom)
colour_encoding.white = TRY(read_custom_xy(stream));
auto const has_primaries = use_desc && not_xyb && colour_encoding.colour_space != ColourEncoding::ColourSpace::kGrey;
if (has_primaries)
colour_encoding.primaries = TRY(read_enum<ColourEncoding::Primaries>(stream));
if (colour_encoding.primaries == ColourEncoding::Primaries::kCustom) {
colour_encoding.red = TRY(read_custom_xy(stream));
colour_encoding.green = TRY(read_custom_xy(stream));
colour_encoding.blue = TRY(read_custom_xy(stream));
}
if (use_desc) {
colour_encoding.tf = TRY(read_custom_transfer_function(stream));
colour_encoding.rendering_intent = TRY(read_enum<ColourEncoding::RenderingIntent>(stream));
}
} }
return colour_encoding; return colour_encoding;