Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-10-26 19:04:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
ladybird/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h

55 lines
1.4 KiB
C
Raw Normal View History

LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
/*
Everywhere: Use "the SerenityOS developers." in copyright headers We had some inconsistencies before: - Sometimes "The", sometimes "the" - Sometimes trailing ".", sometimes no trailing "." I picked the most common one (lowecase "the", trailing ".") and applied it to all copyright headers. By using the exact same string everywhere we can ensure nothing gets missed during a global search (and replace), and that these inconsistencies are not spread any further (as copyright headers are commonly copied to new files).
2021-04-28 22:46:44 +02:00
* Copyright (c) 2020, the SerenityOS developers.
LibGfx/JPEG: Add myself to the copyright header
2023-04-21 20:17:50 -04:00
* Copyright (c) 2022-2023, Lucas Chollet <lucas.chollet@serenityos.org>
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
*
Everything: Move to SPDX license identifiers in all files. SPDX License Identifiers are a more compact / standardized way of representing file license information. See: https://spdx.dev/resources/use/#identifiers This was done with the `ambr` search and replace tool. ambr --no-parent-ignore --key-from-file --rep-from-file key.txt rep.txt *
2021-04-22 01:24:48 -07:00
* SPDX-License-Identifier: BSD-2-Clause
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
*/
#pragma once
LibGfx/JPEG: Make JPEGImageDecoderPlugin's constructor take a Stream This allows us to get rid of the raw pointer and size in the JPEG context struct.
2023-03-18 16:56:36 -04:00
#include <AK/MemoryStream.h>
LibGfx: Move all image loaders and writers to a subdirectory
2023-03-21 14:58:06 -04:00
#include <LibGfx/ImageFormats/ImageDecoder.h>
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
namespace Gfx {
LibGfx: Rename `JPGLoader` to `JPEGLoader` The patch also contains modifications on several classes, functions or files that are related to the `JPGLoader`. Renaming include: - JPGLoader{.h, .cpp} - JPGImageDecoderPlugin - JPGLoadingContext - JPG_DEBUG - decode_jpg - FuzzJPGLoader.cpp - Few string literals or texts
2023-02-18 16:09:16 -05:00
struct JPEGLoadingContext;
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
LibGfx: Add a spec link for the JPEG decoder
2023-02-19 11:34:05 -05:00
// For the specification, see: https://www.w3.org/Graphics/JPEG/itu-t81.pdf
LibPDF+LibGfx: Don't invert CMYK channels in JPEG data in PDFs This is a hack: Ideally we'd have a CMYK Bitmap pixel format, and we'd convert to rgb at blit time. Then we could also apply color profiles (which for CMYK images are CMYK-based). Also, the colors for our CMYK->RGB conversion are off for PDFs, and we have distinct codepaths for this in Gfx::Color (for paths) and JPEGs. So when we fix that, we'll have to fix it in two places. But this doesn't require a lot of code and it's a huge visual progression, so let's go with it for now.
2023-11-15 12:58:06 -05:00
struct JPEGDecoderOptions {
enum class CMYK {
// For standalone jpeg files.
Normal,
// For jpeg data embedded in PDF files.
PDF,
};
CMYK cmyk { CMYK::Normal };
};
LibGfx: Rename `JPGLoader` to `JPEGLoader` The patch also contains modifications on several classes, functions or files that are related to the `JPGLoader`. Renaming include: - JPGLoader{.h, .cpp} - JPGImageDecoderPlugin - JPGLoadingContext - JPG_DEBUG - decode_jpg - FuzzJPGLoader.cpp - Few string literals or texts
2023-02-18 16:09:16 -05:00
class JPEGImageDecoderPlugin : public ImageDecoderPlugin {
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
public:
LibGfx: Return bool not ErrorOr<bool> from ImageDecoderPlugin::sniff() Nobody made use of the ErrorOr return value and it just added more chance of confusion, since it was not clear if failing to sniff an image should return an error or false. The answer was false, if you returned Error you'd crash the ImageDecoder.
2023-02-26 18:02:50 +00:00
static bool sniff(ReadonlyBytes);
LibGfx: Re-structure the whole initialization pattern for image decoders When trying to figure out the correct implementation, we now have a very strong distinction on plugins that are well suited for sniffing, and plugins that need a MIME type to be chosen. Instead of having multiple calls to non-static virtual sniff methods for each Image decoding plugin, we have 2 static methods for each implementation: 1. The sniff method, which in contrast to the old method, gets a ReadonlyBytes parameter and ensures we can figure out the result with zero heap allocations for most implementations. 2. The create method, which just creates a new instance so we don't expose the constructor to everyone anymore. In addition to that, we have a new virtual method called initialize, which has a per-implementation initialization pattern to actually ensure each implementation can construct a decoder object, and then have a correct context being applied to it for the actual decoding.
2023-01-20 10:13:14 +02:00
static ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> create(ReadonlyBytes);
LibPDF+LibGfx: Don't invert CMYK channels in JPEG data in PDFs This is a hack: Ideally we'd have a CMYK Bitmap pixel format, and we'd convert to rgb at blit time. Then we could also apply color profiles (which for CMYK images are CMYK-based). Also, the colors for our CMYK->RGB conversion are off for PDFs, and we have distinct codepaths for this in Gfx::Color (for paths) and JPEGs. So when we fix that, we'll have to fix it in two places. But this doesn't require a lot of code and it's a huge visual progression, so let's go with it for now.
2023-11-15 12:58:06 -05:00
static ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> create_with_options(ReadonlyBytes, JPEGDecoderOptions = {});
LibGfx: Re-structure the whole initialization pattern for image decoders When trying to figure out the correct implementation, we now have a very strong distinction on plugins that are well suited for sniffing, and plugins that need a MIME type to be chosen. Instead of having multiple calls to non-static virtual sniff methods for each Image decoding plugin, we have 2 static methods for each implementation: 1. The sniff method, which in contrast to the old method, gets a ReadonlyBytes parameter and ensures we can figure out the result with zero heap allocations for most implementations. 2. The create method, which just creates a new instance so we don't expose the constructor to everyone anymore. In addition to that, we have a new virtual method called initialize, which has a per-implementation initialization pattern to actually ensure each implementation can construct a decoder object, and then have a correct context being applied to it for the actual decoding.
2023-01-20 10:13:14 +02:00
LibGfx: Rename `JPGLoader` to `JPEGLoader` The patch also contains modifications on several classes, functions or files that are related to the `JPGLoader`. Renaming include: - JPGLoader{.h, .cpp} - JPGImageDecoderPlugin - JPGLoadingContext - JPG_DEBUG - decode_jpg - FuzzJPGLoader.cpp - Few string literals or texts
2023-02-18 16:09:16 -05:00
virtual ~JPEGImageDecoderPlugin() override;
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
virtual IntSize size() override;
LibGfx: Remove `ImageDecoder::set_[non]volatile()` These methods are unused so let's remove them.
2023-07-07 18:37:46 -04:00
LibGfx: Allow passing an ideal size to image decoders The ideal size is the size the user will display the image. Raster formats should ignore this parameter, but vector formats can use it to generate a bitmap of the ideal size.
2023-07-02 22:20:06 +01:00
virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
LibGfx/JPEG: Expose the Exif metadata The Exif metadata is contained in the APP1 segment. We only need to call the TIFF decoder to get the metadata back :^).
2024-01-21 15:25:00 -05:00
virtual Optional<Metadata const&> metadata() override;
LibGfx: Add a method to ImageDecoderPlugin for reading ICC data This probably won't be the final API for getting color spaces from images, since some formats just store an "is sRGB?" flag instead of a full profile. Instead, once everything works, we probably want to give every Bitmap a pointer to some color space abstraction. But we can always change this later, once things are further along and better understood.
2023-01-26 07:23:59 -05:00
virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
LibGfx/JPEG: Make it possible to obtain raw CMYK data from JPEGs frame() still returns a regular RGB Bitmap (now lazily converted from internal CMYK data), but JPEGImageDecoderPlugin now also implements cmyk_frame().
2024-01-07 21:49:03 -05:00
virtual NaturalFrameFormat natural_frame_format() const override;
virtual ErrorOr<NonnullRefPtr<CMYKBitmap>> cmyk_frame() override;
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
private:
LibGfx/JPEG: Propagate errors when creating `JPEGLoadingContext` This allows the JPEG fuzzer to make progress.
2023-10-29 10:31:04 +00:00
JPEGImageDecoderPlugin(NonnullOwnPtr<JPEGLoadingContext>);
LibGfx: Re-structure the whole initialization pattern for image decoders When trying to figure out the correct implementation, we now have a very strong distinction on plugins that are well suited for sniffing, and plugins that need a MIME type to be chosen. Instead of having multiple calls to non-static virtual sniff methods for each Image decoding plugin, we have 2 static methods for each implementation: 1. The sniff method, which in contrast to the old method, gets a ReadonlyBytes parameter and ensures we can figure out the result with zero heap allocations for most implementations. 2. The create method, which just creates a new instance so we don't expose the constructor to everyone anymore. In addition to that, we have a new virtual method called initialize, which has a per-implementation initialization pattern to actually ensure each implementation can construct a decoder object, and then have a correct context being applied to it for the actual decoding.
2023-01-20 10:13:14 +02:00
LibGfx/JPEG: Propagate errors when creating `JPEGLoadingContext` This allows the JPEG fuzzer to make progress.
2023-10-29 10:31:04 +00:00
NonnullOwnPtr<JPEGLoadingContext> m_context;
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
};
LibGfx: Add a method to ImageDecoderPlugin for reading ICC data This probably won't be the final API for getting color spaces from images, since some formats just store an "is sRGB?" flag instead of a full profile. Instead, once everything works, we probably want to give every Bitmap a pointer to some color space abstraction. But we can always change this later, once things are further along and better understood.
2023-01-26 07:23:59 -05:00
LibGfx+LibWeb: Add JPEG decoder and integrate with LibWeb This patch adds support for JPEG decoding. The JPEG decoder is capable of handling standard 2x1 horizontal, 2x1 vertical and quartered chroma subsampling. The implemented Inverse DCT performs with a decent speed. As of interchange formats, since we tend to ignore the metadata in APPn markers, the decoder can handle any format compatible with JFIF, which includes EXIFs and sometimes WebMs too. The decoder does not support progressive JPEGs yet.
2020-05-18 13:28:27 +05:30
}
Reference in a new issue Copy permalink