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

LibGfx: Make decode_huffman_stream take macroblocks by reference

Browse source 
In progressive mode, this functions will need to be called multiple time
on the same macroblocks, so it shouldn't create the vector every
time it's called.
This commit is contained in:
Lucas CHOLLET 2023-02-19 23:48:25 -05:00 • committed by Andreas Kling
parent bae37676c2
commit 3fefb696a3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -363,11 +363,8 @@ static ErrorOr<void> build_macroblocks(JPEGLoadingContext& context, Vector<Macro
return {}; return {};
} }
static ErrorOr<Vector<Macroblock>> decode_huffman_stream(JPEGLoadingContext& context) static ErrorOr<void> decode_huffman_stream(JPEGLoadingContext& context, Vector<Macroblock>& macroblocks)
{ {
Vector<Macroblock> macroblocks;
macroblocks.resize(context.mblock_meta.padded_total);
if constexpr (JPEG_DEBUG) { if constexpr (JPEG_DEBUG) {
dbgln("Image width: {}", context.frame.width); dbgln("Image width: {}", context.frame.width);
dbgln("Image height: {}", context.frame.height); dbgln("Image height: {}", context.frame.height);
@ -416,8 +413,7 @@ static ErrorOr<Vector<Macroblock>> decode_huffman_stream(JPEGLoadingContext& con
} }
} }
} }
return {};
return macroblocks;
} }
static inline ErrorOr<void> ensure_bounds_okay(const size_t cursor, const size_t delta, const size_t bound) static inline ErrorOr<void> ensure_bounds_okay(const size_t cursor, const size_t delta, const size_t bound)
@ -1252,6 +1248,9 @@ static ErrorOr<Vector<Macroblock>> construct_macroblocks(JPEGLoadingContext& con
// See: Figure B.16 – Flow of compressed data syntax // See: Figure B.16 – Flow of compressed data syntax
// This function handles the "Multi-scan" loop. // This function handles the "Multi-scan" loop.
Vector<Macroblock> macroblocks;
macroblocks.resize(context.mblock_meta.padded_total);
Marker marker = TRY(read_marker_at_cursor(*context.stream)); Marker marker = TRY(read_marker_at_cursor(*context.stream));
while (true) { while (true) {
if (is_miscellaneous_or_table_marker(marker)) { if (is_miscellaneous_or_table_marker(marker)) {
@ -1259,7 +1258,8 @@ static ErrorOr<Vector<Macroblock>> construct_macroblocks(JPEGLoadingContext& con
} else if (marker == JPEG_SOS) { } else if (marker == JPEG_SOS) {
TRY(read_start_of_scan(*context.stream, context)); TRY(read_start_of_scan(*context.stream, context));
TRY(scan_huffman_stream(*context.stream, context)); TRY(scan_huffman_stream(*context.stream, context));
return TRY(decode_huffman_stream(context)); TRY(decode_huffman_stream(context, macroblocks));
return macroblocks;
} else { } else {
dbgln_if(JPEG_DEBUG, "{}: Unexpected marker {:x}!", TRY(context.stream->tell()), marker); dbgln_if(JPEG_DEBUG, "{}: Unexpected marker {:x}!", TRY(context.stream->tell()), marker);
return Error::from_string_literal("Unexpected marker"); return Error::from_string_literal("Unexpected marker");