mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-22 01:08:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibGfx/ISOBMFF: Support box header size 0 to mean "until end of data"

Browse source 
JPEG2000 uses this, and as far as I can tell it's also part of
ISO/IEC 14496-12.
This commit is contained in:
Nico Weber 2024-03-22 09:10:58 -04:00 • committed by Andreas Kling
commit 9bf29356a2
Notes: sideshowbarker 2024-07-16 23:03:06 +09:00
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Boxes.cpp
View file

@ -8,7 +8,7 @@
namespace Gfx::ISOBMFF { namespace Gfx::ISOBMFF {
ErrorOr<BoxHeader> read_box_header(Stream& stream) ErrorOr<BoxHeader> read_box_header(BoxStream& stream)
{ {
BoxHeader header; BoxHeader header;
u64 total_size = TRY(stream.read_value<BigEndian<u32>>()); u64 total_size = TRY(stream.read_value<BigEndian<u32>>());
@ -16,12 +16,16 @@ ErrorOr<BoxHeader> read_box_header(Stream& stream)
u64 data_size_read = sizeof(u32) + sizeof(BoxType); u64 data_size_read = sizeof(u32) + sizeof(BoxType);
if (total_size == 1) { if (total_size == 0) {
total_size = TRY(stream.read_value<BigEndian<u64>>()); header.contents_size = stream.remaining();
data_size_read += sizeof(u64); } else {
} if (total_size == 1) {
total_size = TRY(stream.read_value<BigEndian<u64>>());
data_size_read += sizeof(u64);
}
header.contents_size = total_size - data_size_read; header.contents_size = total_size - data_size_read;
}
return header; return header;
} }

2
Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Boxes.h
View file

@ -26,7 +26,7 @@ struct BoxHeader {
u64 contents_size { 0 }; u64 contents_size { 0 };
}; };
ErrorOr<BoxHeader> read_box_header(Stream& stream); ErrorOr<BoxHeader> read_box_header(BoxStream& stream);
struct Box { struct Box {
Box() = default; Box() = default;

7
Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.cpp
View file

@ -10,7 +10,8 @@ namespace Gfx::ISOBMFF {
ErrorOr<Reader> Reader::create(MaybeOwned<SeekableStream> stream) ErrorOr<Reader> Reader::create(MaybeOwned<SeekableStream> stream)
{ {
return Reader(move(stream)); size_t size = TRY(stream->size());
return Reader(move(stream), size);
} }
ErrorOr<BoxList> Reader::read_entire_file() ErrorOr<BoxList> Reader::read_entire_file()
@ -18,8 +19,8 @@ ErrorOr<BoxList> Reader::read_entire_file()
BoxList top_level_boxes; BoxList top_level_boxes;
while (!m_stream->is_eof()) { while (!m_stream->is_eof()) {
auto box_header = TRY(read_box_header(*m_stream)); auto box_header = TRY(read_box_header(m_box_stream));
BoxStream box_stream { *m_stream, static_cast<size_t>(box_header.contents_size) }; BoxStream box_stream { m_box_stream, static_cast<size_t>(box_header.contents_size) };
switch (box_header.type) { switch (box_header.type) {
case BoxType::FileTypeBox: case BoxType::FileTypeBox:

4
Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.h
View file

@ -23,14 +23,16 @@ public:
ErrorOr<Vector<BrandIdentifier>> get_minor_brands(); ErrorOr<Vector<BrandIdentifier>> get_minor_brands();
private: private:
Reader(MaybeOwned<SeekableStream> stream) Reader(MaybeOwned<SeekableStream> stream, size_t size)
: m_stream(move(stream)) : m_stream(move(stream))
, m_box_stream(*m_stream, size)
{ {
} }
ErrorOr<void> parse_initial_data(); ErrorOr<void> parse_initial_data();
MaybeOwned<SeekableStream> m_stream; MaybeOwned<SeekableStream> m_stream;
BoxStream m_box_stream;
}; };
} }