2020-05-18 07:58:27 +00:00
|
|
|
/*
|
2021-04-28 20:46:44 +00:00
|
|
|
* Copyright (c) 2020, the SerenityOS developers.
|
2020-05-18 07:58:27 +00:00
|
|
|
*
|
2021-04-22 08:24:48 +00:00
|
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
2020-05-18 07:58:27 +00:00
|
|
|
*/
|
|
|
|
|
2021-01-16 13:07:20 +00:00
|
|
|
#include <AK/Debug.h>
|
2022-12-22 07:00:54 +00:00
|
|
|
#include <AK/Error.h>
|
2020-11-29 08:52:42 +00:00
|
|
|
#include <AK/HashMap.h>
|
2021-07-17 16:29:28 +00:00
|
|
|
#include <AK/Math.h>
|
2020-09-20 10:50:07 +00:00
|
|
|
#include <AK/MemoryStream.h>
|
2022-12-22 07:00:54 +00:00
|
|
|
#include <AK/Try.h>
|
2020-05-18 07:58:27 +00:00
|
|
|
#include <AK/Vector.h>
|
|
|
|
#include <LibGfx/JPGLoader.h>
|
|
|
|
|
2020-06-22 17:10:20 +00:00
|
|
|
#define JPG_INVALID 0X0000
|
|
|
|
|
|
|
|
#define JPG_APPN0 0XFFE0
|
|
|
|
#define JPG_APPN1 0XFFE1
|
|
|
|
#define JPG_APPN2 0XFFE2
|
|
|
|
#define JPG_APPN3 0XFFE3
|
|
|
|
#define JPG_APPN4 0XFFE4
|
|
|
|
#define JPG_APPN5 0XFFE5
|
|
|
|
#define JPG_APPN6 0XFFE6
|
|
|
|
#define JPG_APPN7 0XFFE7
|
|
|
|
#define JPG_APPN8 0XFFE8
|
|
|
|
#define JPG_APPN9 0XFFE9
|
|
|
|
#define JPG_APPNA 0XFFEA
|
|
|
|
#define JPG_APPNB 0XFFEB
|
|
|
|
#define JPG_APPNC 0XFFEC
|
|
|
|
#define JPG_APPND 0XFFED
|
|
|
|
#define JPG_APPNE 0xFFEE
|
|
|
|
#define JPG_APPNF 0xFFEF
|
|
|
|
|
|
|
|
#define JPG_RESERVED1 0xFFF1
|
|
|
|
#define JPG_RESERVED2 0xFFF2
|
|
|
|
#define JPG_RESERVED3 0xFFF3
|
|
|
|
#define JPG_RESERVED4 0xFFF4
|
|
|
|
#define JPG_RESERVED5 0xFFF5
|
|
|
|
#define JPG_RESERVED6 0xFFF6
|
|
|
|
#define JPG_RESERVED7 0xFFF7
|
|
|
|
#define JPG_RESERVED8 0xFFF8
|
|
|
|
#define JPG_RESERVED9 0xFFF9
|
|
|
|
#define JPG_RESERVEDA 0xFFFA
|
|
|
|
#define JPG_RESERVEDB 0xFFFB
|
|
|
|
#define JPG_RESERVEDC 0xFFFC
|
|
|
|
#define JPG_RESERVEDD 0xFFFD
|
|
|
|
|
|
|
|
#define JPG_RST0 0xFFD0
|
|
|
|
#define JPG_RST1 0xFFD1
|
|
|
|
#define JPG_RST2 0xFFD2
|
|
|
|
#define JPG_RST3 0xFFD3
|
|
|
|
#define JPG_RST4 0xFFD4
|
|
|
|
#define JPG_RST5 0xFFD5
|
|
|
|
#define JPG_RST6 0xFFD6
|
|
|
|
#define JPG_RST7 0xFFD7
|
|
|
|
|
|
|
|
#define JPG_DHP 0xFFDE
|
|
|
|
#define JPG_EXP 0xFFDF
|
|
|
|
|
|
|
|
#define JPG_DHT 0XFFC4
|
|
|
|
#define JPG_DQT 0XFFDB
|
|
|
|
#define JPG_EOI 0xFFD9
|
|
|
|
#define JPG_RST 0XFFDD
|
|
|
|
#define JPG_SOF0 0XFFC0
|
2020-06-28 14:50:45 +00:00
|
|
|
#define JPG_SOF2 0xFFC2
|
2020-06-22 17:10:20 +00:00
|
|
|
#define JPG_SOI 0XFFD8
|
|
|
|
#define JPG_SOS 0XFFDA
|
|
|
|
#define JPG_COM 0xFFFE
|
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
namespace Gfx {
|
|
|
|
|
|
|
|
constexpr static u8 zigzag_map[64] {
|
|
|
|
0, 1, 8, 16, 9, 2, 3, 10,
|
|
|
|
17, 24, 32, 25, 18, 11, 4, 5,
|
|
|
|
12, 19, 26, 33, 40, 48, 41, 34,
|
|
|
|
27, 20, 13, 6, 7, 14, 21, 28,
|
|
|
|
35, 42, 49, 56, 57, 50, 43, 36,
|
|
|
|
29, 22, 15, 23, 30, 37, 44, 51,
|
|
|
|
58, 59, 52, 45, 38, 31, 39, 46,
|
|
|
|
53, 60, 61, 54, 47, 55, 62, 63
|
|
|
|
};
|
|
|
|
|
|
|
|
using Marker = u16;
|
|
|
|
|
2020-06-22 17:10:20 +00:00
|
|
|
/**
|
|
|
|
* MCU means group of data units that are coded together. A data unit is an 8x8
|
|
|
|
* block of component data. In interleaved scans, number of non-interleaved data
|
|
|
|
* units of a component C is Ch * Cv, where Ch and Cv represent the horizontal &
|
|
|
|
* vertical subsampling factors of the component, respectively. A MacroBlock is
|
|
|
|
* an 8x8 block of RGB values before encoding, and 8x8 block of YCbCr values when
|
|
|
|
* we're done decoding the huffman stream.
|
|
|
|
*/
|
|
|
|
struct Macroblock {
|
|
|
|
union {
|
|
|
|
i32 y[64] = { 0 };
|
|
|
|
i32 r[64];
|
|
|
|
};
|
|
|
|
|
|
|
|
union {
|
|
|
|
i32 cb[64] = { 0 };
|
|
|
|
i32 g[64];
|
|
|
|
};
|
|
|
|
|
|
|
|
union {
|
|
|
|
i32 cr[64] = { 0 };
|
|
|
|
i32 b[64];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
struct MacroblockMeta {
|
2020-06-27 15:20:16 +00:00
|
|
|
u32 total { 0 };
|
|
|
|
u32 padded_total { 0 };
|
|
|
|
u32 hcount { 0 };
|
|
|
|
u32 vcount { 0 };
|
|
|
|
u32 hpadded_count { 0 };
|
|
|
|
u32 vpadded_count { 0 };
|
2020-06-22 17:10:20 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ComponentSpec {
|
2020-11-29 08:52:42 +00:00
|
|
|
u8 id { 0 };
|
2020-06-22 17:10:20 +00:00
|
|
|
u8 hsample_factor { 1 }; // Horizontal sampling factor.
|
|
|
|
u8 vsample_factor { 1 }; // Vertical sampling factor.
|
2020-06-27 15:20:16 +00:00
|
|
|
u8 ac_destination_id { 0 };
|
|
|
|
u8 dc_destination_id { 0 };
|
|
|
|
u8 qtable_id { 0 }; // Quantization table id.
|
2020-06-22 17:10:20 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct StartOfFrame {
|
2020-07-15 07:46:29 +00:00
|
|
|
|
|
|
|
// Of these, only the first 3 are in mainstream use, and refers to SOF0-2.
|
2020-06-22 17:10:20 +00:00
|
|
|
enum class FrameType {
|
2020-07-15 07:46:29 +00:00
|
|
|
Baseline_DCT = 0,
|
|
|
|
Extended_Sequential_DCT = 1,
|
|
|
|
Progressive_DCT = 2,
|
|
|
|
Sequential_Lossless = 3,
|
|
|
|
Differential_Sequential_DCT = 5,
|
|
|
|
Differential_Progressive_DCT = 6,
|
|
|
|
Differential_Sequential_Lossless = 7,
|
|
|
|
Extended_Sequential_DCT_Arithmetic = 9,
|
|
|
|
Progressive_DCT_Arithmetic = 10,
|
|
|
|
Sequential_Lossless_Arithmetic = 11,
|
|
|
|
Differential_Sequential_DCT_Arithmetic = 13,
|
|
|
|
Differential_Progressive_DCT_Arithmetic = 14,
|
|
|
|
Differential_Sequential_Lossless_Arithmetic = 15,
|
2020-06-22 17:10:20 +00:00
|
|
|
};
|
|
|
|
|
2020-07-15 07:46:29 +00:00
|
|
|
FrameType type { FrameType::Baseline_DCT };
|
2020-06-27 15:20:16 +00:00
|
|
|
u8 precision { 0 };
|
|
|
|
u16 height { 0 };
|
|
|
|
u16 width { 0 };
|
2020-06-22 17:10:20 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct HuffmanTableSpec {
|
2020-06-27 15:20:16 +00:00
|
|
|
u8 type { 0 };
|
|
|
|
u8 destination_id { 0 };
|
2020-06-22 17:10:20 +00:00
|
|
|
u8 code_counts[16] = { 0 };
|
|
|
|
Vector<u8> symbols;
|
|
|
|
Vector<u16> codes;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct HuffmanStreamState {
|
|
|
|
Vector<u8> stream;
|
|
|
|
u8 bit_offset { 0 };
|
|
|
|
size_t byte_offset { 0 };
|
|
|
|
};
|
|
|
|
|
|
|
|
struct JPGLoadingContext {
|
|
|
|
enum State {
|
|
|
|
NotDecoded = 0,
|
|
|
|
Error,
|
|
|
|
FrameDecoded,
|
|
|
|
BitmapDecoded
|
|
|
|
};
|
|
|
|
|
|
|
|
State state { State::NotDecoded };
|
2022-04-01 17:58:27 +00:00
|
|
|
u8 const* data { nullptr };
|
2020-06-22 17:10:20 +00:00
|
|
|
size_t data_size { 0 };
|
2020-06-27 15:20:16 +00:00
|
|
|
u32 luma_table[64] = { 0 };
|
|
|
|
u32 chroma_table[64] = { 0 };
|
2020-06-22 17:10:20 +00:00
|
|
|
StartOfFrame frame;
|
2020-06-27 15:20:16 +00:00
|
|
|
u8 hsample_factor { 0 };
|
|
|
|
u8 vsample_factor { 0 };
|
|
|
|
u8 component_count { 0 };
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
Vector<ComponentSpec, 3> components;
|
2020-06-22 17:10:20 +00:00
|
|
|
RefPtr<Gfx::Bitmap> bitmap;
|
2020-06-27 15:20:16 +00:00
|
|
|
u16 dc_reset_interval { 0 };
|
2020-11-30 03:51:22 +00:00
|
|
|
HashMap<u8, HuffmanTableSpec> dc_tables;
|
|
|
|
HashMap<u8, HuffmanTableSpec> ac_tables;
|
2020-06-22 17:10:20 +00:00
|
|
|
HuffmanStreamState huffman_stream;
|
|
|
|
i32 previous_dc_values[3] = { 0 };
|
|
|
|
MacroblockMeta mblock_meta;
|
|
|
|
};
|
|
|
|
|
2020-08-10 22:09:28 +00:00
|
|
|
static void generate_huffman_codes(HuffmanTableSpec& table)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
unsigned code = 0;
|
|
|
|
for (auto number_of_codes : table.code_counts) {
|
|
|
|
for (int i = 0; i < number_of_codes; i++)
|
|
|
|
table.codes.append(code++);
|
|
|
|
code <<= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<size_t> read_huffman_bits(HuffmanStreamState& hstream, size_t count = 1)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
if (count > (8 * sizeof(size_t))) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "Can't read {} bits at once!", count);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Reading too much huffman bits at once");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
size_t value = 0;
|
|
|
|
while (count--) {
|
|
|
|
if (hstream.byte_offset >= hstream.stream.size()) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "Huffman stream exhausted. This could be an error!");
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Huffman stream exhausted.");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
u8 current_byte = hstream.stream[hstream.byte_offset];
|
|
|
|
u8 current_bit = 1u & (u32)(current_byte >> (7 - hstream.bit_offset)); // MSB first.
|
|
|
|
hstream.bit_offset++;
|
|
|
|
value = (value << 1) | (size_t)current_bit;
|
|
|
|
if (hstream.bit_offset == 8) {
|
|
|
|
hstream.byte_offset++;
|
|
|
|
hstream.bit_offset = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<u8> get_next_symbol(HuffmanStreamState& hstream, HuffmanTableSpec const& table)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
unsigned code = 0;
|
|
|
|
size_t code_cursor = 0;
|
|
|
|
for (int i = 0; i < 16; i++) { // Codes can't be longer than 16 bits.
|
2022-12-22 07:00:54 +00:00
|
|
|
auto result = TRY(read_huffman_bits(hstream));
|
|
|
|
code = (code << 1) | (i32)result;
|
2020-05-18 07:58:27 +00:00
|
|
|
for (int j = 0; j < table.code_counts[i]; j++) {
|
|
|
|
if (code == table.codes[code_cursor])
|
|
|
|
return table.symbols[code_cursor];
|
|
|
|
code_cursor++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-01 19:10:08 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "If you're seeing this...the jpeg decoder needs to support more kinds of JPEGs!");
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("This kind of JPEG is not yet supported by the decoder");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
static inline i32* get_component(Macroblock& block, unsigned component)
|
|
|
|
{
|
|
|
|
switch (component) {
|
|
|
|
case 0:
|
|
|
|
return block.y;
|
|
|
|
case 1:
|
|
|
|
return block.cb;
|
|
|
|
default:
|
|
|
|
return block.cr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
/**
|
|
|
|
* Build the macroblocks possible by reading single (MCU) subsampled pair of CbCr.
|
|
|
|
* Depending on the sampling factors, we may not see triples of y, cb, cr in that
|
|
|
|
* order. If sample factors differ from one, we'll read more than one block of y-
|
|
|
|
* coefficients before we get to read a cb-cr block.
|
|
|
|
|
|
|
|
* In the function below, `hcursor` and `vcursor` denote the location of the block
|
|
|
|
* we're building in the macroblock matrix. `vfactor_i` and `hfactor_i` are cursors
|
|
|
|
* that iterate over the vertical and horizontal subsampling factors, respectively.
|
|
|
|
* When we finish one iteration of the innermost loop, we'll have the coefficients
|
|
|
|
* of one of the components of block at position `mb_index`. When the outermost loop
|
|
|
|
* finishes first iteration, we'll have all the luminance coefficients for all the
|
|
|
|
* macroblocks that share the chrominance data. Next two iterations (assuming that
|
|
|
|
* we are dealing with three components) will fill up the blocks with chroma data.
|
|
|
|
*/
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> build_macroblocks(JPGLoadingContext& context, Vector<Macroblock>& macroblocks, u32 hcursor, u32 vcursor)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
for (unsigned component_i = 0; component_i < context.component_count; component_i++) {
|
|
|
|
auto& component = context.components[component_i];
|
2020-11-19 17:42:54 +00:00
|
|
|
|
|
|
|
if (component.dc_destination_id >= context.dc_tables.size())
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("DC destination ID is greater than number of DC tables");
|
2020-11-19 17:42:54 +00:00
|
|
|
if (component.ac_destination_id >= context.ac_tables.size())
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("AC destination ID is greater than number of AC tables");
|
2020-11-19 17:42:54 +00:00
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
for (u8 vfactor_i = 0; vfactor_i < component.vsample_factor; vfactor_i++) {
|
|
|
|
for (u8 hfactor_i = 0; hfactor_i < component.hsample_factor; hfactor_i++) {
|
|
|
|
u32 mb_index = (vcursor + vfactor_i) * context.mblock_meta.hpadded_count + (hfactor_i + hcursor);
|
|
|
|
Macroblock& block = macroblocks[mb_index];
|
|
|
|
|
2020-11-30 03:51:22 +00:00
|
|
|
auto& dc_table = context.dc_tables.find(component.dc_destination_id)->value;
|
|
|
|
auto& ac_table = context.ac_tables.find(component.ac_destination_id)->value;
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
// For DC coefficients, symbol encodes the length of the coefficient.
|
2022-12-22 07:00:54 +00:00
|
|
|
auto dc_length = TRY(get_next_symbol(context.huffman_stream, dc_table));
|
2020-05-18 07:58:27 +00:00
|
|
|
if (dc_length > 11) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "DC coefficient too long: {}!", dc_length);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("DC coefficient too long");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// DC coefficients are encoded as the difference between previous and current DC values.
|
2022-12-22 07:00:54 +00:00
|
|
|
i32 dc_diff = TRY(read_huffman_bits(context.huffman_stream, dc_length));
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
// If MSB in diff is 0, the difference is -ve. Otherwise +ve.
|
|
|
|
if (dc_length != 0 && dc_diff < (1 << (dc_length - 1)))
|
|
|
|
dc_diff -= (1 << dc_length) - 1;
|
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
auto select_component = get_component(block, component_i);
|
|
|
|
auto& previous_dc = context.previous_dc_values[component_i];
|
2020-05-18 07:58:27 +00:00
|
|
|
select_component[0] = previous_dc += dc_diff;
|
|
|
|
|
|
|
|
// Compute the AC coefficients.
|
|
|
|
for (int j = 1; j < 64;) {
|
|
|
|
// AC symbols encode 2 pieces of information, the high 4 bits represent
|
|
|
|
// number of zeroes to be stuffed before reading the coefficient. Low 4
|
|
|
|
// bits represent the magnitude of the coefficient.
|
2022-12-22 07:00:54 +00:00
|
|
|
auto ac_symbol = TRY(get_next_symbol(context.huffman_stream, ac_table));
|
2020-05-18 07:58:27 +00:00
|
|
|
if (ac_symbol == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
// ac_symbol = 0xF0 means we need to skip 16 zeroes.
|
|
|
|
u8 run_length = ac_symbol == 0xF0 ? 16 : ac_symbol >> 4;
|
|
|
|
j += run_length;
|
|
|
|
|
|
|
|
if (j >= 64) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "Run-length exceeded boundaries. Cursor: {}, Skipping: {}!", j, run_length);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Run-length exceeded boundaries");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
u8 coeff_length = ac_symbol & 0x0F;
|
|
|
|
if (coeff_length > 10) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "AC coefficient too long: {}!", coeff_length);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("AC coefficient too long");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (coeff_length != 0) {
|
2022-12-22 07:00:54 +00:00
|
|
|
i32 ac_coefficient = TRY(read_huffman_bits(context.huffman_stream, coeff_length));
|
2020-05-18 07:58:27 +00:00
|
|
|
if (ac_coefficient < (1 << (coeff_length - 1)))
|
|
|
|
ac_coefficient -= (1 << coeff_length) - 1;
|
|
|
|
|
|
|
|
select_component[zigzag_map[j++]] = ac_coefficient;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<Vector<Macroblock>> decode_huffman_stream(JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
Vector<Macroblock> macroblocks;
|
|
|
|
macroblocks.resize(context.mblock_meta.padded_total);
|
|
|
|
|
2021-01-23 22:59:27 +00:00
|
|
|
if constexpr (JPG_DEBUG) {
|
2021-01-16 13:07:20 +00:00
|
|
|
dbgln("Image width: {}", context.frame.width);
|
|
|
|
dbgln("Image height: {}", context.frame.height);
|
|
|
|
dbgln("Macroblocks in a row: {}", context.mblock_meta.hpadded_count);
|
|
|
|
dbgln("Macroblocks in a column: {}", context.mblock_meta.vpadded_count);
|
|
|
|
dbgln("Macroblock meta padded total: {}", context.mblock_meta.padded_total);
|
|
|
|
}
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
// Compute huffman codes for DC and AC tables.
|
2020-11-30 03:51:22 +00:00
|
|
|
for (auto it = context.dc_tables.begin(); it != context.dc_tables.end(); ++it)
|
|
|
|
generate_huffman_codes(it->value);
|
2020-05-18 07:58:27 +00:00
|
|
|
|
2020-11-30 03:51:22 +00:00
|
|
|
for (auto it = context.ac_tables.begin(); it != context.ac_tables.end(); ++it)
|
|
|
|
generate_huffman_codes(it->value);
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
for (u32 vcursor = 0; vcursor < context.mblock_meta.vcount; vcursor += context.vsample_factor) {
|
|
|
|
for (u32 hcursor = 0; hcursor < context.mblock_meta.hcount; hcursor += context.hsample_factor) {
|
|
|
|
u32 i = vcursor * context.mblock_meta.hpadded_count + hcursor;
|
|
|
|
if (context.dc_reset_interval > 0) {
|
|
|
|
if (i % context.dc_reset_interval == 0) {
|
|
|
|
context.previous_dc_values[0] = 0;
|
|
|
|
context.previous_dc_values[1] = 0;
|
|
|
|
context.previous_dc_values[2] = 0;
|
|
|
|
|
|
|
|
// Restart markers are stored in byte boundaries. Advance the huffman stream cursor to
|
|
|
|
// the 0th bit of the next byte.
|
|
|
|
if (context.huffman_stream.byte_offset < context.huffman_stream.stream.size()) {
|
|
|
|
if (context.huffman_stream.bit_offset > 0) {
|
|
|
|
context.huffman_stream.bit_offset = 0;
|
|
|
|
context.huffman_stream.byte_offset++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Skip the restart marker (RSTn).
|
|
|
|
context.huffman_stream.byte_offset++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
if (auto result = build_macroblocks(context, macroblocks, hcursor, vcursor); result.is_error()) {
|
2021-01-23 22:59:27 +00:00
|
|
|
if constexpr (JPG_DEBUG) {
|
2021-01-16 13:07:20 +00:00
|
|
|
dbgln("Failed to build Macroblock {}", i);
|
|
|
|
dbgln("Huffman stream byte offset {}", context.huffman_stream.byte_offset);
|
|
|
|
dbgln("Huffman stream bit offset {}", context.huffman_stream.bit_offset);
|
|
|
|
}
|
2022-12-22 07:00:54 +00:00
|
|
|
return result.release_error();
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return macroblocks;
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static inline ErrorOr<void> ensure_bounds_okay(const size_t cursor, const size_t delta, const size_t bound)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
2022-04-17 03:30:06 +00:00
|
|
|
if (Checked<size_t>::addition_would_overflow(delta, cursor))
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Bounds are not ok: addition would overflow");
|
|
|
|
if (delta + cursor >= bound)
|
|
|
|
return Error::from_string_literal("Bounds are not ok");
|
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool is_valid_marker(const Marker marker)
|
|
|
|
{
|
|
|
|
if (marker >= JPG_APPN0 && marker <= JPG_APPNF) {
|
2021-01-16 13:07:20 +00:00
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
if (marker != JPG_APPN0)
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{:#04x} not supported yet. The decoder may fail!", marker);
|
2020-05-18 07:58:27 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (marker >= JPG_RESERVED1 && marker <= JPG_RESERVEDD)
|
|
|
|
return true;
|
|
|
|
if (marker >= JPG_RST0 && marker <= JPG_RST7)
|
|
|
|
return true;
|
|
|
|
switch (marker) {
|
|
|
|
case JPG_COM:
|
|
|
|
case JPG_DHP:
|
|
|
|
case JPG_EXP:
|
|
|
|
case JPG_DHT:
|
|
|
|
case JPG_DQT:
|
|
|
|
case JPG_RST:
|
|
|
|
case JPG_SOF0:
|
|
|
|
case JPG_SOI:
|
|
|
|
case JPG_SOS:
|
|
|
|
return true;
|
|
|
|
}
|
2020-07-15 07:46:29 +00:00
|
|
|
|
|
|
|
if (marker >= 0xFFC0 && marker <= 0xFFCF) {
|
|
|
|
if (marker != 0xFFC4 && marker != 0xFFC8 && marker != 0xFFCC) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "Decoding this frame-type (SOF{}) is not currently supported. Decoder will fail!", marker & 0xf);
|
2020-07-15 07:46:29 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2020-09-20 10:50:07 +00:00
|
|
|
static inline u16 read_be_word(InputMemoryStream& stream)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
2020-09-20 10:50:07 +00:00
|
|
|
BigEndian<u16> tmp;
|
|
|
|
stream >> tmp;
|
|
|
|
return tmp;
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2020-09-20 10:50:07 +00:00
|
|
|
static inline Marker read_marker_at_cursor(InputMemoryStream& stream)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
u16 marker = read_be_word(stream);
|
2020-09-20 10:50:07 +00:00
|
|
|
if (stream.handle_any_error())
|
2020-05-18 07:58:27 +00:00
|
|
|
return JPG_INVALID;
|
|
|
|
if (is_valid_marker(marker))
|
|
|
|
return marker;
|
|
|
|
if (marker != 0xFFFF)
|
|
|
|
return JPG_INVALID;
|
|
|
|
u8 next;
|
|
|
|
do {
|
|
|
|
stream >> next;
|
2020-09-20 10:50:07 +00:00
|
|
|
if (stream.handle_any_error() || next == 0x00)
|
2020-05-18 07:58:27 +00:00
|
|
|
return JPG_INVALID;
|
|
|
|
} while (next == 0xFF);
|
|
|
|
marker = 0xFF00 | (u16)next;
|
|
|
|
return is_valid_marker(marker) ? marker : JPG_INVALID;
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> read_start_of_scan(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
if (context.state < JPGLoadingContext::State::FrameDecoded) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: SOS found before reading a SOF!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("SOS found before reading a SOF");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
u16 bytes_to_read = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
bytes_to_read -= 2;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(ensure_bounds_okay(stream.offset(), bytes_to_read, context.data_size));
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 component_count = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> component_count;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
if (component_count != context.component_count) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported number of components: {}!", stream.offset(), component_count);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported number of components");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < component_count; i++) {
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 component_id = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> component_id;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
auto& component = context.components[i];
|
|
|
|
if (component.id != component_id) {
|
|
|
|
dbgln("JPEG decode failed (component.id != component_id)");
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("JPEG decode failed (component.id != component_id)");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 table_ids = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> table_ids;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-09-10 09:20:04 +00:00
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
component.dc_destination_id = table_ids >> 4;
|
|
|
|
component.ac_destination_id = table_ids & 0x0F;
|
2020-09-10 09:20:04 +00:00
|
|
|
|
|
|
|
if (context.dc_tables.size() != context.ac_tables.size()) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: DC & AC table count mismatch!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("DC & AC table count mismatch");
|
2020-09-10 09:20:04 +00:00
|
|
|
}
|
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
if (!context.dc_tables.contains(component.dc_destination_id)) {
|
|
|
|
dbgln_if(JPG_DEBUG, "DC table (id: {}) does not exist!", component.dc_destination_id);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("DC table does not exist");
|
2020-09-10 09:20:04 +00:00
|
|
|
}
|
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
if (!context.ac_tables.contains(component.ac_destination_id)) {
|
|
|
|
dbgln_if(JPG_DEBUG, "AC table (id: {}) does not exist!", component.ac_destination_id);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("AC table does not exist");
|
2020-09-10 09:20:04 +00:00
|
|
|
}
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 spectral_selection_start = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> spectral_selection_start;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 spectral_selection_end = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> spectral_selection_end;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 successive_approximation = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> successive_approximation;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
// The three values should be fixed for baseline JPEGs utilizing sequential DCT.
|
|
|
|
if (spectral_selection_start != 0 || spectral_selection_end != 63 || successive_approximation != 0) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: ERROR! Start of Selection: {}, End of Selection: {}, Successive Approximation: {}!",
|
2021-01-16 13:07:20 +00:00
|
|
|
stream.offset(),
|
|
|
|
spectral_selection_start,
|
|
|
|
spectral_selection_end,
|
|
|
|
successive_approximation);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Spectral selection is not [0,63] or successive approximation is not null");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> read_reset_marker(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
u16 bytes_to_read = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
bytes_to_read -= 2;
|
|
|
|
if (bytes_to_read != 2) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Malformed reset marker found!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Malformed reset marker found");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
context.dc_reset_interval = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> read_huffman_table(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
i32 bytes_to_read = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
|
|
|
TRY(ensure_bounds_okay(stream.offset(), bytes_to_read, context.data_size));
|
2020-05-18 07:58:27 +00:00
|
|
|
bytes_to_read -= 2;
|
|
|
|
while (bytes_to_read > 0) {
|
|
|
|
HuffmanTableSpec table;
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 table_info = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> table_info;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
u8 table_type = table_info >> 4;
|
|
|
|
u8 table_destination_id = table_info & 0x0F;
|
|
|
|
if (table_type > 1) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unrecognized huffman table: {}!", stream.offset(), table_type);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unrecognized huffman table");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2020-09-10 09:20:04 +00:00
|
|
|
if (table_destination_id > 1) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Invalid huffman table destination id: {}!", stream.offset(), table_destination_id);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Invalid huffman table destination id");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2020-11-30 03:51:22 +00:00
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
table.type = table_type;
|
|
|
|
table.destination_id = table_destination_id;
|
|
|
|
u32 total_codes = 0;
|
|
|
|
|
|
|
|
// Read code counts. At each index K, the value represents the number of K+1 bit codes in this header.
|
|
|
|
for (int i = 0; i < 16; i++) {
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 count = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> count;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
total_codes += count;
|
|
|
|
table.code_counts[i] = count;
|
|
|
|
}
|
|
|
|
|
|
|
|
table.codes.ensure_capacity(total_codes);
|
|
|
|
|
|
|
|
// Read symbols. Read X bytes, where X is the sum of the counts of codes read in the previous step.
|
|
|
|
for (u32 i = 0; i < total_codes; i++) {
|
2020-07-23 18:34:53 +00:00
|
|
|
u8 symbol = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> symbol;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
table.symbols.append(symbol);
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-07-23 18:34:53 +00:00
|
|
|
|
2020-11-30 03:51:22 +00:00
|
|
|
auto& huffman_table = table.type == 0 ? context.dc_tables : context.ac_tables;
|
|
|
|
huffman_table.set(table.destination_id, table);
|
2021-02-23 19:42:32 +00:00
|
|
|
VERIFY(huffman_table.size() <= 2);
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
bytes_to_read -= 1 + 16 + total_codes;
|
|
|
|
}
|
2020-09-10 09:20:04 +00:00
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
if (bytes_to_read != 0) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Extra bytes detected in huffman header!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Extra bytes detected in huffman header");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-04-01 17:58:27 +00:00
|
|
|
static inline bool validate_luma_and_modify_context(ComponentSpec const& luma, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
if ((luma.hsample_factor == 1 || luma.hsample_factor == 2) && (luma.vsample_factor == 1 || luma.vsample_factor == 2)) {
|
|
|
|
context.mblock_meta.hpadded_count += luma.hsample_factor == 1 ? 0 : context.mblock_meta.hcount % 2;
|
|
|
|
context.mblock_meta.vpadded_count += luma.vsample_factor == 1 ? 0 : context.mblock_meta.vcount % 2;
|
|
|
|
context.mblock_meta.padded_total = context.mblock_meta.hpadded_count * context.mblock_meta.vpadded_count;
|
|
|
|
// For easy reference to relevant sample factors.
|
|
|
|
context.hsample_factor = luma.hsample_factor;
|
|
|
|
context.vsample_factor = luma.vsample_factor;
|
2021-01-16 13:07:20 +00:00
|
|
|
|
2021-01-23 22:59:27 +00:00
|
|
|
if constexpr (JPG_DEBUG) {
|
2021-01-16 13:07:20 +00:00
|
|
|
dbgln("Horizontal Subsampling Factor: {}", luma.hsample_factor);
|
|
|
|
dbgln("Vertical Subsampling Factor: {}", luma.vsample_factor);
|
|
|
|
}
|
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void set_macroblock_metadata(JPGLoadingContext& context)
|
|
|
|
{
|
|
|
|
context.mblock_meta.hcount = (context.frame.width + 7) / 8;
|
|
|
|
context.mblock_meta.vcount = (context.frame.height + 7) / 8;
|
|
|
|
context.mblock_meta.hpadded_count = context.mblock_meta.hcount;
|
|
|
|
context.mblock_meta.vpadded_count = context.mblock_meta.vcount;
|
|
|
|
context.mblock_meta.total = context.mblock_meta.hcount * context.mblock_meta.vcount;
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> read_start_of_frame(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
if (context.state == JPGLoadingContext::FrameDecoded) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: SOF repeated!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("SOF repeated");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
i32 bytes_to_read = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
bytes_to_read -= 2;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(ensure_bounds_okay(stream.offset(), bytes_to_read, context.data_size));
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
stream >> context.frame.precision;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
if (context.frame.precision != 8) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: SOF precision != 8!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("SOF precision != 8");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
context.frame.height = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
context.frame.width = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
if (!context.frame.width || !context.frame.height) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: ERROR! Image height: {}, Image width: {}!", stream.offset(), context.frame.height, context.frame.width);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Image frame height of width null");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2020-12-24 23:19:06 +00:00
|
|
|
|
|
|
|
if (context.frame.width > maximum_width_for_decoded_images || context.frame.height > maximum_height_for_decoded_images) {
|
|
|
|
dbgln("This JPEG is too large for comfort: {}x{}", context.frame.width, context.frame.height);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("JPEG too large for comfort");
|
2020-12-24 23:19:06 +00:00
|
|
|
}
|
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
set_macroblock_metadata(context);
|
|
|
|
|
|
|
|
stream >> context.component_count;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
if (context.component_count != 1 && context.component_count != 3) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported number of components in SOF: {}!", stream.offset(), context.component_count);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported number of components in SOF");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2020-11-29 08:52:42 +00:00
|
|
|
for (u8 i = 0; i < context.component_count; i++) {
|
|
|
|
ComponentSpec component;
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
stream >> component.id;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
|
2020-07-23 18:34:53 +00:00
|
|
|
u8 subsample_factors = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> subsample_factors;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
component.hsample_factor = subsample_factors >> 4;
|
|
|
|
component.vsample_factor = subsample_factors & 0x0F;
|
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
if (i == 0) {
|
2022-02-19 20:05:05 +00:00
|
|
|
// If there is only a single component, i.e. grayscale, the macroblocks will not be interleaved, even if
|
|
|
|
// the horizontal or vertical sample factor is larger than 1.
|
|
|
|
if (context.component_count == 1) {
|
|
|
|
component.hsample_factor = 1;
|
|
|
|
component.vsample_factor = 1;
|
|
|
|
}
|
2020-05-18 07:58:27 +00:00
|
|
|
// By convention, downsampling is applied only on chroma components. So we should
|
|
|
|
// hope to see the maximum sampling factor in the luma component.
|
|
|
|
if (!validate_luma_and_modify_context(component, context)) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported luma subsampling factors: horizontal: {}, vertical: {}",
|
2021-01-16 13:07:20 +00:00
|
|
|
stream.offset(),
|
|
|
|
component.hsample_factor,
|
|
|
|
component.vsample_factor);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported luma subsampling factors");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (component.hsample_factor != 1 || component.vsample_factor != 1) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported chroma subsampling factors: horizontal: {}, vertical: {}",
|
2021-01-16 13:07:20 +00:00
|
|
|
stream.offset(),
|
|
|
|
component.hsample_factor,
|
|
|
|
component.vsample_factor);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported chroma subsampling factors");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
stream >> component.qtable_id;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
if (component.qtable_id > 1) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported quantization table id: {}!", stream.offset(), component.qtable_id);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported quantization table id");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2020-11-29 08:52:42 +00:00
|
|
|
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
context.components.append(move(component));
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2020-11-29 08:52:42 +00:00
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> read_quantization_table(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
i32 bytes_to_read = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
bytes_to_read -= 2;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(ensure_bounds_okay(stream.offset(), bytes_to_read, context.data_size));
|
2020-05-18 07:58:27 +00:00
|
|
|
while (bytes_to_read > 0) {
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 info_byte = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> info_byte;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
u8 element_unit_hint = info_byte >> 4;
|
|
|
|
if (element_unit_hint > 1) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported unit hint in quantization table: {}!", stream.offset(), element_unit_hint);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported unit hint in quantization table");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
u8 table_id = info_byte & 0x0F;
|
|
|
|
if (table_id > 1) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unsupported quantization table id: {}!", stream.offset(), table_id);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unsupported quantization table id");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
u32* table = table_id == 0 ? context.luma_table : context.chroma_table;
|
|
|
|
for (int i = 0; i < 64; i++) {
|
|
|
|
if (element_unit_hint == 0) {
|
2020-07-23 18:34:53 +00:00
|
|
|
u8 tmp = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> tmp;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
table[zigzag_map[i]] = tmp;
|
2020-11-19 17:13:30 +00:00
|
|
|
} else {
|
2020-05-18 07:58:27 +00:00
|
|
|
table[zigzag_map[i]] = read_be_word(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-11-19 17:13:30 +00:00
|
|
|
}
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-07-23 18:34:53 +00:00
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
bytes_to_read -= 1 + (element_unit_hint == 0 ? 64 : 128);
|
|
|
|
}
|
|
|
|
if (bytes_to_read != 0) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Invalid length for one or more quantization tables!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Invalid length for one or more quantization tables");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> skip_marker_with_length(InputMemoryStream& stream)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
u16 bytes_to_skip = read_be_word(stream);
|
|
|
|
bytes_to_skip -= 2;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-09-20 10:50:07 +00:00
|
|
|
stream.discard_or_error(bytes_to_skip);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2020-08-10 22:09:28 +00:00
|
|
|
static void dequantize(JPGLoadingContext& context, Vector<Macroblock>& macroblocks)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
for (u32 vcursor = 0; vcursor < context.mblock_meta.vcount; vcursor += context.vsample_factor) {
|
|
|
|
for (u32 hcursor = 0; hcursor < context.mblock_meta.hcount; hcursor += context.hsample_factor) {
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
for (u32 i = 0; i < context.component_count; i++) {
|
|
|
|
auto& component = context.components[i];
|
2022-04-01 17:58:27 +00:00
|
|
|
u32 const* table = component.qtable_id == 0 ? context.luma_table : context.chroma_table;
|
2020-05-18 07:58:27 +00:00
|
|
|
for (u32 vfactor_i = 0; vfactor_i < component.vsample_factor; vfactor_i++) {
|
|
|
|
for (u32 hfactor_i = 0; hfactor_i < component.hsample_factor; hfactor_i++) {
|
|
|
|
u32 mb_index = (vcursor + vfactor_i) * context.mblock_meta.hpadded_count + (hfactor_i + hcursor);
|
|
|
|
Macroblock& block = macroblocks[mb_index];
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
int* block_component = get_component(block, i);
|
2020-05-18 07:58:27 +00:00
|
|
|
for (u32 k = 0; k < 64; k++)
|
|
|
|
block_component[k] *= table[k];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-04-01 17:58:27 +00:00
|
|
|
static void inverse_dct(JPGLoadingContext const& context, Vector<Macroblock>& macroblocks)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
2022-04-01 11:49:02 +00:00
|
|
|
static float const m0 = 2.0f * AK::cos(1.0f / 16.0f * 2.0f * AK::Pi<float>);
|
|
|
|
static float const m1 = 2.0f * AK::cos(2.0f / 16.0f * 2.0f * AK::Pi<float>);
|
|
|
|
static float const m3 = 2.0f * AK::cos(2.0f / 16.0f * 2.0f * AK::Pi<float>);
|
|
|
|
static float const m5 = 2.0f * AK::cos(3.0f / 16.0f * 2.0f * AK::Pi<float>);
|
2022-04-01 17:58:27 +00:00
|
|
|
static float const m2 = m0 - m5;
|
|
|
|
static float const m4 = m0 + m5;
|
2022-04-01 11:49:02 +00:00
|
|
|
static float const s0 = AK::cos(0.0f / 16.0f * AK::Pi<float>) * AK::rsqrt(8.0f);
|
|
|
|
static float const s1 = AK::cos(1.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
|
|
|
static float const s2 = AK::cos(2.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
|
|
|
static float const s3 = AK::cos(3.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
|
|
|
static float const s4 = AK::cos(4.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
|
|
|
static float const s5 = AK::cos(5.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
|
|
|
static float const s6 = AK::cos(6.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
|
|
|
static float const s7 = AK::cos(7.0f / 16.0f * AK::Pi<float>) / 2.0f;
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
for (u32 vcursor = 0; vcursor < context.mblock_meta.vcount; vcursor += context.vsample_factor) {
|
|
|
|
for (u32 hcursor = 0; hcursor < context.mblock_meta.hcount; hcursor += context.hsample_factor) {
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
for (u32 component_i = 0; component_i < context.component_count; component_i++) {
|
|
|
|
auto& component = context.components[component_i];
|
2020-05-18 07:58:27 +00:00
|
|
|
for (u8 vfactor_i = 0; vfactor_i < component.vsample_factor; vfactor_i++) {
|
|
|
|
for (u8 hfactor_i = 0; hfactor_i < component.hsample_factor; hfactor_i++) {
|
|
|
|
u32 mb_index = (vcursor + vfactor_i) * context.mblock_meta.hpadded_count + (hfactor_i + hcursor);
|
|
|
|
Macroblock& block = macroblocks[mb_index];
|
LibGfx: Make JPGLoader iterate components deterministically
JPGLoader used to store component information in a HashTable, indexed
by the ID assigned by the JPEG file. This was fine for most purposes,
however after f89e8fb7 this was revealed to be a flawed implementation
which causes non-deterministic iteration over components.
This issue was previously masked by a perfect storm of int_hash being
stable for the integer values 0, 1 and 2; and AK::HashTable having just
the right amount of buckets for the components to be ordered correctly
after being hashed with int_hash. However, after f89e8fb7,
malloc_good_size was used for determining the amount of space for
allocation; this caused the ordering of the components to change, and
images started showing up with the red and blue channels reversed. The
issue was finally determined to be inconsistent ordering after randomly
changing the order of the components caused Huffman decoding to fail.
This was the result of about 10 hours of hair-pulling and repeatedly
doing full rebuilds due to bisecting between commits that touched AK.
Gunnar, I like you, but please don't make me go through this again. :^)
Credits to Andrew Kaster, bgianf, CxByte and Gunnar for the debugging
help.
2021-05-31 15:22:04 +00:00
|
|
|
i32* block_component = get_component(block, component_i);
|
2020-05-18 07:58:27 +00:00
|
|
|
for (u32 k = 0; k < 8; ++k) {
|
2022-04-01 17:58:27 +00:00
|
|
|
float const g0 = block_component[0 * 8 + k] * s0;
|
|
|
|
float const g1 = block_component[4 * 8 + k] * s4;
|
|
|
|
float const g2 = block_component[2 * 8 + k] * s2;
|
|
|
|
float const g3 = block_component[6 * 8 + k] * s6;
|
|
|
|
float const g4 = block_component[5 * 8 + k] * s5;
|
|
|
|
float const g5 = block_component[1 * 8 + k] * s1;
|
|
|
|
float const g6 = block_component[7 * 8 + k] * s7;
|
|
|
|
float const g7 = block_component[3 * 8 + k] * s3;
|
|
|
|
|
|
|
|
float const f0 = g0;
|
|
|
|
float const f1 = g1;
|
|
|
|
float const f2 = g2;
|
|
|
|
float const f3 = g3;
|
|
|
|
float const f4 = g4 - g7;
|
|
|
|
float const f5 = g5 + g6;
|
|
|
|
float const f6 = g5 - g6;
|
|
|
|
float const f7 = g4 + g7;
|
|
|
|
|
|
|
|
float const e0 = f0;
|
|
|
|
float const e1 = f1;
|
|
|
|
float const e2 = f2 - f3;
|
|
|
|
float const e3 = f2 + f3;
|
|
|
|
float const e4 = f4;
|
|
|
|
float const e5 = f5 - f7;
|
|
|
|
float const e6 = f6;
|
|
|
|
float const e7 = f5 + f7;
|
|
|
|
float const e8 = f4 + f6;
|
|
|
|
|
|
|
|
float const d0 = e0;
|
|
|
|
float const d1 = e1;
|
|
|
|
float const d2 = e2 * m1;
|
|
|
|
float const d3 = e3;
|
|
|
|
float const d4 = e4 * m2;
|
|
|
|
float const d5 = e5 * m3;
|
|
|
|
float const d6 = e6 * m4;
|
|
|
|
float const d7 = e7;
|
|
|
|
float const d8 = e8 * m5;
|
|
|
|
|
|
|
|
float const c0 = d0 + d1;
|
|
|
|
float const c1 = d0 - d1;
|
|
|
|
float const c2 = d2 - d3;
|
|
|
|
float const c3 = d3;
|
|
|
|
float const c4 = d4 + d8;
|
|
|
|
float const c5 = d5 + d7;
|
|
|
|
float const c6 = d6 - d8;
|
|
|
|
float const c7 = d7;
|
|
|
|
float const c8 = c5 - c6;
|
|
|
|
|
|
|
|
float const b0 = c0 + c3;
|
|
|
|
float const b1 = c1 + c2;
|
|
|
|
float const b2 = c1 - c2;
|
|
|
|
float const b3 = c0 - c3;
|
|
|
|
float const b4 = c4 - c8;
|
|
|
|
float const b5 = c8;
|
|
|
|
float const b6 = c6 - c7;
|
|
|
|
float const b7 = c7;
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
block_component[0 * 8 + k] = b0 + b7;
|
|
|
|
block_component[1 * 8 + k] = b1 + b6;
|
|
|
|
block_component[2 * 8 + k] = b2 + b5;
|
|
|
|
block_component[3 * 8 + k] = b3 + b4;
|
|
|
|
block_component[4 * 8 + k] = b3 - b4;
|
|
|
|
block_component[5 * 8 + k] = b2 - b5;
|
|
|
|
block_component[6 * 8 + k] = b1 - b6;
|
|
|
|
block_component[7 * 8 + k] = b0 - b7;
|
|
|
|
}
|
|
|
|
for (u32 l = 0; l < 8; ++l) {
|
2022-04-01 17:58:27 +00:00
|
|
|
float const g0 = block_component[l * 8 + 0] * s0;
|
|
|
|
float const g1 = block_component[l * 8 + 4] * s4;
|
|
|
|
float const g2 = block_component[l * 8 + 2] * s2;
|
|
|
|
float const g3 = block_component[l * 8 + 6] * s6;
|
|
|
|
float const g4 = block_component[l * 8 + 5] * s5;
|
|
|
|
float const g5 = block_component[l * 8 + 1] * s1;
|
|
|
|
float const g6 = block_component[l * 8 + 7] * s7;
|
|
|
|
float const g7 = block_component[l * 8 + 3] * s3;
|
|
|
|
|
|
|
|
float const f0 = g0;
|
|
|
|
float const f1 = g1;
|
|
|
|
float const f2 = g2;
|
|
|
|
float const f3 = g3;
|
|
|
|
float const f4 = g4 - g7;
|
|
|
|
float const f5 = g5 + g6;
|
|
|
|
float const f6 = g5 - g6;
|
|
|
|
float const f7 = g4 + g7;
|
|
|
|
|
|
|
|
float const e0 = f0;
|
|
|
|
float const e1 = f1;
|
|
|
|
float const e2 = f2 - f3;
|
|
|
|
float const e3 = f2 + f3;
|
|
|
|
float const e4 = f4;
|
|
|
|
float const e5 = f5 - f7;
|
|
|
|
float const e6 = f6;
|
|
|
|
float const e7 = f5 + f7;
|
|
|
|
float const e8 = f4 + f6;
|
|
|
|
|
|
|
|
float const d0 = e0;
|
|
|
|
float const d1 = e1;
|
|
|
|
float const d2 = e2 * m1;
|
|
|
|
float const d3 = e3;
|
|
|
|
float const d4 = e4 * m2;
|
|
|
|
float const d5 = e5 * m3;
|
|
|
|
float const d6 = e6 * m4;
|
|
|
|
float const d7 = e7;
|
|
|
|
float const d8 = e8 * m5;
|
|
|
|
|
|
|
|
float const c0 = d0 + d1;
|
|
|
|
float const c1 = d0 - d1;
|
|
|
|
float const c2 = d2 - d3;
|
|
|
|
float const c3 = d3;
|
|
|
|
float const c4 = d4 + d8;
|
|
|
|
float const c5 = d5 + d7;
|
|
|
|
float const c6 = d6 - d8;
|
|
|
|
float const c7 = d7;
|
|
|
|
float const c8 = c5 - c6;
|
|
|
|
|
|
|
|
float const b0 = c0 + c3;
|
|
|
|
float const b1 = c1 + c2;
|
|
|
|
float const b2 = c1 - c2;
|
|
|
|
float const b3 = c0 - c3;
|
|
|
|
float const b4 = c4 - c8;
|
|
|
|
float const b5 = c8;
|
|
|
|
float const b6 = c6 - c7;
|
|
|
|
float const b7 = c7;
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
block_component[l * 8 + 0] = b0 + b7;
|
|
|
|
block_component[l * 8 + 1] = b1 + b6;
|
|
|
|
block_component[l * 8 + 2] = b2 + b5;
|
|
|
|
block_component[l * 8 + 3] = b3 + b4;
|
|
|
|
block_component[l * 8 + 4] = b3 - b4;
|
|
|
|
block_component[l * 8 + 5] = b2 - b5;
|
|
|
|
block_component[l * 8 + 6] = b1 - b6;
|
|
|
|
block_component[l * 8 + 7] = b0 - b7;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-04-01 17:58:27 +00:00
|
|
|
static void ycbcr_to_rgb(JPGLoadingContext const& context, Vector<Macroblock>& macroblocks)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
for (u32 vcursor = 0; vcursor < context.mblock_meta.vcount; vcursor += context.vsample_factor) {
|
|
|
|
for (u32 hcursor = 0; hcursor < context.mblock_meta.hcount; hcursor += context.hsample_factor) {
|
|
|
|
const u32 chroma_block_index = vcursor * context.mblock_meta.hpadded_count + hcursor;
|
2022-04-01 17:58:27 +00:00
|
|
|
Macroblock const& chroma = macroblocks[chroma_block_index];
|
2020-05-18 07:58:27 +00:00
|
|
|
// Overflows are intentional.
|
|
|
|
for (u8 vfactor_i = context.vsample_factor - 1; vfactor_i < context.vsample_factor; --vfactor_i) {
|
|
|
|
for (u8 hfactor_i = context.hsample_factor - 1; hfactor_i < context.hsample_factor; --hfactor_i) {
|
|
|
|
u32 mb_index = (vcursor + vfactor_i) * context.mblock_meta.hpadded_count + (hcursor + hfactor_i);
|
|
|
|
i32* y = macroblocks[mb_index].y;
|
|
|
|
i32* cb = macroblocks[mb_index].cb;
|
|
|
|
i32* cr = macroblocks[mb_index].cr;
|
|
|
|
for (u8 i = 7; i < 8; --i) {
|
|
|
|
for (u8 j = 7; j < 8; --j) {
|
|
|
|
const u8 pixel = i * 8 + j;
|
|
|
|
const u32 chroma_pxrow = (i / context.vsample_factor) + 4 * vfactor_i;
|
|
|
|
const u32 chroma_pxcol = (j / context.hsample_factor) + 4 * hfactor_i;
|
|
|
|
const u32 chroma_pixel = chroma_pxrow * 8 + chroma_pxcol;
|
|
|
|
int r = y[pixel] + 1.402f * chroma.cr[chroma_pixel] + 128;
|
|
|
|
int g = y[pixel] - 0.344f * chroma.cb[chroma_pixel] - 0.714f * chroma.cr[chroma_pixel] + 128;
|
|
|
|
int b = y[pixel] + 1.772f * chroma.cb[chroma_pixel] + 128;
|
|
|
|
y[pixel] = r < 0 ? 0 : (r > 255 ? 255 : r);
|
|
|
|
cb[pixel] = g < 0 ? 0 : (g > 255 ? 255 : g);
|
|
|
|
cr[pixel] = b < 0 ? 0 : (b > 255 ? 255 : b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> compose_bitmap(JPGLoadingContext& context, Vector<Macroblock> const& macroblocks)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
2022-12-22 07:00:54 +00:00
|
|
|
context.bitmap = TRY(Bitmap::try_create(BitmapFormat::BGRx8888, { context.frame.width, context.frame.height }));
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
for (u32 y = context.frame.height - 1; y < context.frame.height; y--) {
|
|
|
|
const u32 block_row = y / 8;
|
|
|
|
const u32 pixel_row = y % 8;
|
|
|
|
for (u32 x = 0; x < context.frame.width; x++) {
|
|
|
|
const u32 block_column = x / 8;
|
|
|
|
auto& block = macroblocks[block_row * context.mblock_meta.hpadded_count + block_column];
|
|
|
|
const u32 pixel_column = x % 8;
|
|
|
|
const u32 pixel_index = pixel_row * 8 + pixel_column;
|
|
|
|
const Color color { (u8)block.y[pixel_index], (u8)block.cb[pixel_index], (u8)block.cr[pixel_index] };
|
|
|
|
context.bitmap->set_pixel(x, y, color);
|
|
|
|
}
|
|
|
|
}
|
2020-12-20 15:04:29 +00:00
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> parse_header(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
auto marker = read_marker_at_cursor(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
if (marker != JPG_SOI) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: SOI not found: {:x}!", stream.offset(), marker);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("SOI not found");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
for (;;) {
|
|
|
|
marker = read_marker_at_cursor(stream);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-07-15 07:46:29 +00:00
|
|
|
|
|
|
|
// Set frame type if the marker marks a new frame.
|
|
|
|
if (marker >= 0xFFC0 && marker <= 0xFFCF) {
|
|
|
|
// Ignore interleaved markers.
|
|
|
|
if (marker != 0xFFC4 && marker != 0xFFC8 && marker != 0xFFCC) {
|
|
|
|
context.frame.type = static_cast<StartOfFrame::FrameType>(marker & 0xF);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
switch (marker) {
|
|
|
|
case JPG_INVALID:
|
|
|
|
case JPG_RST0:
|
|
|
|
case JPG_RST1:
|
|
|
|
case JPG_RST2:
|
|
|
|
case JPG_RST3:
|
|
|
|
case JPG_RST4:
|
|
|
|
case JPG_RST5:
|
|
|
|
case JPG_RST6:
|
|
|
|
case JPG_RST7:
|
|
|
|
case JPG_SOI:
|
|
|
|
case JPG_EOI:
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Unexpected marker {:x}!", stream.offset(), marker);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Unexpected marker");
|
2020-05-18 07:58:27 +00:00
|
|
|
case JPG_SOF0:
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(read_start_of_frame(stream, context));
|
2020-05-18 07:58:27 +00:00
|
|
|
context.state = JPGLoadingContext::FrameDecoded;
|
|
|
|
break;
|
|
|
|
case JPG_DQT:
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(read_quantization_table(stream, context));
|
2020-05-18 07:58:27 +00:00
|
|
|
break;
|
|
|
|
case JPG_RST:
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(read_reset_marker(stream, context));
|
2020-05-18 07:58:27 +00:00
|
|
|
break;
|
|
|
|
case JPG_DHT:
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(read_huffman_table(stream, context));
|
2020-05-18 07:58:27 +00:00
|
|
|
break;
|
|
|
|
case JPG_SOS:
|
|
|
|
return read_start_of_scan(stream, context);
|
|
|
|
default:
|
2022-12-22 07:00:54 +00:00
|
|
|
if (auto result = skip_marker_with_length(stream); result.is_error()) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Error skipping marker: {:x}!", stream.offset(), marker);
|
2022-12-22 07:00:54 +00:00
|
|
|
return result.release_error();
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-23 19:42:32 +00:00
|
|
|
VERIFY_NOT_REACHED();
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> scan_huffman_stream(InputMemoryStream& stream, JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
u8 last_byte;
|
2020-09-20 10:50:07 +00:00
|
|
|
u8 current_byte = 0;
|
2020-05-18 07:58:27 +00:00
|
|
|
stream >> current_byte;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
last_byte = current_byte;
|
|
|
|
stream >> current_byte;
|
2020-09-20 10:50:07 +00:00
|
|
|
if (stream.handle_any_error()) {
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: EOI not found!", stream.offset());
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("EOI not found");
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (last_byte == 0xFF) {
|
|
|
|
if (current_byte == 0xFF)
|
|
|
|
continue;
|
|
|
|
if (current_byte == 0x00) {
|
|
|
|
stream >> current_byte;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
context.huffman_stream.stream.append(last_byte);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
Marker marker = 0xFF00 | current_byte;
|
|
|
|
if (marker == JPG_EOI)
|
2022-12-22 07:00:54 +00:00
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
if (marker >= JPG_RST0 && marker <= JPG_RST7) {
|
|
|
|
context.huffman_stream.stream.append(marker);
|
|
|
|
stream >> current_byte;
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(stream.try_handle_any_error());
|
2020-05-18 07:58:27 +00:00
|
|
|
continue;
|
|
|
|
}
|
2021-02-07 12:03:24 +00:00
|
|
|
dbgln_if(JPG_DEBUG, "{}: Invalid marker: {:x}!", stream.offset(), marker);
|
2022-12-22 07:00:54 +00:00
|
|
|
return Error::from_string_literal("Invalid marker");
|
2020-05-18 07:58:27 +00:00
|
|
|
} else {
|
|
|
|
context.huffman_stream.stream.append(last_byte);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-23 19:42:32 +00:00
|
|
|
VERIFY_NOT_REACHED();
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
static ErrorOr<void> decode_jpg(JPGLoadingContext& context)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
2020-09-20 10:50:07 +00:00
|
|
|
InputMemoryStream stream { { context.data, context.data_size } };
|
|
|
|
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(parse_header(stream, context));
|
|
|
|
TRY(scan_huffman_stream(stream, context));
|
|
|
|
auto macroblocks = TRY(decode_huffman_stream(context));
|
2020-05-18 07:58:27 +00:00
|
|
|
dequantize(context, macroblocks);
|
|
|
|
inverse_dct(context, macroblocks);
|
|
|
|
ycbcr_to_rgb(context, macroblocks);
|
2022-12-22 07:00:54 +00:00
|
|
|
TRY(compose_bitmap(context, macroblocks));
|
|
|
|
return {};
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-04-01 17:58:27 +00:00
|
|
|
JPGImageDecoderPlugin::JPGImageDecoderPlugin(u8 const* data, size_t size)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
m_context = make<JPGLoadingContext>();
|
2020-06-22 07:03:56 +00:00
|
|
|
m_context->data = data;
|
|
|
|
m_context->data_size = size;
|
AK: Rename KB, MB, GB to KiB, MiB, GiB
The SI prefixes "k", "M", "G" mean "10^3", "10^6", "10^9".
The IEC prefixes "Ki", "Mi", "Gi" mean "2^10", "2^20", "2^30".
Let's use the correct name, at least in code.
Only changes the name of the constants, no other behavior change.
2020-08-15 17:55:00 +00:00
|
|
|
m_context->huffman_stream.stream.ensure_capacity(50 * KiB);
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
2022-03-14 19:26:37 +00:00
|
|
|
JPGImageDecoderPlugin::~JPGImageDecoderPlugin() = default;
|
2020-05-18 07:58:27 +00:00
|
|
|
|
|
|
|
IntSize JPGImageDecoderPlugin::size()
|
|
|
|
{
|
|
|
|
if (m_context->state == JPGLoadingContext::State::Error)
|
|
|
|
return {};
|
|
|
|
if (m_context->state >= JPGLoadingContext::State::FrameDecoded)
|
|
|
|
return { m_context->frame.width, m_context->frame.height };
|
|
|
|
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
|
|
|
|
void JPGImageDecoderPlugin::set_volatile()
|
|
|
|
{
|
|
|
|
if (m_context->bitmap)
|
|
|
|
m_context->bitmap->set_volatile();
|
|
|
|
}
|
|
|
|
|
2021-07-24 20:49:48 +00:00
|
|
|
bool JPGImageDecoderPlugin::set_nonvolatile(bool& was_purged)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
|
|
|
if (!m_context->bitmap)
|
|
|
|
return false;
|
2021-07-24 20:49:48 +00:00
|
|
|
return m_context->bitmap->set_nonvolatile(was_purged);
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool JPGImageDecoderPlugin::sniff()
|
|
|
|
{
|
2020-06-22 07:03:56 +00:00
|
|
|
return m_context->data_size > 3
|
|
|
|
&& m_context->data[0] == 0xFF
|
|
|
|
&& m_context->data[1] == 0xD8
|
|
|
|
&& m_context->data[2] == 0xFF;
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool JPGImageDecoderPlugin::is_animated()
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t JPGImageDecoderPlugin::loop_count()
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t JPGImageDecoderPlugin::frame_count()
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2021-11-20 13:29:33 +00:00
|
|
|
ErrorOr<ImageFrameDescriptor> JPGImageDecoderPlugin::frame(size_t index)
|
2020-05-18 07:58:27 +00:00
|
|
|
{
|
2021-11-20 13:29:33 +00:00
|
|
|
if (index > 0)
|
2022-07-11 17:57:32 +00:00
|
|
|
return Error::from_string_literal("JPGImageDecoderPlugin: Invalid frame index");
|
2021-11-18 12:47:29 +00:00
|
|
|
|
|
|
|
if (m_context->state == JPGLoadingContext::State::Error)
|
2022-07-11 17:57:32 +00:00
|
|
|
return Error::from_string_literal("JPGImageDecoderPlugin: Decoding failed");
|
2021-11-18 12:47:29 +00:00
|
|
|
|
|
|
|
if (m_context->state < JPGLoadingContext::State::BitmapDecoded) {
|
2022-12-22 07:00:54 +00:00
|
|
|
if (auto result = decode_jpg(*m_context); result.is_error()) {
|
2021-11-18 12:47:29 +00:00
|
|
|
m_context->state = JPGLoadingContext::State::Error;
|
2022-12-22 07:00:54 +00:00
|
|
|
return result.release_error();
|
2021-11-18 12:47:29 +00:00
|
|
|
}
|
|
|
|
m_context->state = JPGLoadingContext::State::BitmapDecoded;
|
|
|
|
}
|
|
|
|
|
2021-11-20 13:29:33 +00:00
|
|
|
return ImageFrameDescriptor { m_context->bitmap, 0 };
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|
2021-07-26 23:29:50 +00:00
|
|
|
|
2020-05-18 07:58:27 +00:00
|
|
|
}
|