From a72770cdf64803720aef6af7356c5cda68fdc935 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 22 Mar 2024 12:12:21 -0400 Subject: [PATCH] LibGfx/ISOBMFF: Add JPEG2000 box types I prefixed the types that are labeled as "JPEG2000" on https://mp4ra.org/registered-types/boxes with "JPEG2000". --- .../LibGfx/ImageFormats/ISOBMFF/Enums.h | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Enums.h b/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Enums.h index 94ff3105c11..b6b92643c7b 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Enums.h +++ b/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Enums.h @@ -12,13 +12,33 @@ namespace Gfx::ISOBMFF { -// Define all Box types: -#define ENUMERATE_ALL() \ - ENUMERATE_ONE(FreeBox, "free") \ - ENUMERATE_ONE(FileTypeBox, "ftyp") \ - ENUMERATE_ONE(MediaDataBox, "mdat") \ - ENUMERATE_ONE(MetaBox, "meta") \ - ENUMERATE_ONE(MovieBox, "moov") +// Define all Box types. +// In FourCC-asciibetical order. +// The JPEG2000 types are from T-REC-T.800-201511-S!!PDF-E.pdf, Table I.2 – Defined boxes +#define ENUMERATE_ALL() \ + ENUMERATE_ONE(JPEG2000BitsPerComponentBox, "bpcc") \ + ENUMERATE_ONE(JPEG2000ChannelDefinitionBox, "cdef") \ + ENUMERATE_ONE(JPEG2000ComponentMappingBox, "cmap") \ + ENUMERATE_ONE(JPEG2000ColorSpecificationBox, "colr") \ + ENUMERATE_ONE(FreeBox, "free") \ + ENUMERATE_ONE(FileTypeBox, "ftyp") \ + ENUMERATE_ONE(JPEG2000ImageHeaderBox, "ihdr") \ + ENUMERATE_ONE(JPEG2000SignatureBox, "jP ") \ + ENUMERATE_ONE(JPEG2000ContiguousCodestreamBox, "jp2c") \ + ENUMERATE_ONE(JPEG2000HeaderBox, "jp2h") \ + ENUMERATE_ONE(JPEG2000IntellectualPropertyBox, "jp2i") \ + ENUMERATE_ONE(MediaDataBox, "mdat") \ + ENUMERATE_ONE(MetaBox, "meta") \ + ENUMERATE_ONE(MovieBox, "moov") \ + ENUMERATE_ONE(JPEG2000PaletteBox, "pclr") \ + ENUMERATE_ONE(JPEG2000ResolutionBox, "res ") \ + ENUMERATE_ONE(JPEG2000CaptureResolutionBox, "resc") \ + ENUMERATE_ONE(JPEG2000DefaultDisplayResolutionBox, "resd") \ + ENUMERATE_ONE(JPEG2000UUIDInfoBox, "uinf") \ + ENUMERATE_ONE(JPEG2000UUIDListBox, "ulst") \ + ENUMERATE_ONE(JPEG2000URLBox, "url ") \ + ENUMERATE_ONE(UserExtensionBox, "uuid") \ + ENUMERATE_ONE(XMLBox, "xml ") enum class BoxType : u32 { None = 0,