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

LibGfx: Put the code to reset the encoder in its own function

Browse source 
With it, we can also add a spec reference. And it will remind to anyone
who wants to add support for a new coding to not forget to update it.
This commit is contained in:
Lucas CHOLLET 2023-02-20 00:28:17 -05:00 • committed by Andreas Kling
parent 3fefb696a3
commit 8ed630a7ec
1 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibGfx/JPEGLoader.cpp
View file

@ -363,6 +363,31 @@ static ErrorOr<void> build_macroblocks(JPEGLoadingContext& context, Vector<Macro
return {}; return {};
} }
static bool is_dct_based(StartOfFrame::FrameType frame_type)
{
return frame_type == StartOfFrame::FrameType::Baseline_DCT
|| frame_type == StartOfFrame::FrameType::Extended_Sequential_DCT
|| frame_type == StartOfFrame::FrameType::Progressive_DCT
|| frame_type == StartOfFrame::FrameType::Differential_Sequential_DCT
|| frame_type == StartOfFrame::FrameType::Differential_Progressive_DCT
|| frame_type == StartOfFrame::FrameType::Progressive_DCT_Arithmetic
|| frame_type == StartOfFrame::FrameType::Differential_Sequential_DCT_Arithmetic
|| frame_type == StartOfFrame::FrameType::Differential_Progressive_DCT_Arithmetic;
}
static void reset_decoder(JPEGLoadingContext& context)
{
// E.2.4 Control procedure for decoding a restart interval
if (is_dct_based(context.frame.type)) {
context.previous_dc_values[0] = 0;
context.previous_dc_values[1] = 0;
context.previous_dc_values[2] = 0;
return;
}
VERIFY_NOT_REACHED();
}
static ErrorOr<void> decode_huffman_stream(JPEGLoadingContext& context, Vector<Macroblock>& macroblocks) static ErrorOr<void> decode_huffman_stream(JPEGLoadingContext& context, Vector<Macroblock>& macroblocks)
{ {
if constexpr (JPEG_DEBUG) { if constexpr (JPEG_DEBUG) {
@ -385,9 +410,7 @@ static ErrorOr<void> decode_huffman_stream(JPEGLoadingContext& context, Vector<M
u32 i = vcursor * context.mblock_meta.hpadded_count + hcursor; u32 i = vcursor * context.mblock_meta.hpadded_count + hcursor;
if (context.dc_restart_interval > 0) { if (context.dc_restart_interval > 0) {
if (i != 0 && i % (context.dc_restart_interval * context.vsample_factor * context.hsample_factor) == 0) { if (i != 0 && i % (context.dc_restart_interval * context.vsample_factor * context.hsample_factor) == 0) {
context.previous_dc_values[0] = 0; reset_decoder(context);
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 // Restart markers are stored in byte boundaries. Advance the huffman stream cursor to
// the 0th bit of the next byte. // the 0th bit of the next byte.