LibGfx/FLIC: Add a FLIC decoder #24518
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
👀 pr-needs-review
warpdesign
changed the title
warpdesign
force-pushed
the
flic_decoder
branch
6 times, most recently
from
ec1a11f
to
d5978de
Compare
LucasChollet
reviewed
Jun 9, 2024
| @@ -4,4 +4,4 @@ Executable=/bin/ImageViewer | |||
| Category=Gra&phics | |||
|
|
|||
| [Launcher] | |||
| FileTypes=bmp,dds,gif,ico,iff,jb2,jbig2,jp2,jpeg,jpg,jpx,jxl,lbm,pbm,pgm,png,ppm,qoi,tga,tiff,tif,tvg | |||
| FileTypes=bmp,dds,fli,flc,gif,ico,iff,jb2,jbig2,jp2,jpeg,jpg,jpx,jxl,lbm,pbm,pgm,png,ppm,qoi,tga,tiff,tif,tvg | |||
There was a problem hiding this comment.
:redlinus:
Please keep that list sorted
| * SPDX-License-Identifier: BSD-2-Clause | ||
| */ | ||
|
|
||
| #include <AK/Memory.h> |
There was a problem hiding this comment.
Hmm, I don't think that you're using that
Comment on lines
+16
to
+21
| struct Format { | ||
| enum : u16 { | ||
| FLI = 0xAF11, | ||
| FLC = 0xAF12, | ||
| }; | ||
| }; |
There was a problem hiding this comment.
You just invented enum class!
enum class Format : u16 {
FLI = 0xAF11,
FLC = 0xAF12,
}| }; | ||
| }; | ||
|
|
||
| struct ChunkType { |
There was a problem hiding this comment.
Same here, please use enum class
| }; | ||
|
|
||
| struct FLICFrameDescriptor { | ||
| Color color_map[256]; |
There was a problem hiding this comment.
Please use Arrays rather than raw C-arrays
| } | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| default: { | ||
| dbgln_if(FLIC_DEBUG, "Unknown main chunk {:#x}", chunk->type); | ||
| dbgln_if(FLIC_DEBUG, "Unknown subchunk {:#x}", chunk->type); |
| @@ -233,8 +257,7 @@ static ErrorOr<void> read_subchunk(FLICLoadingContext& context) | |||
| // Some FLI encoders save the wrong size on the subchunk header. | |||
| // For example in FLI_COPY subchunks: let's make sure the size is is enough to hold | |||
| // an uncompressed frame. | |||
| size_t data_size = type == 0x10 ? AK::max(size - chunk_header_size, context.width * context.height) : (u16)size; | |||
| dbgln_if(FLIC_DEBUG, "Using subchunk size {}", data_size); | |||
| size_t data_size = type == ChunkType::FLI_COPY ? AK::max(size - chunk_header_size, context.width * context.height) : (u16)size; | |||
Comment on lines
287
to
289
| for (auto i = 0; i < num_chunks; ++i) | ||
| TRY(read_subchunk(context)); | ||
| dbgln_if(FLIC_DEBUG, "Added subchunk offset={}", context.stream.offset()); | ||
| } | ||
|
|
| x += type; | ||
| case ChunkType::FLI_BRUN: { | ||
| for (size_t y = 0; y < context.height; y++) { | ||
| auto x = 0; |
There was a problem hiding this comment.
Using auto to deduce an int is quite the overhead, use u32 or whatever is the most appropriate.
| auto x = 0; | ||
| // first byte was the packets count, but FLC variant can encode more than 256 bytes | ||
| // so ignore it and use the frame's width instead | ||
| TRY(stream->seek(1, SeekMode::FromCurrentPosition)); |
There was a problem hiding this comment.
Prefer a read rather than an seek.
nico
added
⏳ pr-waiting-for-author
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days if no further activity occurs. Thank you for your contributions! |
|
Please don't close: I intend to fix the problems. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FLIC refers to FLI/FLC files which were generated by MS-DOS application Autodesk Animator. The animation format was quite popular in the mid-nineties.
serenityos-fli.mov
This PR only adds support for very basic FLI files which were limited to 320x200 and 64 colours. The format was extended with support for higher resolutions and more colours and was renamed FLC.
More PRs will follow to add support for missing FLI and FLC chunks.