diff --git a/format/caff/testdata/test.cmo3.fqtest b/format/caff/testdata/test.cmo3.fqtest index dc6cb8180..e8e1265c9 100644 --- a/format/caff/testdata/test.cmo3.fqtest +++ b/format/caff/testdata/test.cmo3.fqtest @@ -79,10 +79,10 @@ $ fq dv test.cmo3 | | | [0]{}: chunk 0x8-0x21 (25) 0x0000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x0000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x0000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x0000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x0000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x0000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x0000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x0000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x0000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x0000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x0001|00 00 00 40 |...@ | width: 64 0x10-0x14 (4) 0x0001| 00 00 00 40 | ...@ | height: 64 0x14-0x18 (4) 0x0001| 08 | . | bit_depth: 8 0x18-0x19 (1) @@ -95,10 +95,10 @@ $ fq dv test.cmo3 | | | [1]{}: chunk 0x21-0x54 (51) 0x0002| 00 00 00 27 | ...' | length: 39 0x21-0x25 (4) 0x0002| 49 44 41 54 | IDAT | type: "IDAT" 0x25-0x29 (4) - 0x0002| 49 | I | ancillary: false 0x25.3-0x25.4 (0.1) - 0x0002| 44 | D | private: false 0x26.3-0x26.4 (0.1) - 0x0002| 41 | A | reserved: false 0x27.3-0x27.4 (0.1) - 0x0002| 54 | T | safe_to_copy: true 0x28.3-0x28.4 (0.1) + 0x0002| 49 | I | ancillary: false 0x25.2-0x25.3 (0.1) + 0x0002| 44 | D | private: false 0x26.2-0x26.3 (0.1) + 0x0002| 41 | A | reserved: false 0x27.2-0x27.3 (0.1) + 0x0002| 54 | T | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x0002| 78 5e ed c1 01 0d 00| x^.....| data: raw bits 0x29-0x50 (39) 0x0003|00 00 c2 a0 f7 4f 6d 0e 37 a0 00 00 00 00 00 00|.....Om.7.......| 0x0004|00 00 00 00 00 00 00 00 00 80 77 03 40 40 00 01|..........w.@@..| @@ -106,10 +106,10 @@ $ fq dv test.cmo3 | | | [2]{}: chunk 0x54-0x60 (12) 0x0005| 00 00 00 00 | .... | length: 0 0x54-0x58 (4) 0x0005| 49 45 4e 44 | IEND | type: "IEND" 0x58-0x5c (4) - 0x0005| 49 | I | ancillary: false 0x58.3-0x58.4 (0.1) - 0x0005| 45 | E | private: false 0x59.3-0x59.4 (0.1) - 0x0005| 4e | N | reserved: false 0x5a.3-0x5a.4 (0.1) - 0x0005| 44 | D | safe_to_copy: false 0x5b.3-0x5b.4 (0.1) + 0x0005| 49 | I | ancillary: false 0x58.2-0x58.3 (0.1) + 0x0005| 45 | E | private: false 0x59.2-0x59.3 (0.1) + 0x0005| 4e | N | reserved: false 0x5a.2-0x5a.3 (0.1) + 0x0005| 44 | D | safe_to_copy: false 0x5b.2-0x5b.3 (0.1) 0x0005| ae 42 60 82| .B`.| crc: 0xae426082 (valid) 0x5c-0x60 (4) | | | [1]{}: file 0x129-0x17c (83) | | | file_path: "image_0.png" @@ -125,10 +125,10 @@ $ fq dv test.cmo3 | | | [0]{}: chunk 0x8-0x21 (25) 0x0000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x0000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x0000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x0000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x0000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x0000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x0000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x0000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x0000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x0000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x0001|00 00 00 20 |... | width: 32 0x10-0x14 (4) 0x0001| 00 00 00 20 | ... | height: 32 0x14-0x18 (4) 0x0001| 08 | . | bit_depth: 8 0x18-0x19 (1) @@ -141,10 +141,10 @@ $ fq dv test.cmo3 | | | [1]{}: chunk 0x21-0x47 (38) 0x0002| 00 00 00 1a | .... | length: 26 0x21-0x25 (4) 0x0002| 49 44 41 54 | IDAT | type: "IDAT" 0x25-0x29 (4) - 0x0002| 49 | I | ancillary: false 0x25.3-0x25.4 (0.1) - 0x0002| 44 | D | private: false 0x26.3-0x26.4 (0.1) - 0x0002| 41 | A | reserved: false 0x27.3-0x27.4 (0.1) - 0x0002| 54 | T | safe_to_copy: true 0x28.3-0x28.4 (0.1) + 0x0002| 49 | I | ancillary: false 0x25.2-0x25.3 (0.1) + 0x0002| 44 | D | private: false 0x26.2-0x26.3 (0.1) + 0x0002| 41 | A | reserved: false 0x27.2-0x27.3 (0.1) + 0x0002| 54 | T | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x0002| 78 5e ed c1 01 01 00| x^.....| data: raw bits 0x29-0x43 (26) 0x0003|00 00 82 20 ff af 6e 48 40 01 00 00 00 ef 06 10|... ..nH@.......| 0x0004|20 00 01 | .. | @@ -152,10 +152,10 @@ $ fq dv test.cmo3 | | | [2]{}: chunk 0x47-0x53 (12) 0x0004| 00 00 00 00 | .... | length: 0 0x47-0x4b (4) 0x0004| 49 45 4e 44 | IEND | type: "IEND" 0x4b-0x4f (4) - 0x0004| 49 | I | ancillary: false 0x4b.3-0x4b.4 (0.1) - 0x0004| 45 | E | private: false 0x4c.3-0x4c.4 (0.1) - 0x0004| 4e | N | reserved: false 0x4d.3-0x4d.4 (0.1) - 0x0004| 44 | D | safe_to_copy: false 0x4e.3-0x4e.4 (0.1) + 0x0004| 49 | I | ancillary: false 0x4b.2-0x4b.3 (0.1) + 0x0004| 45 | E | private: false 0x4c.2-0x4c.3 (0.1) + 0x0004| 4e | N | reserved: false 0x4d.2-0x4d.3 (0.1) + 0x0004| 44 | D | safe_to_copy: false 0x4e.2-0x4e.3 (0.1) 0x0004| ae| .| crc: 0xae426082 (valid) 0x4f-0x53 (4) 0x0005|42 60 82| |B`.| | | | | [2]{}: file 0x17c-0x1c7 (75) @@ -172,10 +172,10 @@ $ fq dv test.cmo3 | | | [0]{}: chunk 0x8-0x21 (25) 0x0000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x0000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x0000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x0000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x0000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x0000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x0000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x0000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x0000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x0000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x0001|00 00 00 10 |.... | width: 16 0x10-0x14 (4) 0x0001| 00 00 00 10 | .... | height: 16 0x14-0x18 (4) 0x0001| 08 | . | bit_depth: 8 0x18-0x19 (1) @@ -188,10 +188,10 @@ $ fq dv test.cmo3 | | | [1]{}: chunk 0x21-0x3f (30) 0x0002| 00 00 00 12 | .... | length: 18 0x21-0x25 (4) 0x0002| 49 44 41 54 | IDAT | type: "IDAT" 0x25-0x29 (4) - 0x0002| 49 | I | ancillary: false 0x25.3-0x25.4 (0.1) - 0x0002| 44 | D | private: false 0x26.3-0x26.4 (0.1) - 0x0002| 41 | A | reserved: false 0x27.3-0x27.4 (0.1) - 0x0002| 54 | T | safe_to_copy: true 0x28.3-0x28.4 (0.1) + 0x0002| 49 | I | ancillary: false 0x25.2-0x25.3 (0.1) + 0x0002| 44 | D | private: false 0x26.2-0x26.3 (0.1) + 0x0002| 41 | A | reserved: false 0x27.2-0x27.3 (0.1) + 0x0002| 54 | T | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x0002| 78 5e 63 60 18 05 a3| x^c`...| data: raw bits 0x29-0x3b (18) 0x0003|60 14 8c 02 08 00 00 04 10 00 01 |`.......... | 0x0003| 66 c1 64 0b | f.d. | crc: 0x66c1640b (valid) 0x3b-0x3f (4) @@ -199,10 +199,10 @@ $ fq dv test.cmo3 0x0003| 00| .| length: 0 0x3f-0x43 (4) 0x0004|00 00 00 |... | 0x0004| 49 45 4e 44 | IEND | type: "IEND" 0x43-0x47 (4) - 0x0004| 49 | I | ancillary: false 0x43.3-0x43.4 (0.1) - 0x0004| 45 | E | private: false 0x44.3-0x44.4 (0.1) - 0x0004| 4e | N | reserved: false 0x45.3-0x45.4 (0.1) - 0x0004| 44 | D | safe_to_copy: false 0x46.3-0x46.4 (0.1) + 0x0004| 49 | I | ancillary: false 0x43.2-0x43.3 (0.1) + 0x0004| 45 | E | private: false 0x44.2-0x44.3 (0.1) + 0x0004| 4e | N | reserved: false 0x45.2-0x45.3 (0.1) + 0x0004| 44 | D | safe_to_copy: false 0x46.2-0x46.3 (0.1) 0x0004| ae 42 60 82| | .B`.| | crc: 0xae426082 (valid) 0x47-0x4b (4) | | | [3]{}: file 0x1c7-0x2267 (8352) | | | file_path: "main.xml" diff --git a/format/flac/testdata/picture_seek_gain.fqtest b/format/flac/testdata/picture_seek_gain.fqtest index bc14ac448..860a288a3 100644 --- a/format/flac/testdata/picture_seek_gain.fqtest +++ b/format/flac/testdata/picture_seek_gain.fqtest @@ -90,10 +90,10 @@ $ fq -d flac dv picture_seek_gain.flac | | | [0]{}: chunk 0x164-0x17d (25) 0x0160| 00 00 00 0d | .... | length: 13 0x164-0x168 (4) 0x0160| 49 48 44 52 | IHDR | type: "IHDR" 0x168-0x16c (4) -0x0160| 49 | I | ancillary: false 0x168.3-0x168.4 (0.1) -0x0160| 48 | H | private: false 0x169.3-0x169.4 (0.1) -0x0160| 44 | D | reserved: false 0x16a.3-0x16a.4 (0.1) -0x0160| 52 | R | safe_to_copy: true 0x16b.3-0x16b.4 (0.1) +0x0160| 49 | I | ancillary: false 0x168.2-0x168.3 (0.1) +0x0160| 48 | H | private: false 0x169.2-0x169.3 (0.1) +0x0160| 44 | D | reserved: false 0x16a.2-0x16a.3 (0.1) +0x0160| 52 | R | safe_to_copy: false 0x16b.2-0x16b.3 (0.1) 0x0160| 00 00 00 04| ....| width: 4 0x16c-0x170 (4) 0x0170|00 00 00 04 |.... | height: 4 0x170-0x174 (4) 0x0170| 01 | . | bit_depth: 1 0x174-0x175 (1) @@ -106,19 +106,19 @@ $ fq -d flac dv picture_seek_gain.flac 0x0170| 00 00 00| ...| length: 11 0x17d-0x181 (4) 0x0180|0b |. | 0x0180| 49 44 41 54 | IDAT | type: "IDAT" 0x181-0x185 (4) -0x0180| 49 | I | ancillary: false 0x181.3-0x181.4 (0.1) -0x0180| 44 | D | private: false 0x182.3-0x182.4 (0.1) -0x0180| 41 | A | reserved: false 0x183.3-0x183.4 (0.1) -0x0180| 54 | T | safe_to_copy: true 0x184.3-0x184.4 (0.1) +0x0180| 49 | I | ancillary: false 0x181.2-0x181.3 (0.1) +0x0180| 44 | D | private: false 0x182.2-0x182.3 (0.1) +0x0180| 41 | A | reserved: false 0x183.2-0x183.3 (0.1) +0x0180| 54 | T | safe_to_copy: false 0x184.2-0x184.3 (0.1) 0x0180| 08 d7 63 60 80 00 00 00 08 00 01| ..c`.......| data: raw bits 0x185-0x190 (11) 0x0190|2f 20 dd 31 |/ .1 | crc: 0x2f20dd31 (valid) 0x190-0x194 (4) | | | [2]{}: chunk 0x194-0x1a0 (12) 0x0190| 00 00 00 00 | .... | length: 0 0x194-0x198 (4) 0x0190| 49 45 4e 44 | IEND | type: "IEND" 0x198-0x19c (4) -0x0190| 49 | I | ancillary: false 0x198.3-0x198.4 (0.1) -0x0190| 45 | E | private: false 0x199.3-0x199.4 (0.1) -0x0190| 4e | N | reserved: false 0x19a.3-0x19a.4 (0.1) -0x0190| 44 | D | safe_to_copy: false 0x19b.3-0x19b.4 (0.1) +0x0190| 49 | I | ancillary: false 0x198.2-0x198.3 (0.1) +0x0190| 45 | E | private: false 0x199.2-0x199.3 (0.1) +0x0190| 4e | N | reserved: false 0x19a.2-0x19a.3 (0.1) +0x0190| 44 | D | safe_to_copy: false 0x19b.2-0x19b.3 (0.1) 0x0190| ae 42 60 82| .B`.| crc: 0xae426082 (valid) 0x19c-0x1a0 (4) |00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef| [4]{}: metadatablock (flac_metadatablock) 0x1a0-0x2060 (7872) 0x01a0|81 |. | last_block: true 0x1a0-0x1a0.1 (0.1) diff --git a/format/id3/testdata/apic.fqtest b/format/id3/testdata/apic.fqtest index 8697152f2..28eb220cb 100644 --- a/format/id3/testdata/apic.fqtest +++ b/format/id3/testdata/apic.fqtest @@ -59,10 +59,10 @@ $ fq -d id3v2 dv apic | | | [0]{}: chunk 0x42-0x5b (25) 0x40| 00 00 00 0d | .... | length: 13 0x42-0x46 (4) 0x40| 49 48 44 52 | IHDR | type: "IHDR" 0x46-0x4a (4) -0x40| 49 | I | ancillary: false 0x46.3-0x46.4 (0.1) -0x40| 48 | H | private: false 0x47.3-0x47.4 (0.1) -0x40| 44 | D | reserved: false 0x48.3-0x48.4 (0.1) -0x40| 52 | R | safe_to_copy: true 0x49.3-0x49.4 (0.1) +0x40| 49 | I | ancillary: false 0x46.2-0x46.3 (0.1) +0x40| 48 | H | private: false 0x47.2-0x47.3 (0.1) +0x40| 44 | D | reserved: false 0x48.2-0x48.3 (0.1) +0x40| 52 | R | safe_to_copy: false 0x49.2-0x49.3 (0.1) 0x40| 00 00 00 04 | .... | width: 4 0x4a-0x4e (4) 0x40| 00 00| ..| height: 4 0x4e-0x52 (4) 0x50|00 04 |.. | @@ -76,10 +76,10 @@ $ fq -d id3v2 dv apic 0x50| 00 00 00 09 | .... | length: 9 0x5b-0x5f (4) 0x50| 70| p| type: "pHYs" 0x5f-0x63 (4) 0x60|48 59 73 |HYs | -0x50| 70| p| ancillary: true 0x5f.3-0x5f.4 (0.1) -0x60|48 |H | private: false 0x60.3-0x60.4 (0.1) -0x60| 59 | Y | reserved: true 0x61.3-0x61.4 (0.1) -0x60| 73 | s | safe_to_copy: true 0x62.3-0x62.4 (0.1) +0x50| 70| p| ancillary: true 0x5f.2-0x5f.3 (0.1) +0x60|48 |H | private: false 0x60.2-0x60.3 (0.1) +0x60| 59 | Y | reserved: false 0x61.2-0x61.3 (0.1) +0x60| 73 | s | safe_to_copy: true 0x62.2-0x62.3 (0.1) 0x60| 00 00 00 01 | .... | x_pixels_per_unit: 1 0x63-0x67 (4) 0x60| 00 00 00 01 | .... | y_pixels_per_unit: 1 0x67-0x6b (4) 0x60| 00 | . | unit: 0 0x6b-0x6c (1) @@ -87,10 +87,10 @@ $ fq -d id3v2 dv apic | | | [2]{}: chunk 0x70-0x9e (46) 0x70|00 00 00 22 |..." | length: 34 0x70-0x74 (4) 0x70| 49 44 41 54 | IDAT | type: "IDAT" 0x74-0x78 (4) -0x70| 49 | I | ancillary: false 0x74.3-0x74.4 (0.1) -0x70| 44 | D | private: false 0x75.3-0x75.4 (0.1) -0x70| 41 | A | reserved: false 0x76.3-0x76.4 (0.1) -0x70| 54 | T | safe_to_copy: true 0x77.3-0x77.4 (0.1) +0x70| 49 | I | ancillary: false 0x74.2-0x74.3 (0.1) +0x70| 44 | D | private: false 0x75.2-0x75.3 (0.1) +0x70| 41 | A | reserved: false 0x76.2-0x76.3 (0.1) +0x70| 54 | T | safe_to_copy: false 0x77.2-0x77.3 (0.1) 0x70| 78 9c 63 60 60 60 f8 0f| x.c```..| data: raw bits 0x78-0x9a (34) 0x80|c6 ff 41 14 88 05 64 fc 87 08 22 71 80 44 3d 88|..A...d..."q.D=.| 0x90|f1 bf 81 e1 3f 00 c8 76 13 ed |....?..v.. | @@ -99,10 +99,10 @@ $ fq -d id3v2 dv apic 0x90| 00 00| ..| length: 0 0x9e-0xa2 (4) 0xa0|00 00 |.. | 0xa0| 49 45 4e 44 | IEND | type: "IEND" 0xa2-0xa6 (4) -0xa0| 49 | I | ancillary: false 0xa2.3-0xa2.4 (0.1) -0xa0| 45 | E | private: false 0xa3.3-0xa3.4 (0.1) -0xa0| 4e | N | reserved: false 0xa4.3-0xa4.4 (0.1) -0xa0| 44 | D | safe_to_copy: false 0xa5.3-0xa5.4 (0.1) +0xa0| 49 | I | ancillary: false 0xa2.2-0xa2.3 (0.1) +0xa0| 45 | E | private: false 0xa3.2-0xa3.3 (0.1) +0xa0| 4e | N | reserved: false 0xa4.2-0xa4.3 (0.1) +0xa0| 44 | D | safe_to_copy: false 0xa5.2-0xa5.3 (0.1) 0xa0| ae 42 60 82 | .B`. | crc: 0xae426082 (valid) 0xa6-0xaa (4) 0xa0| 00 00 00 00 00 00| ......| padding: raw bits (all zero) 0xaa-0xb4 (10) 0xb0|00 00 00 00| |....| | diff --git a/format/id3/testdata/utf16-apic.fqtest b/format/id3/testdata/utf16-apic.fqtest index 328e33bec..8f4e32dc1 100644 --- a/format/id3/testdata/utf16-apic.fqtest +++ b/format/id3/testdata/utf16-apic.fqtest @@ -42,10 +42,10 @@ $ fq -d id3v2 dv utf16-apic | | | [0]{}: chunk 0x34-0x4d (25) 0x030| 00 00 00 0d | .... | length: 13 0x34-0x38 (4) 0x030| 49 48 44 52 | IHDR | type: "IHDR" 0x38-0x3c (4) -0x030| 49 | I | ancillary: false 0x38.3-0x38.4 (0.1) -0x030| 48 | H | private: false 0x39.3-0x39.4 (0.1) -0x030| 44 | D | reserved: false 0x3a.3-0x3a.4 (0.1) -0x030| 52 | R | safe_to_copy: true 0x3b.3-0x3b.4 (0.1) +0x030| 49 | I | ancillary: false 0x38.2-0x38.3 (0.1) +0x030| 48 | H | private: false 0x39.2-0x39.3 (0.1) +0x030| 44 | D | reserved: false 0x3a.2-0x3a.3 (0.1) +0x030| 52 | R | safe_to_copy: false 0x3b.2-0x3b.3 (0.1) 0x030| 00 00 00 04| ....| width: 4 0x3c-0x40 (4) 0x040|00 00 00 04 |.... | height: 4 0x40-0x44 (4) 0x040| 01 | . | bit_depth: 1 0x44-0x45 (1) @@ -58,20 +58,20 @@ $ fq -d id3v2 dv utf16-apic 0x040| 00 00 00| ...| length: 4 0x4d-0x51 (4) 0x050|04 |. | 0x050| 67 41 4d 41 | gAMA | type: "gAMA" 0x51-0x55 (4) -0x050| 67 | g | ancillary: false 0x51.3-0x51.4 (0.1) -0x050| 41 | A | private: false 0x52.3-0x52.4 (0.1) -0x050| 4d | M | reserved: false 0x53.3-0x53.4 (0.1) -0x050| 41 | A | safe_to_copy: false 0x54.3-0x54.4 (0.1) +0x050| 67 | g | ancillary: true 0x51.2-0x51.3 (0.1) +0x050| 41 | A | private: false 0x52.2-0x52.3 (0.1) +0x050| 4d | M | reserved: false 0x53.2-0x53.3 (0.1) +0x050| 41 | A | safe_to_copy: false 0x54.2-0x54.3 (0.1) 0x050| 00 00 b1 8f | .... | value: 45455 0x55-0x59 (4) 0x050| 0b fc 61 05 | ..a. | crc: 0xbfc6105 (valid) 0x59-0x5d (4) | | | [2]{}: chunk 0x5d-0x89 (44) 0x050| 00 00 00| ...| length: 32 0x5d-0x61 (4) 0x060|20 | | 0x060| 63 48 52 4d | cHRM | type: "cHRM" 0x61-0x65 (4) -0x060| 63 | c | ancillary: false 0x61.3-0x61.4 (0.1) -0x060| 48 | H | private: false 0x62.3-0x62.4 (0.1) -0x060| 52 | R | reserved: true 0x63.3-0x63.4 (0.1) -0x060| 4d | M | safe_to_copy: false 0x64.3-0x64.4 (0.1) +0x060| 63 | c | ancillary: true 0x61.2-0x61.3 (0.1) +0x060| 48 | H | private: false 0x62.2-0x62.3 (0.1) +0x060| 52 | R | reserved: false 0x63.2-0x63.3 (0.1) +0x060| 4d | M | safe_to_copy: false 0x64.2-0x64.3 (0.1) 0x060| 00 00 7a 26 | ..z& | white_point_x: 31.27 0x65-0x69 (4) 0x060| 00 00 80 84 | .... | white_point_y: 32.9 0x69-0x6d (4) 0x060| 00 00 fa| ...| red_x: 64 0x6d-0x71 (4) @@ -87,19 +87,19 @@ $ fq -d id3v2 dv utf16-apic 0x080| 00 00 00 02 | .... | length: 2 0x89-0x8d (4) 0x080| 62 4b 47| bKG| type: "bKGD" 0x8d-0x91 (4) 0x090|44 |D | -0x080| 62 | b | ancillary: false 0x8d.3-0x8d.4 (0.1) -0x080| 4b | K | private: false 0x8e.3-0x8e.4 (0.1) -0x080| 47| G| reserved: false 0x8f.3-0x8f.4 (0.1) -0x090|44 |D | safe_to_copy: false 0x90.3-0x90.4 (0.1) +0x080| 62 | b | ancillary: true 0x8d.2-0x8d.3 (0.1) +0x080| 4b | K | private: false 0x8e.2-0x8e.3 (0.1) +0x080| 47| G| reserved: false 0x8f.2-0x8f.3 (0.1) +0x090|44 |D | safe_to_copy: false 0x90.2-0x90.3 (0.1) 0x090| 00 01 | .. | gray: 1 0x91-0x93 (2) 0x090| dd 8a 13 a4 | .... | crc: 0xdd8a13a4 (valid) 0x93-0x97 (4) | | | [4]{}: chunk 0x97-0xaa (19) 0x090| 00 00 00 07 | .... | length: 7 0x97-0x9b (4) 0x090| 74 49 4d 45 | tIME | type: "tIME" 0x9b-0x9f (4) -0x090| 74 | t | ancillary: true 0x9b.3-0x9b.4 (0.1) -0x090| 49 | I | private: false 0x9c.3-0x9c.4 (0.1) -0x090| 4d | M | reserved: false 0x9d.3-0x9d.4 (0.1) -0x090| 45 | E | safe_to_copy: false 0x9e.3-0x9e.4 (0.1) +0x090| 74 | t | ancillary: true 0x9b.2-0x9b.3 (0.1) +0x090| 49 | I | private: false 0x9c.2-0x9c.3 (0.1) +0x090| 4d | M | reserved: false 0x9d.2-0x9d.3 (0.1) +0x090| 45 | E | safe_to_copy: false 0x9e.2-0x9e.3 (0.1) 0x090| 07| .| data: raw bits 0x9f-0xa6 (7) 0x0a0|e5 05 14 14 35 24 |....5$ | 0x0a0| 18 db 42 e2 | ..B. | crc: 0x18db42e2 (valid) 0xa6-0xaa (4) @@ -107,20 +107,20 @@ $ fq -d id3v2 dv utf16-apic 0x0a0| 00 00 00 0b | .... | length: 11 0xaa-0xae (4) 0x0a0| 49 44| ID| type: "IDAT" 0xae-0xb2 (4) 0x0b0|41 54 |AT | -0x0a0| 49 | I | ancillary: false 0xae.3-0xae.4 (0.1) -0x0a0| 44| D| private: false 0xaf.3-0xaf.4 (0.1) -0x0b0|41 |A | reserved: false 0xb0.3-0xb0.4 (0.1) -0x0b0| 54 | T | safe_to_copy: true 0xb1.3-0xb1.4 (0.1) +0x0a0| 49 | I | ancillary: false 0xae.2-0xae.3 (0.1) +0x0a0| 44| D| private: false 0xaf.2-0xaf.3 (0.1) +0x0b0|41 |A | reserved: false 0xb0.2-0xb0.3 (0.1) +0x0b0| 54 | T | safe_to_copy: false 0xb1.2-0xb1.3 (0.1) 0x0b0| 08 d7 63 60 80 00 00 00 08 00 01 | ..c`....... | data: raw bits 0xb2-0xbd (11) 0x0b0| 2f 20 dd| / .| crc: 0x2f20dd31 (valid) 0xbd-0xc1 (4) 0x0c0|31 |1 | | | | [6]{}: chunk 0xc1-0xf2 (49) 0x0c0| 00 00 00 25 | ...% | length: 37 0xc1-0xc5 (4) 0x0c0| 74 45 58 74 | tEXt | type: "tEXt" 0xc5-0xc9 (4) -0x0c0| 74 | t | ancillary: true 0xc5.3-0xc5.4 (0.1) -0x0c0| 45 | E | private: false 0xc6.3-0xc6.4 (0.1) -0x0c0| 58 | X | reserved: true 0xc7.3-0xc7.4 (0.1) -0x0c0| 74 | t | safe_to_copy: true 0xc8.3-0xc8.4 (0.1) +0x0c0| 74 | t | ancillary: true 0xc5.2-0xc5.3 (0.1) +0x0c0| 45 | E | private: false 0xc6.2-0xc6.3 (0.1) +0x0c0| 58 | X | reserved: false 0xc7.2-0xc7.3 (0.1) +0x0c0| 74 | t | safe_to_copy: true 0xc8.2-0xc8.3 (0.1) 0x0c0| 64 61 74 65 3a 63 72| date:cr| keyword: "date:create" 0xc9-0xd5 (12) 0x0d0|65 61 74 65 00 |eate. | 0x0d0| 32 30 32 31 2d 30 35 2d 32 30 54| 2021-05-20T| text: "2021-05-20T20:53:36+00:00" 0xd5-0xee (25) @@ -130,10 +130,10 @@ $ fq -d id3v2 dv utf16-apic | | | [7]{}: chunk 0xf2-0x123 (49) 0x0f0| 00 00 00 25 | ...% | length: 37 0xf2-0xf6 (4) 0x0f0| 74 45 58 74 | tEXt | type: "tEXt" 0xf6-0xfa (4) -0x0f0| 74 | t | ancillary: true 0xf6.3-0xf6.4 (0.1) -0x0f0| 45 | E | private: false 0xf7.3-0xf7.4 (0.1) -0x0f0| 58 | X | reserved: true 0xf8.3-0xf8.4 (0.1) -0x0f0| 74 | t | safe_to_copy: true 0xf9.3-0xf9.4 (0.1) +0x0f0| 74 | t | ancillary: true 0xf6.2-0xf6.3 (0.1) +0x0f0| 45 | E | private: false 0xf7.2-0xf7.3 (0.1) +0x0f0| 58 | X | reserved: false 0xf8.2-0xf8.3 (0.1) +0x0f0| 74 | t | safe_to_copy: true 0xf9.2-0xf9.3 (0.1) 0x0f0| 64 61 74 65 3a 6d| date:m| keyword: "date:modify" 0xfa-0x106 (12) 0x100|6f 64 69 66 79 00 |odify. | 0x100| 32 30 32 31 2d 30 35 2d 32 30| 2021-05-20| text: "2021-05-20T20:53:36+00:00" 0x106-0x11f (25) @@ -143,10 +143,10 @@ $ fq -d id3v2 dv utf16-apic | | | [8]{}: chunk 0x123-0x12f (12) 0x120| 00 00 00 00 | .... | length: 0 0x123-0x127 (4) 0x120| 49 45 4e 44 | IEND | type: "IEND" 0x127-0x12b (4) -0x120| 49 | I | ancillary: false 0x127.3-0x127.4 (0.1) -0x120| 45 | E | private: false 0x128.3-0x128.4 (0.1) -0x120| 4e | N | reserved: false 0x129.3-0x129.4 (0.1) -0x120| 44 | D | safe_to_copy: false 0x12a.3-0x12a.4 (0.1) +0x120| 49 | I | ancillary: false 0x127.2-0x127.3 (0.1) +0x120| 45 | E | private: false 0x128.2-0x128.3 (0.1) +0x120| 4e | N | reserved: false 0x129.2-0x129.3 (0.1) +0x120| 44 | D | safe_to_copy: false 0x12a.2-0x12a.3 (0.1) 0x120| ae 42 60 82 | .B`. | crc: 0xae426082 (valid) 0x12b-0x12f (4) | | | [1]{}: frame 0x12f-0x156 (39) 0x120| 54| T| id: "TSSE" (Software/Hardware and settings used for encoding) 0x12f-0x133 (4) diff --git a/format/mp4/testdata/png.mp4.fqtest b/format/mp4/testdata/png.mp4.fqtest index 7b5ae01ec..d5c5c1488 100644 --- a/format/mp4/testdata/png.mp4.fqtest +++ b/format/mp4/testdata/png.mp4.fqtest @@ -361,10 +361,10 @@ $ fq dv png.mp4 | | | [0]{}: chunk 0x34-0x4d (25) 0x030| 00 00 00 0d | .... | length: 13 0x34-0x38 (4) 0x030| 49 48 44 52 | IHDR | type: "IHDR" 0x38-0x3c (4) -0x030| 49 | I | ancillary: false 0x38.3-0x38.4 (0.1) -0x030| 48 | H | private: false 0x39.3-0x39.4 (0.1) -0x030| 44 | D | reserved: false 0x3a.3-0x3a.4 (0.1) -0x030| 52 | R | safe_to_copy: true 0x3b.3-0x3b.4 (0.1) +0x030| 49 | I | ancillary: false 0x38.2-0x38.3 (0.1) +0x030| 48 | H | private: false 0x39.2-0x39.3 (0.1) +0x030| 44 | D | reserved: false 0x3a.2-0x3a.3 (0.1) +0x030| 52 | R | safe_to_copy: false 0x3b.2-0x3b.3 (0.1) 0x030| 00 00 00 02| ....| width: 2 0x3c-0x40 (4) 0x040|00 00 00 02 |.... | height: 2 0x40-0x44 (4) 0x040| 08 | . | bit_depth: 8 0x44-0x45 (1) @@ -377,10 +377,10 @@ $ fq dv png.mp4 0x040| 00 00 00| ...| length: 9 0x4d-0x51 (4) 0x050|09 |. | 0x050| 70 48 59 73 | pHYs | type: "pHYs" 0x51-0x55 (4) -0x050| 70 | p | ancillary: true 0x51.3-0x51.4 (0.1) -0x050| 48 | H | private: false 0x52.3-0x52.4 (0.1) -0x050| 59 | Y | reserved: true 0x53.3-0x53.4 (0.1) -0x050| 73 | s | safe_to_copy: true 0x54.3-0x54.4 (0.1) +0x050| 70 | p | ancillary: true 0x51.2-0x51.3 (0.1) +0x050| 48 | H | private: false 0x52.2-0x52.3 (0.1) +0x050| 59 | Y | reserved: false 0x53.2-0x53.3 (0.1) +0x050| 73 | s | safe_to_copy: true 0x54.2-0x54.3 (0.1) 0x050| 00 00 00 01 | .... | x_pixels_per_unit: 1 0x55-0x59 (4) 0x050| 00 00 00 01 | .... | y_pixels_per_unit: 1 0x59-0x5d (4) 0x050| 00 | . | unit: 0 0x5d-0x5e (1) @@ -389,10 +389,10 @@ $ fq dv png.mp4 | | | [2]{}: chunk 0x62-0x7d (27) 0x060| 00 00 00 0f | .... | length: 15 0x62-0x66 (4) 0x060| 49 44 41 54 | IDAT | type: "IDAT" 0x66-0x6a (4) -0x060| 49 | I | ancillary: false 0x66.3-0x66.4 (0.1) -0x060| 44 | D | private: false 0x67.3-0x67.4 (0.1) -0x060| 41 | A | reserved: false 0x68.3-0x68.4 (0.1) -0x060| 54 | T | safe_to_copy: true 0x69.3-0x69.4 (0.1) +0x060| 49 | I | ancillary: false 0x66.2-0x66.3 (0.1) +0x060| 44 | D | private: false 0x67.2-0x67.3 (0.1) +0x060| 41 | A | reserved: false 0x68.2-0x68.3 (0.1) +0x060| 54 | T | safe_to_copy: false 0x69.2-0x69.3 (0.1) 0x060| 78 9c 63 60 60 60| x.c```| data: raw bits 0x6a-0x79 (15) 0x070|f8 0f c3 ff 01 12 fb 03 fd |......... | 0x070| 59 a8 83 f3 | Y... | crc: 0x59a883f3 (valid) 0x79-0x7d (4) @@ -400,10 +400,10 @@ $ fq dv png.mp4 0x070| 00 00 00| ...| length: 0 0x7d-0x81 (4) 0x080|00 |. | 0x080| 49 45 4e 44 | IEND | type: "IEND" 0x81-0x85 (4) -0x080| 49 | I | ancillary: false 0x81.3-0x81.4 (0.1) -0x080| 45 | E | private: false 0x82.3-0x82.4 (0.1) -0x080| 4e | N | reserved: false 0x83.3-0x83.4 (0.1) -0x080| 44 | D | safe_to_copy: false 0x84.3-0x84.4 (0.1) +0x080| 49 | I | ancillary: false 0x81.2-0x81.3 (0.1) +0x080| 45 | E | private: false 0x82.2-0x82.3 (0.1) +0x080| 4e | N | reserved: false 0x83.2-0x83.3 (0.1) +0x080| 44 | D | safe_to_copy: false 0x84.2-0x84.3 (0.1) 0x080| ae 42 60 82 | .B`. | crc: 0xae426082 (valid) 0x85-0x89 (4) | | | id: 1 | | | data_format: "mp4v" (MPEG-4 Visual) diff --git a/format/mp4/testdata/png_no_hdlr.mp4.fqtest b/format/mp4/testdata/png_no_hdlr.mp4.fqtest index 201063022..0b327aca2 100644 --- a/format/mp4/testdata/png_no_hdlr.mp4.fqtest +++ b/format/mp4/testdata/png_no_hdlr.mp4.fqtest @@ -314,10 +314,10 @@ $ fq dv png_no_hdlr.mp4 0x310| 00 00| ..| length: 13 0x31e-0x322 (4) 0x320|00 0d |.. | 0x320| 49 48 44 52 | IHDR | type: "IHDR" 0x322-0x326 (4) -0x320| 49 | I | ancillary: false 0x322.3-0x322.4 (0.1) -0x320| 48 | H | private: false 0x323.3-0x323.4 (0.1) -0x320| 44 | D | reserved: false 0x324.3-0x324.4 (0.1) -0x320| 52 | R | safe_to_copy: true 0x325.3-0x325.4 (0.1) +0x320| 49 | I | ancillary: false 0x322.2-0x322.3 (0.1) +0x320| 48 | H | private: false 0x323.2-0x323.3 (0.1) +0x320| 44 | D | reserved: false 0x324.2-0x324.3 (0.1) +0x320| 52 | R | safe_to_copy: false 0x325.2-0x325.3 (0.1) 0x320| 00 00 00 02 | .... | width: 2 0x326-0x32a (4) 0x320| 00 00 00 02 | .... | height: 2 0x32a-0x32e (4) 0x320| 08 | . | bit_depth: 8 0x32e-0x32f (1) @@ -329,10 +329,10 @@ $ fq dv png_no_hdlr.mp4 | | | [1]{}: chunk 0x337-0x34c (21) 0x330| 00 00 00 09 | .... | length: 9 0x337-0x33b (4) 0x330| 70 48 59 73 | pHYs | type: "pHYs" 0x33b-0x33f (4) -0x330| 70 | p | ancillary: true 0x33b.3-0x33b.4 (0.1) -0x330| 48 | H | private: false 0x33c.3-0x33c.4 (0.1) -0x330| 59 | Y | reserved: true 0x33d.3-0x33d.4 (0.1) -0x330| 73 | s | safe_to_copy: true 0x33e.3-0x33e.4 (0.1) +0x330| 70 | p | ancillary: true 0x33b.2-0x33b.3 (0.1) +0x330| 48 | H | private: false 0x33c.2-0x33c.3 (0.1) +0x330| 59 | Y | reserved: false 0x33d.2-0x33d.3 (0.1) +0x330| 73 | s | safe_to_copy: true 0x33e.2-0x33e.3 (0.1) 0x330| 00| .| x_pixels_per_unit: 1 0x33f-0x343 (4) 0x340|00 00 01 |... | 0x340| 00 00 00 01 | .... | y_pixels_per_unit: 1 0x343-0x347 (4) @@ -341,20 +341,20 @@ $ fq dv png_no_hdlr.mp4 | | | [2]{}: chunk 0x34c-0x367 (27) 0x340| 00 00 00 0f| ....| length: 15 0x34c-0x350 (4) 0x350|49 44 41 54 |IDAT | type: "IDAT" 0x350-0x354 (4) -0x350|49 |I | ancillary: false 0x350.3-0x350.4 (0.1) -0x350| 44 | D | private: false 0x351.3-0x351.4 (0.1) -0x350| 41 | A | reserved: false 0x352.3-0x352.4 (0.1) -0x350| 54 | T | safe_to_copy: true 0x353.3-0x353.4 (0.1) +0x350|49 |I | ancillary: false 0x350.2-0x350.3 (0.1) +0x350| 44 | D | private: false 0x351.2-0x351.3 (0.1) +0x350| 41 | A | reserved: false 0x352.2-0x352.3 (0.1) +0x350| 54 | T | safe_to_copy: false 0x353.2-0x353.3 (0.1) 0x350| 78 9c 63 60 60 60 f8 0f c3 ff 01 12| x.c```......| data: raw bits 0x354-0x363 (15) 0x360|fb 03 fd |... | 0x360| 59 a8 83 f3 | Y... | crc: 0x59a883f3 (valid) 0x363-0x367 (4) | | | [3]{}: chunk 0x367-0x373 (12) 0x360| 00 00 00 00 | .... | length: 0 0x367-0x36b (4) 0x360| 49 45 4e 44 | IEND | type: "IEND" 0x36b-0x36f (4) -0x360| 49 | I | ancillary: false 0x36b.3-0x36b.4 (0.1) -0x360| 45 | E | private: false 0x36c.3-0x36c.4 (0.1) -0x360| 4e | N | reserved: false 0x36d.3-0x36d.4 (0.1) -0x360| 44 | D | safe_to_copy: false 0x36e.3-0x36e.4 (0.1) +0x360| 49 | I | ancillary: false 0x36b.2-0x36b.3 (0.1) +0x360| 45 | E | private: false 0x36c.2-0x36c.3 (0.1) +0x360| 4e | N | reserved: false 0x36d.2-0x36d.3 (0.1) +0x360| 44 | D | safe_to_copy: false 0x36e.2-0x36e.3 (0.1) 0x360| ae| .| crc: 0xae426082 (valid) 0x36f-0x373 (4) 0x370|42 60 82| |B`.| | | | | id: 1 diff --git a/format/png/png.go b/format/png/png.go index ecf6c2aff..baae28943 100644 --- a/format/png/png.go +++ b/format/png/png.go @@ -89,7 +89,7 @@ func pngDecode(d *decode.D) any { chunkType := d.FieldUTF8("type", 4) // upper/lower case in chunk type is used for flags d.SeekRel(-4 * 8) - d.SeekRel(3) + d.SeekRel(2) d.FieldBool("ancillary") d.SeekRel(7) d.FieldBool("private") @@ -97,7 +97,7 @@ func pngDecode(d *decode.D) any { d.FieldBool("reserved") d.SeekRel(7) d.FieldBool("safe_to_copy") - d.SeekRel(4) + d.SeekRel(5) d.FramedFn(int64(chunkLength)*8, func(d *decode.D) { switch chunkType { diff --git a/format/png/testdata/4x4.fqtest b/format/png/testdata/4x4.fqtest index 0a691beea..491400da5 100644 --- a/format/png/testdata/4x4.fqtest +++ b/format/png/testdata/4x4.fqtest @@ -8,10 +8,10 @@ $ fq -d png dv 4x4.png | | | [0]{}: chunk 0x8-0x21 (25) 0x000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) -0x000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) -0x000| 48 | H | private: false 0xd.3-0xd.4 (0.1) -0x000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) -0x000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) +0x000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) +0x000| 48 | H | private: false 0xd.2-0xd.3 (0.1) +0x000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) +0x000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x010|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x010| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x010| 01 | . | bit_depth: 1 0x18-0x19 (1) @@ -24,20 +24,20 @@ $ fq -d png dv 4x4.png | | | [1]{}: chunk 0x21-0x31 (16) 0x020| 00 00 00 04 | .... | length: 4 0x21-0x25 (4) 0x020| 67 41 4d 41 | gAMA | type: "gAMA" 0x25-0x29 (4) -0x020| 67 | g | ancillary: false 0x25.3-0x25.4 (0.1) -0x020| 41 | A | private: false 0x26.3-0x26.4 (0.1) -0x020| 4d | M | reserved: false 0x27.3-0x27.4 (0.1) -0x020| 41 | A | safe_to_copy: false 0x28.3-0x28.4 (0.1) +0x020| 67 | g | ancillary: true 0x25.2-0x25.3 (0.1) +0x020| 41 | A | private: false 0x26.2-0x26.3 (0.1) +0x020| 4d | M | reserved: false 0x27.2-0x27.3 (0.1) +0x020| 41 | A | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x020| 00 00 b1 8f | .... | value: 45455 0x29-0x2d (4) 0x020| 0b fc 61| ..a| crc: 0xbfc6105 (valid) 0x2d-0x31 (4) 0x030|05 |. | | | | [2]{}: chunk 0x31-0x5d (44) 0x030| 00 00 00 20 | ... | length: 32 0x31-0x35 (4) 0x030| 63 48 52 4d | cHRM | type: "cHRM" 0x35-0x39 (4) -0x030| 63 | c | ancillary: false 0x35.3-0x35.4 (0.1) -0x030| 48 | H | private: false 0x36.3-0x36.4 (0.1) -0x030| 52 | R | reserved: true 0x37.3-0x37.4 (0.1) -0x030| 4d | M | safe_to_copy: false 0x38.3-0x38.4 (0.1) +0x030| 63 | c | ancillary: true 0x35.2-0x35.3 (0.1) +0x030| 48 | H | private: false 0x36.2-0x36.3 (0.1) +0x030| 52 | R | reserved: false 0x37.2-0x37.3 (0.1) +0x030| 4d | M | safe_to_copy: false 0x38.2-0x38.3 (0.1) 0x030| 00 00 7a 26 | ..z& | white_point_x: 31.27 0x39-0x3d (4) 0x030| 00 00 80| ...| white_point_y: 32.9 0x3d-0x41 (4) 0x040|84 |. | @@ -53,40 +53,40 @@ $ fq -d png dv 4x4.png 0x050| 00 00 00| ...| length: 2 0x5d-0x61 (4) 0x060|02 |. | 0x060| 62 4b 47 44 | bKGD | type: "bKGD" 0x61-0x65 (4) -0x060| 62 | b | ancillary: false 0x61.3-0x61.4 (0.1) -0x060| 4b | K | private: false 0x62.3-0x62.4 (0.1) -0x060| 47 | G | reserved: false 0x63.3-0x63.4 (0.1) -0x060| 44 | D | safe_to_copy: false 0x64.3-0x64.4 (0.1) +0x060| 62 | b | ancillary: true 0x61.2-0x61.3 (0.1) +0x060| 4b | K | private: false 0x62.2-0x62.3 (0.1) +0x060| 47 | G | reserved: false 0x63.2-0x63.3 (0.1) +0x060| 44 | D | safe_to_copy: false 0x64.2-0x64.3 (0.1) 0x060| 00 01 | .. | gray: 1 0x65-0x67 (2) 0x060| dd 8a 13 a4 | .... | crc: 0xdd8a13a4 (valid) 0x67-0x6b (4) | | | [4]{}: chunk 0x6b-0x7e (19) 0x060| 00 00 00 07 | .... | length: 7 0x6b-0x6f (4) 0x060| 74| t| type: "tIME" 0x6f-0x73 (4) 0x070|49 4d 45 |IME | -0x060| 74| t| ancillary: true 0x6f.3-0x6f.4 (0.1) -0x070|49 |I | private: false 0x70.3-0x70.4 (0.1) -0x070| 4d | M | reserved: false 0x71.3-0x71.4 (0.1) -0x070| 45 | E | safe_to_copy: false 0x72.3-0x72.4 (0.1) +0x060| 74| t| ancillary: true 0x6f.2-0x6f.3 (0.1) +0x070|49 |I | private: false 0x70.2-0x70.3 (0.1) +0x070| 4d | M | reserved: false 0x71.2-0x71.3 (0.1) +0x070| 45 | E | safe_to_copy: false 0x72.2-0x72.3 (0.1) 0x070| 07 e5 07 1c 08 36 09 | .....6. | data: raw bits 0x73-0x7a (7) 0x070| dc 61 6c cf | .al. | crc: 0xdc616ccf (valid) 0x7a-0x7e (4) | | | [5]{}: chunk 0x7e-0x95 (23) 0x070| 00 00| ..| length: 11 0x7e-0x82 (4) 0x080|00 0b |.. | 0x080| 49 44 41 54 | IDAT | type: "IDAT" 0x82-0x86 (4) -0x080| 49 | I | ancillary: false 0x82.3-0x82.4 (0.1) -0x080| 44 | D | private: false 0x83.3-0x83.4 (0.1) -0x080| 41 | A | reserved: false 0x84.3-0x84.4 (0.1) -0x080| 54 | T | safe_to_copy: true 0x85.3-0x85.4 (0.1) +0x080| 49 | I | ancillary: false 0x82.2-0x82.3 (0.1) +0x080| 44 | D | private: false 0x83.2-0x83.3 (0.1) +0x080| 41 | A | reserved: false 0x84.2-0x84.3 (0.1) +0x080| 54 | T | safe_to_copy: false 0x85.2-0x85.3 (0.1) 0x080| 08 5b 63 60 80 00 00 00 08 00| .[c`......| data: raw bits 0x86-0x91 (11) 0x090|01 |. | 0x090| d3 19 34 be | ..4. | crc: 0xd31934be (valid) 0x91-0x95 (4) | | | [6]{}: chunk 0x95-0xc6 (49) 0x090| 00 00 00 25 | ...% | length: 37 0x95-0x99 (4) 0x090| 74 45 58 74 | tEXt | type: "tEXt" 0x99-0x9d (4) -0x090| 74 | t | ancillary: true 0x99.3-0x99.4 (0.1) -0x090| 45 | E | private: false 0x9a.3-0x9a.4 (0.1) -0x090| 58 | X | reserved: true 0x9b.3-0x9b.4 (0.1) -0x090| 74 | t | safe_to_copy: true 0x9c.3-0x9c.4 (0.1) +0x090| 74 | t | ancillary: true 0x99.2-0x99.3 (0.1) +0x090| 45 | E | private: false 0x9a.2-0x9a.3 (0.1) +0x090| 58 | X | reserved: false 0x9b.2-0x9b.3 (0.1) +0x090| 74 | t | safe_to_copy: true 0x9c.2-0x9c.3 (0.1) 0x090| 64 61 74| dat| keyword: "date:create" 0x9d-0xa9 (12) 0x0a0|65 3a 63 72 65 61 74 65 00 |e:create. | 0x0a0| 32 30 32 31 2d 30 37| 2021-07| text: "2021-07-28T08:54:09+00:00" 0xa9-0xc2 (25) @@ -96,10 +96,10 @@ $ fq -d png dv 4x4.png | | | [7]{}: chunk 0xc6-0xf7 (49) 0x0c0| 00 00 00 25 | ...% | length: 37 0xc6-0xca (4) 0x0c0| 74 45 58 74 | tEXt | type: "tEXt" 0xca-0xce (4) -0x0c0| 74 | t | ancillary: true 0xca.3-0xca.4 (0.1) -0x0c0| 45 | E | private: false 0xcb.3-0xcb.4 (0.1) -0x0c0| 58 | X | reserved: true 0xcc.3-0xcc.4 (0.1) -0x0c0| 74 | t | safe_to_copy: true 0xcd.3-0xcd.4 (0.1) +0x0c0| 74 | t | ancillary: true 0xca.2-0xca.3 (0.1) +0x0c0| 45 | E | private: false 0xcb.2-0xcb.3 (0.1) +0x0c0| 58 | X | reserved: false 0xcc.2-0xcc.3 (0.1) +0x0c0| 74 | t | safe_to_copy: true 0xcd.2-0xcd.3 (0.1) 0x0c0| 64 61| da| keyword: "date:modify" 0xce-0xda (12) 0x0d0|74 65 3a 6d 6f 64 69 66 79 00 |te:modify. | 0x0d0| 32 30 32 31 2d 30| 2021-0| text: "2021-07-28T08:54:09+00:00" 0xda-0xf3 (25) @@ -109,10 +109,10 @@ $ fq -d png dv 4x4.png | | | [8]{}: chunk 0xf7-0x11a (35) 0x0f0| 00 00 00 17 | .... | length: 23 0xf7-0xfb (4) 0x0f0| 7a 54 58 74 | zTXt | type: "zTXt" 0xfb-0xff (4) -0x0f0| 7a | z | ancillary: true 0xfb.3-0xfb.4 (0.1) -0x0f0| 54 | T | private: true 0xfc.3-0xfc.4 (0.1) -0x0f0| 58 | X | reserved: true 0xfd.3-0xfd.4 (0.1) -0x0f0| 74 | t | safe_to_copy: true 0xfe.3-0xfe.4 (0.1) +0x0f0| 7a | z | ancillary: true 0xfb.2-0xfb.3 (0.1) +0x0f0| 54 | T | private: false 0xfc.2-0xfc.3 (0.1) +0x0f0| 58 | X | reserved: false 0xfd.2-0xfd.3 (0.1) +0x0f0| 74 | t | safe_to_copy: true 0xfe.2-0xfe.3 (0.1) 0x0f0| 61| a| keyword: "akeyword" 0xff-0x108 (9) 0x100|6b 65 79 77 6f 72 64 00 |keyword. | 0x100| 00 | . | compression_method: "deflate" (0) 0x108-0x109 (1) @@ -125,8 +125,8 @@ $ fq -d png dv 4x4.png 0x110| 00 00 00 00 | .... | length: 0 0x11a-0x11e (4) 0x110| 49 45| IE| type: "IEND" 0x11e-0x122 (4) 0x120|4e 44 |ND | -0x110| 49 | I | ancillary: false 0x11e.3-0x11e.4 (0.1) -0x110| 45| E| private: false 0x11f.3-0x11f.4 (0.1) -0x120|4e |N | reserved: false 0x120.3-0x120.4 (0.1) -0x120| 44 | D | safe_to_copy: false 0x121.3-0x121.4 (0.1) +0x110| 49 | I | ancillary: false 0x11e.2-0x11e.3 (0.1) +0x110| 45| E| private: false 0x11f.2-0x11f.3 (0.1) +0x120|4e |N | reserved: false 0x120.2-0x120.3 (0.1) +0x120| 44 | D | safe_to_copy: false 0x121.2-0x121.3 (0.1) 0x120| ae 42 60 82| | .B`.| | crc: 0xae426082 (valid) 0x122-0x126 (4) diff --git a/format/png/testdata/4x4_palette.fqtest b/format/png/testdata/4x4_palette.fqtest index dba092491..e29ead60b 100644 --- a/format/png/testdata/4x4_palette.fqtest +++ b/format/png/testdata/4x4_palette.fqtest @@ -6,10 +6,10 @@ $ fq dv 4x4_palette.png | | | [0]{}: chunk 0x8-0x21 (25) 0x00| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x00| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) -0x00| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) -0x00| 48 | H | private: false 0xd.3-0xd.4 (0.1) -0x00| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) -0x00| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) +0x00| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) +0x00| 48 | H | private: false 0xd.2-0xd.3 (0.1) +0x00| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) +0x00| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x10|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x10| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x10| 02 | . | bit_depth: 2 0x18-0x19 (1) @@ -22,10 +22,10 @@ $ fq dv 4x4_palette.png | | | [1]{}: chunk 0x21-0x39 (24) 0x20| 00 00 00 0c | .... | length: 12 0x21-0x25 (4) 0x20| 50 4c 54 45 | PLTE | type: "PLTE" 0x25-0x29 (4) -0x20| 50 | P | ancillary: true 0x25.3-0x25.4 (0.1) -0x20| 4c | L | private: false 0x26.3-0x26.4 (0.1) -0x20| 54 | T | reserved: true 0x27.3-0x27.4 (0.1) -0x20| 45 | E | safe_to_copy: false 0x28.3-0x28.4 (0.1) +0x20| 50 | P | ancillary: false 0x25.2-0x25.3 (0.1) +0x20| 4c | L | private: false 0x26.2-0x26.3 (0.1) +0x20| 54 | T | reserved: false 0x27.2-0x27.3 (0.1) +0x20| 45 | E | safe_to_copy: false 0x28.2-0x28.3 (0.1) | | | palette[0:4]: 0x29-0x35 (12) | | | [0]{}: color 0x29-0x2c (3) 0x20| ff | . | r: 255 0x29-0x2a (1) @@ -48,19 +48,19 @@ $ fq dv 4x4_palette.png 0x30| 00 00 00 10 | .... | length: 16 0x39-0x3d (4) 0x30| 49 44 41| IDA| type: "IDAT" 0x3d-0x41 (4) 0x40|54 |T | -0x30| 49 | I | ancillary: false 0x3d.3-0x3d.4 (0.1) -0x30| 44 | D | private: false 0x3e.3-0x3e.4 (0.1) -0x30| 41| A| reserved: false 0x3f.3-0x3f.4 (0.1) -0x40|54 |T | safe_to_copy: true 0x40.3-0x40.4 (0.1) +0x30| 49 | I | ancillary: false 0x3d.2-0x3d.3 (0.1) +0x30| 44 | D | private: false 0x3e.2-0x3e.3 (0.1) +0x30| 41| A| reserved: false 0x3f.2-0x3f.3 (0.1) +0x40|54 |T | safe_to_copy: false 0x40.2-0x40.3 (0.1) 0x40| 08 d7 63 60 60 08 65 58 c5 f0 1f 00 04 ae 01| ..c``.eX.......| data: raw bits 0x41-0x51 (16) 0x50|ff |. | 0x50| 7c 82 85 30 | |..0 | crc: 0x7c828530 (valid) 0x51-0x55 (4) | | | [3]{}: chunk 0x55-0x61 (12) 0x50| 00 00 00 00 | .... | length: 0 0x55-0x59 (4) 0x50| 49 45 4e 44 | IEND | type: "IEND" 0x59-0x5d (4) -0x50| 49 | I | ancillary: false 0x59.3-0x59.4 (0.1) -0x50| 45 | E | private: false 0x5a.3-0x5a.4 (0.1) -0x50| 4e | N | reserved: false 0x5b.3-0x5b.4 (0.1) -0x50| 44 | D | safe_to_copy: false 0x5c.3-0x5c.4 (0.1) +0x50| 49 | I | ancillary: false 0x59.2-0x59.3 (0.1) +0x50| 45 | E | private: false 0x5a.2-0x5a.3 (0.1) +0x50| 4e | N | reserved: false 0x5b.2-0x5b.3 (0.1) +0x50| 44 | D | safe_to_copy: false 0x5c.2-0x5c.3 (0.1) 0x50| ae 42 60| .B`| crc: 0xae426082 (valid) 0x5d-0x61 (4) 0x60|82| |.| | diff --git a/format/png/testdata/4x4a.fqtest b/format/png/testdata/4x4a.fqtest index ef99f8269..f043c2ac9 100644 --- a/format/png/testdata/4x4a.fqtest +++ b/format/png/testdata/4x4a.fqtest @@ -6,10 +6,10 @@ $ fq -d png dv 4x4a.apng | | | [0]{}: chunk 0x8-0x21 (25) 0x00| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x00| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) -0x00| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) -0x00| 48 | H | private: false 0xd.3-0xd.4 (0.1) -0x00| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) -0x00| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) +0x00| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) +0x00| 48 | H | private: false 0xd.2-0xd.3 (0.1) +0x00| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) +0x00| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x10|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x10| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x10| 08 | . | bit_depth: 8 0x18-0x19 (1) @@ -22,10 +22,10 @@ $ fq -d png dv 4x4a.apng | | | [1]{}: chunk 0x21-0x36 (21) 0x20| 00 00 00 09 | .... | length: 9 0x21-0x25 (4) 0x20| 70 48 59 73 | pHYs | type: "pHYs" 0x25-0x29 (4) -0x20| 70 | p | ancillary: true 0x25.3-0x25.4 (0.1) -0x20| 48 | H | private: false 0x26.3-0x26.4 (0.1) -0x20| 59 | Y | reserved: true 0x27.3-0x27.4 (0.1) -0x20| 73 | s | safe_to_copy: true 0x28.3-0x28.4 (0.1) +0x20| 70 | p | ancillary: true 0x25.2-0x25.3 (0.1) +0x20| 48 | H | private: false 0x26.2-0x26.3 (0.1) +0x20| 59 | Y | reserved: false 0x27.2-0x27.3 (0.1) +0x20| 73 | s | safe_to_copy: true 0x28.2-0x28.3 (0.1) 0x20| 00 00 00 01 | .... | x_pixels_per_unit: 1 0x29-0x2d (4) 0x20| 00 00 00| ...| y_pixels_per_unit: 1 0x2d-0x31 (4) 0x30|01 |. | @@ -34,10 +34,10 @@ $ fq -d png dv 4x4a.apng | | | [2]{}: chunk 0x36-0x4a (20) 0x30| 00 00 00 08 | .... | length: 8 0x36-0x3a (4) 0x30| 61 63 54 4c | acTL | type: "acTL" 0x3a-0x3e (4) -0x30| 61 | a | ancillary: false 0x3a.3-0x3a.4 (0.1) -0x30| 63 | c | private: false 0x3b.3-0x3b.4 (0.1) -0x30| 54 | T | reserved: true 0x3c.3-0x3c.4 (0.1) -0x30| 4c | L | safe_to_copy: false 0x3d.3-0x3d.4 (0.1) +0x30| 61 | a | ancillary: true 0x3a.2-0x3a.3 (0.1) +0x30| 63 | c | private: true 0x3b.2-0x3b.3 (0.1) +0x30| 54 | T | reserved: false 0x3c.2-0x3c.3 (0.1) +0x30| 4c | L | safe_to_copy: false 0x3d.2-0x3d.3 (0.1) 0x30| 00 00| ..| num_frames: 2 0x3e-0x42 (4) 0x40|00 02 |.. | 0x40| 00 00 00 01 | .... | num_plays: 1 0x42-0x46 (4) @@ -46,10 +46,10 @@ $ fq -d png dv 4x4a.apng 0x40| 00 00 00 1a | .... | length: 26 0x4a-0x4e (4) 0x40| 66 63| fc| type: "fcTL" 0x4e-0x52 (4) 0x50|54 4c |TL | -0x40| 66 | f | ancillary: false 0x4e.3-0x4e.4 (0.1) -0x40| 63| c| private: false 0x4f.3-0x4f.4 (0.1) -0x50|54 |T | reserved: true 0x50.3-0x50.4 (0.1) -0x50| 4c | L | safe_to_copy: false 0x51.3-0x51.4 (0.1) +0x40| 66 | f | ancillary: true 0x4e.2-0x4e.3 (0.1) +0x40| 63| c| private: true 0x4f.2-0x4f.3 (0.1) +0x50|54 |T | reserved: false 0x50.2-0x50.3 (0.1) +0x50| 4c | L | safe_to_copy: false 0x51.2-0x51.3 (0.1) 0x50| 00 00 00 00 | .... | sequence_number: 0 0x52-0x56 (4) 0x50| 00 00 00 04 | .... | width: 4 0x56-0x5a (4) 0x50| 00 00 00 04 | .... | height: 4 0x5a-0x5e (4) @@ -64,10 +64,10 @@ $ fq -d png dv 4x4a.apng | | | [4]{}: chunk 0x70-0x9e (46) 0x70|00 00 00 22 |..." | length: 34 0x70-0x74 (4) 0x70| 49 44 41 54 | IDAT | type: "IDAT" 0x74-0x78 (4) -0x70| 49 | I | ancillary: false 0x74.3-0x74.4 (0.1) -0x70| 44 | D | private: false 0x75.3-0x75.4 (0.1) -0x70| 41 | A | reserved: false 0x76.3-0x76.4 (0.1) -0x70| 54 | T | safe_to_copy: true 0x77.3-0x77.4 (0.1) +0x70| 49 | I | ancillary: false 0x74.2-0x74.3 (0.1) +0x70| 44 | D | private: false 0x75.2-0x75.3 (0.1) +0x70| 41 | A | reserved: false 0x76.2-0x76.3 (0.1) +0x70| 54 | T | safe_to_copy: false 0x77.2-0x77.3 (0.1) 0x70| 78 9c 63 60 60 60 f8 0f| x.c```..| data: raw bits 0x78-0x9a (34) 0x80|c6 ff 41 14 88 05 64 fc 87 08 22 71 80 44 3d 88|..A...d..."q.D=.| 0x90|f1 bf 81 e1 3f 00 c8 76 13 ed |....?..v.. | @@ -76,10 +76,10 @@ $ fq -d png dv 4x4a.apng 0x90| 00 00| ..| length: 26 0x9e-0xa2 (4) 0xa0|00 1a |.. | 0xa0| 66 63 54 4c | fcTL | type: "fcTL" 0xa2-0xa6 (4) -0xa0| 66 | f | ancillary: false 0xa2.3-0xa2.4 (0.1) -0xa0| 63 | c | private: false 0xa3.3-0xa3.4 (0.1) -0xa0| 54 | T | reserved: true 0xa4.3-0xa4.4 (0.1) -0xa0| 4c | L | safe_to_copy: false 0xa5.3-0xa5.4 (0.1) +0xa0| 66 | f | ancillary: true 0xa2.2-0xa2.3 (0.1) +0xa0| 63 | c | private: true 0xa3.2-0xa3.3 (0.1) +0xa0| 54 | T | reserved: false 0xa4.2-0xa4.3 (0.1) +0xa0| 4c | L | safe_to_copy: false 0xa5.2-0xa5.3 (0.1) 0xa0| 00 00 00 01 | .... | sequence_number: 1 0xa6-0xaa (4) 0xa0| 00 00 00 04 | .... | width: 4 0xaa-0xae (4) 0xa0| 00 00| ..| height: 1 0xae-0xb2 (4) @@ -94,19 +94,19 @@ $ fq -d png dv 4x4a.apng | | | [6]{}: chunk 0xc4-0xe8 (36) 0xc0| 00 00 00 18 | .... | length: 24 0xc4-0xc8 (4) 0xc0| 66 64 41 54 | fdAT | type: "fdAT" 0xc8-0xcc (4) -0xc0| 66 | f | ancillary: false 0xc8.3-0xc8.4 (0.1) -0xc0| 64 | d | private: false 0xc9.3-0xc9.4 (0.1) -0xc0| 41 | A | reserved: false 0xca.3-0xca.4 (0.1) -0xc0| 54 | T | safe_to_copy: true 0xcb.3-0xcb.4 (0.1) +0xc0| 66 | f | ancillary: true 0xc8.2-0xc8.3 (0.1) +0xc0| 64 | d | private: true 0xc9.2-0xc9.3 (0.1) +0xc0| 41 | A | reserved: false 0xca.2-0xca.3 (0.1) +0xc0| 54 | T | safe_to_copy: false 0xcb.2-0xcb.3 (0.1) 0xc0| 00 00 00 02| ....| sequence_number: 2 0xcc-0xd0 (4) 0xd0|78 9c 63 f8 ff 9f 81 e1 7f 03 10 ff 67 a8 07 00|x.c.........g...| data: raw bits 0xd0-0xe0 (16) 0xe0| 7b f5 c3 3d | {..= | crc: 0x7bf5c33d (valid) 0xe4-0xe8 (4) | | | [7]{}: chunk 0xe8-0xf4 (12) 0xe0| 00 00 00 00 | .... | length: 0 0xe8-0xec (4) 0xe0| 49 45 4e 44| IEND| type: "IEND" 0xec-0xf0 (4) -0xe0| 49 | I | ancillary: false 0xec.3-0xec.4 (0.1) -0xe0| 45 | E | private: false 0xed.3-0xed.4 (0.1) -0xe0| 4e | N | reserved: false 0xee.3-0xee.4 (0.1) -0xe0| 44| D| safe_to_copy: false 0xef.3-0xef.4 (0.1) +0xe0| 49 | I | ancillary: false 0xec.2-0xec.3 (0.1) +0xe0| 45 | E | private: false 0xed.2-0xed.3 (0.1) +0xe0| 4e | N | reserved: false 0xee.2-0xee.3 (0.1) +0xe0| 44| D| safe_to_copy: false 0xef.2-0xef.3 (0.1) 0xf0|ae 42 60 82| |.B`.| | crc: 0xae426082 (valid) 0xf0-0xf4 (4) 0xe0|29 e6 05 fb |)... | gap0: raw bits 0xe0-0xe4 (4) diff --git a/format/vorbis/testdata/vorbis-comment-picture.fqtest b/format/vorbis/testdata/vorbis-comment-picture.fqtest index c76efd6f1..4f63f1e5c 100644 --- a/format/vorbis/testdata/vorbis-comment-picture.fqtest +++ b/format/vorbis/testdata/vorbis-comment-picture.fqtest @@ -39,10 +39,10 @@ $ fq -d vorbis_comment dv vorbis-comment-picture | | | [0]{}: chunk 0x31-0x4a (25) 0x03| 00 00 00 0d | .... | length: 13 0x31-0x35 (4) 0x03| 49 48 44 52 | IHDR | type: "IHDR" 0x35-0x39 (4) - 0x03| 49 | I | ancillary: false 0x35.3-0x35.4 (0.1) - 0x03| 48 | H | private: false 0x36.3-0x36.4 (0.1) - 0x03| 44 | D | reserved: false 0x37.3-0x37.4 (0.1) - 0x03| 52 | R | safe_to_copy: true 0x38.3-0x38.4 (0.1) + 0x03| 49 | I | ancillary: false 0x35.2-0x35.3 (0.1) + 0x03| 48 | H | private: false 0x36.2-0x36.3 (0.1) + 0x03| 44 | D | reserved: false 0x37.2-0x37.3 (0.1) + 0x03| 52 | R | safe_to_copy: false 0x38.2-0x38.3 (0.1) 0x03| 00 00 00 04 | .... | width: 4 0x39-0x3d (4) 0x03| 00 00 00| ...| height: 4 0x3d-0x41 (4) 0x04|04 |. | @@ -56,10 +56,10 @@ $ fq -d vorbis_comment dv vorbis-comment-picture 0x04| 00 00 00 09 | .... | length: 9 0x4a-0x4e (4) 0x04| 70 48| pH| type: "pHYs" 0x4e-0x52 (4) 0x05|59 73 |Ys | - 0x04| 70 | p | ancillary: true 0x4e.3-0x4e.4 (0.1) - 0x04| 48| H| private: false 0x4f.3-0x4f.4 (0.1) - 0x05|59 |Y | reserved: true 0x50.3-0x50.4 (0.1) - 0x05| 73 | s | safe_to_copy: true 0x51.3-0x51.4 (0.1) + 0x04| 70 | p | ancillary: true 0x4e.2-0x4e.3 (0.1) + 0x04| 48| H| private: false 0x4f.2-0x4f.3 (0.1) + 0x05|59 |Y | reserved: false 0x50.2-0x50.3 (0.1) + 0x05| 73 | s | safe_to_copy: true 0x51.2-0x51.3 (0.1) 0x05| 00 00 00 01 | .... | x_pixels_per_unit: 1 0x52-0x56 (4) 0x05| 00 00 00 01 | .... | y_pixels_per_unit: 1 0x56-0x5a (4) 0x05| 00 | . | unit: 0 0x5a-0x5b (1) @@ -68,10 +68,10 @@ $ fq -d vorbis_comment dv vorbis-comment-picture 0x05| 00| .| length: 34 0x5f-0x63 (4) 0x06|00 00 22 |.." | 0x06| 49 44 41 54 | IDAT | type: "IDAT" 0x63-0x67 (4) - 0x06| 49 | I | ancillary: false 0x63.3-0x63.4 (0.1) - 0x06| 44 | D | private: false 0x64.3-0x64.4 (0.1) - 0x06| 41 | A | reserved: false 0x65.3-0x65.4 (0.1) - 0x06| 54 | T | safe_to_copy: true 0x66.3-0x66.4 (0.1) + 0x06| 49 | I | ancillary: false 0x63.2-0x63.3 (0.1) + 0x06| 44 | D | private: false 0x64.2-0x64.3 (0.1) + 0x06| 41 | A | reserved: false 0x65.2-0x65.3 (0.1) + 0x06| 54 | T | safe_to_copy: false 0x66.2-0x66.3 (0.1) 0x06| 78 9c 63 60 60 60 f8 0f c6| x.c```...| data: raw bits 0x67-0x89 (34) 0x07|ff 41 14 88 05 64 fc 87 08 22 71 80 44 3d 88 f1|.A...d..."q.D=..| 0x08|bf 81 e1 3f 00 c8 76 13 ed |...?..v.. | @@ -80,8 +80,8 @@ $ fq -d vorbis_comment dv vorbis-comment-picture 0x08| 00 00 00| ...| length: 0 0x8d-0x91 (4) 0x09|00 |. | 0x09| 49 45 4e 44 | IEND | type: "IEND" 0x91-0x95 (4) - 0x09| 49 | I | ancillary: false 0x91.3-0x91.4 (0.1) - 0x09| 45 | E | private: false 0x92.3-0x92.4 (0.1) - 0x09| 4e | N | reserved: false 0x93.3-0x93.4 (0.1) - 0x09| 44 | D | safe_to_copy: false 0x94.3-0x94.4 (0.1) + 0x09| 49 | I | ancillary: false 0x91.2-0x91.3 (0.1) + 0x09| 45 | E | private: false 0x92.2-0x92.3 (0.1) + 0x09| 4e | N | reserved: false 0x93.2-0x93.3 (0.1) + 0x09| 44 | D | safe_to_copy: false 0x94.2-0x94.3 (0.1) 0x09| ae 42 60 82| | .B`.| | crc: 0xae426082 (valid) 0x95-0x99 (4) diff --git a/format/zip/testdata/test-macos.fqtest b/format/zip/testdata/test-macos.fqtest index be7da23df..26f0728b3 100644 --- a/format/zip/testdata/test-macos.fqtest +++ b/format/zip/testdata/test-macos.fqtest @@ -229,10 +229,10 @@ $ fq -d zip dv test-macos.zip | | | [0]{}: chunk 0x8-0x21 (25) 0x000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x001|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x001| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x001| 01 | . | bit_depth: 1 0x18-0x19 (1) @@ -245,20 +245,20 @@ $ fq -d zip dv test-macos.zip | | | [1]{}: chunk 0x21-0x31 (16) 0x002| 00 00 00 04 | .... | length: 4 0x21-0x25 (4) 0x002| 67 41 4d 41 | gAMA | type: "gAMA" 0x25-0x29 (4) - 0x002| 67 | g | ancillary: false 0x25.3-0x25.4 (0.1) - 0x002| 41 | A | private: false 0x26.3-0x26.4 (0.1) - 0x002| 4d | M | reserved: false 0x27.3-0x27.4 (0.1) - 0x002| 41 | A | safe_to_copy: false 0x28.3-0x28.4 (0.1) + 0x002| 67 | g | ancillary: true 0x25.2-0x25.3 (0.1) + 0x002| 41 | A | private: false 0x26.2-0x26.3 (0.1) + 0x002| 4d | M | reserved: false 0x27.2-0x27.3 (0.1) + 0x002| 41 | A | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x002| 00 00 b1 8f | .... | value: 45455 0x29-0x2d (4) 0x002| 0b fc 61| ..a| crc: 0xbfc6105 (valid) 0x2d-0x31 (4) 0x003|05 |. | | | | [2]{}: chunk 0x31-0x5d (44) 0x003| 00 00 00 20 | ... | length: 32 0x31-0x35 (4) 0x003| 63 48 52 4d | cHRM | type: "cHRM" 0x35-0x39 (4) - 0x003| 63 | c | ancillary: false 0x35.3-0x35.4 (0.1) - 0x003| 48 | H | private: false 0x36.3-0x36.4 (0.1) - 0x003| 52 | R | reserved: true 0x37.3-0x37.4 (0.1) - 0x003| 4d | M | safe_to_copy: false 0x38.3-0x38.4 (0.1) + 0x003| 63 | c | ancillary: true 0x35.2-0x35.3 (0.1) + 0x003| 48 | H | private: false 0x36.2-0x36.3 (0.1) + 0x003| 52 | R | reserved: false 0x37.2-0x37.3 (0.1) + 0x003| 4d | M | safe_to_copy: false 0x38.2-0x38.3 (0.1) 0x003| 00 00 7a 26 | ..z& | white_point_x: 31.27 0x39-0x3d (4) 0x003| 00 00 80| ...| white_point_y: 32.9 0x3d-0x41 (4) 0x004|84 |. | @@ -274,40 +274,40 @@ $ fq -d zip dv test-macos.zip 0x005| 00 00 00| ...| length: 2 0x5d-0x61 (4) 0x006|02 |. | 0x006| 62 4b 47 44 | bKGD | type: "bKGD" 0x61-0x65 (4) - 0x006| 62 | b | ancillary: false 0x61.3-0x61.4 (0.1) - 0x006| 4b | K | private: false 0x62.3-0x62.4 (0.1) - 0x006| 47 | G | reserved: false 0x63.3-0x63.4 (0.1) - 0x006| 44 | D | safe_to_copy: false 0x64.3-0x64.4 (0.1) + 0x006| 62 | b | ancillary: true 0x61.2-0x61.3 (0.1) + 0x006| 4b | K | private: false 0x62.2-0x62.3 (0.1) + 0x006| 47 | G | reserved: false 0x63.2-0x63.3 (0.1) + 0x006| 44 | D | safe_to_copy: false 0x64.2-0x64.3 (0.1) 0x006| 00 01 | .. | gray: 1 0x65-0x67 (2) 0x006| dd 8a 13 a4 | .... | crc: 0xdd8a13a4 (valid) 0x67-0x6b (4) | | | [4]{}: chunk 0x6b-0x7e (19) 0x006| 00 00 00 07 | .... | length: 7 0x6b-0x6f (4) 0x006| 74| t| type: "tIME" 0x6f-0x73 (4) 0x007|49 4d 45 |IME | - 0x006| 74| t| ancillary: true 0x6f.3-0x6f.4 (0.1) - 0x007|49 |I | private: false 0x70.3-0x70.4 (0.1) - 0x007| 4d | M | reserved: false 0x71.3-0x71.4 (0.1) - 0x007| 45 | E | safe_to_copy: false 0x72.3-0x72.4 (0.1) + 0x006| 74| t| ancillary: true 0x6f.2-0x6f.3 (0.1) + 0x007|49 |I | private: false 0x70.2-0x70.3 (0.1) + 0x007| 4d | M | reserved: false 0x71.2-0x71.3 (0.1) + 0x007| 45 | E | safe_to_copy: false 0x72.2-0x72.3 (0.1) 0x007| 07 e5 0b 15 00 13 26 | ......& | data: raw bits 0x73-0x7a (7) 0x007| 29 a8 72 42 | ).rB | crc: 0x29a87242 (valid) 0x7a-0x7e (4) | | | [5]{}: chunk 0x7e-0x95 (23) 0x007| 00 00| ..| length: 11 0x7e-0x82 (4) 0x008|00 0b |.. | 0x008| 49 44 41 54 | IDAT | type: "IDAT" 0x82-0x86 (4) - 0x008| 49 | I | ancillary: false 0x82.3-0x82.4 (0.1) - 0x008| 44 | D | private: false 0x83.3-0x83.4 (0.1) - 0x008| 41 | A | reserved: false 0x84.3-0x84.4 (0.1) - 0x008| 54 | T | safe_to_copy: true 0x85.3-0x85.4 (0.1) + 0x008| 49 | I | ancillary: false 0x82.2-0x82.3 (0.1) + 0x008| 44 | D | private: false 0x83.2-0x83.3 (0.1) + 0x008| 41 | A | reserved: false 0x84.2-0x84.3 (0.1) + 0x008| 54 | T | safe_to_copy: false 0x85.2-0x85.3 (0.1) 0x008| 08 d7 63 60 80 00 00 00 08 00| ..c`......| data: raw bits 0x86-0x91 (11) 0x009|01 |. | 0x009| 2f 20 dd 31 | / .1 | crc: 0x2f20dd31 (valid) 0x91-0x95 (4) | | | [6]{}: chunk 0x95-0xc6 (49) 0x009| 00 00 00 25 | ...% | length: 37 0x95-0x99 (4) 0x009| 74 45 58 74 | tEXt | type: "tEXt" 0x99-0x9d (4) - 0x009| 74 | t | ancillary: true 0x99.3-0x99.4 (0.1) - 0x009| 45 | E | private: false 0x9a.3-0x9a.4 (0.1) - 0x009| 58 | X | reserved: true 0x9b.3-0x9b.4 (0.1) - 0x009| 74 | t | safe_to_copy: true 0x9c.3-0x9c.4 (0.1) + 0x009| 74 | t | ancillary: true 0x99.2-0x99.3 (0.1) + 0x009| 45 | E | private: false 0x9a.2-0x9a.3 (0.1) + 0x009| 58 | X | reserved: false 0x9b.2-0x9b.3 (0.1) + 0x009| 74 | t | safe_to_copy: true 0x9c.2-0x9c.3 (0.1) 0x009| 64 61 74| dat| keyword: "date:create" 0x9d-0xa9 (12) 0x00a|65 3a 63 72 65 61 74 65 00 |e:create. | 0x00a| 32 30 32 31 2d 31 31| 2021-11| text: "2021-11-21T00:19:38+00:00" 0xa9-0xc2 (25) @@ -317,10 +317,10 @@ $ fq -d zip dv test-macos.zip | | | [7]{}: chunk 0xc6-0xf7 (49) 0x00c| 00 00 00 25 | ...% | length: 37 0xc6-0xca (4) 0x00c| 74 45 58 74 | tEXt | type: "tEXt" 0xca-0xce (4) - 0x00c| 74 | t | ancillary: true 0xca.3-0xca.4 (0.1) - 0x00c| 45 | E | private: false 0xcb.3-0xcb.4 (0.1) - 0x00c| 58 | X | reserved: true 0xcc.3-0xcc.4 (0.1) - 0x00c| 74 | t | safe_to_copy: true 0xcd.3-0xcd.4 (0.1) + 0x00c| 74 | t | ancillary: true 0xca.2-0xca.3 (0.1) + 0x00c| 45 | E | private: false 0xcb.2-0xcb.3 (0.1) + 0x00c| 58 | X | reserved: false 0xcc.2-0xcc.3 (0.1) + 0x00c| 74 | t | safe_to_copy: true 0xcd.2-0xcd.3 (0.1) 0x00c| 64 61| da| keyword: "date:modify" 0xce-0xda (12) 0x00d|74 65 3a 6d 6f 64 69 66 79 00 |te:modify. | 0x00d| 32 30 32 31 2d 31| 2021-1| text: "2021-11-21T00:19:38+00:00" 0xda-0xf3 (25) @@ -330,10 +330,10 @@ $ fq -d zip dv test-macos.zip | | | [8]{}: chunk 0xf7-0x103 (12) 0x00f| 00 00 00 00 | .... | length: 0 0xf7-0xfb (4) 0x00f| 49 45 4e 44 | IEND | type: "IEND" 0xfb-0xff (4) - 0x00f| 49 | I | ancillary: false 0xfb.3-0xfb.4 (0.1) - 0x00f| 45 | E | private: false 0xfc.3-0xfc.4 (0.1) - 0x00f| 4e | N | reserved: false 0xfd.3-0xfd.4 (0.1) - 0x00f| 44 | D | safe_to_copy: false 0xfe.3-0xfe.4 (0.1) + 0x00f| 49 | I | ancillary: false 0xfb.2-0xfb.3 (0.1) + 0x00f| 45 | E | private: false 0xfc.2-0xfc.3 (0.1) + 0x00f| 4e | N | reserved: false 0xfd.2-0xfd.3 (0.1) + 0x00f| 44 | D | safe_to_copy: false 0xfe.2-0xfe.3 (0.1) 0x00f| ae| .| crc: 0xae426082 (valid) 0xff-0x103 (4) 0x010|42 60 82| |B`.| | 0x00120| eb 0c| ..| compressed: raw bits 0x12e-0x1fe (208) diff --git a/format/zip/testdata/test0.fqtest b/format/zip/testdata/test0.fqtest index 7ac9afa35..1a2f10585 100644 --- a/format/zip/testdata/test0.fqtest +++ b/format/zip/testdata/test0.fqtest @@ -273,10 +273,10 @@ $ fq -d zip dv test0.zip | | | [0]{}: chunk 0x8-0x21 (25) 0x000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x001|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x001| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x001| 01 | . | bit_depth: 1 0x18-0x19 (1) @@ -289,20 +289,20 @@ $ fq -d zip dv test0.zip | | | [1]{}: chunk 0x21-0x31 (16) 0x002| 00 00 00 04 | .... | length: 4 0x21-0x25 (4) 0x002| 67 41 4d 41 | gAMA | type: "gAMA" 0x25-0x29 (4) - 0x002| 67 | g | ancillary: false 0x25.3-0x25.4 (0.1) - 0x002| 41 | A | private: false 0x26.3-0x26.4 (0.1) - 0x002| 4d | M | reserved: false 0x27.3-0x27.4 (0.1) - 0x002| 41 | A | safe_to_copy: false 0x28.3-0x28.4 (0.1) + 0x002| 67 | g | ancillary: true 0x25.2-0x25.3 (0.1) + 0x002| 41 | A | private: false 0x26.2-0x26.3 (0.1) + 0x002| 4d | M | reserved: false 0x27.2-0x27.3 (0.1) + 0x002| 41 | A | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x002| 00 00 b1 8f | .... | value: 45455 0x29-0x2d (4) 0x002| 0b fc 61| ..a| crc: 0xbfc6105 (valid) 0x2d-0x31 (4) 0x003|05 |. | | | | [2]{}: chunk 0x31-0x5d (44) 0x003| 00 00 00 20 | ... | length: 32 0x31-0x35 (4) 0x003| 63 48 52 4d | cHRM | type: "cHRM" 0x35-0x39 (4) - 0x003| 63 | c | ancillary: false 0x35.3-0x35.4 (0.1) - 0x003| 48 | H | private: false 0x36.3-0x36.4 (0.1) - 0x003| 52 | R | reserved: true 0x37.3-0x37.4 (0.1) - 0x003| 4d | M | safe_to_copy: false 0x38.3-0x38.4 (0.1) + 0x003| 63 | c | ancillary: true 0x35.2-0x35.3 (0.1) + 0x003| 48 | H | private: false 0x36.2-0x36.3 (0.1) + 0x003| 52 | R | reserved: false 0x37.2-0x37.3 (0.1) + 0x003| 4d | M | safe_to_copy: false 0x38.2-0x38.3 (0.1) 0x003| 00 00 7a 26 | ..z& | white_point_x: 31.27 0x39-0x3d (4) 0x003| 00 00 80| ...| white_point_y: 32.9 0x3d-0x41 (4) 0x004|84 |. | @@ -318,40 +318,40 @@ $ fq -d zip dv test0.zip 0x005| 00 00 00| ...| length: 2 0x5d-0x61 (4) 0x006|02 |. | 0x006| 62 4b 47 44 | bKGD | type: "bKGD" 0x61-0x65 (4) - 0x006| 62 | b | ancillary: false 0x61.3-0x61.4 (0.1) - 0x006| 4b | K | private: false 0x62.3-0x62.4 (0.1) - 0x006| 47 | G | reserved: false 0x63.3-0x63.4 (0.1) - 0x006| 44 | D | safe_to_copy: false 0x64.3-0x64.4 (0.1) + 0x006| 62 | b | ancillary: true 0x61.2-0x61.3 (0.1) + 0x006| 4b | K | private: false 0x62.2-0x62.3 (0.1) + 0x006| 47 | G | reserved: false 0x63.2-0x63.3 (0.1) + 0x006| 44 | D | safe_to_copy: false 0x64.2-0x64.3 (0.1) 0x006| 00 01 | .. | gray: 1 0x65-0x67 (2) 0x006| dd 8a 13 a4 | .... | crc: 0xdd8a13a4 (valid) 0x67-0x6b (4) | | | [4]{}: chunk 0x6b-0x7e (19) 0x006| 00 00 00 07 | .... | length: 7 0x6b-0x6f (4) 0x006| 74| t| type: "tIME" 0x6f-0x73 (4) 0x007|49 4d 45 |IME | - 0x006| 74| t| ancillary: true 0x6f.3-0x6f.4 (0.1) - 0x007|49 |I | private: false 0x70.3-0x70.4 (0.1) - 0x007| 4d | M | reserved: false 0x71.3-0x71.4 (0.1) - 0x007| 45 | E | safe_to_copy: false 0x72.3-0x72.4 (0.1) + 0x006| 74| t| ancillary: true 0x6f.2-0x6f.3 (0.1) + 0x007|49 |I | private: false 0x70.2-0x70.3 (0.1) + 0x007| 4d | M | reserved: false 0x71.2-0x71.3 (0.1) + 0x007| 45 | E | safe_to_copy: false 0x72.2-0x72.3 (0.1) 0x007| 07 e5 0b 15 00 13 26 | ......& | data: raw bits 0x73-0x7a (7) 0x007| 29 a8 72 42 | ).rB | crc: 0x29a87242 (valid) 0x7a-0x7e (4) | | | [5]{}: chunk 0x7e-0x95 (23) 0x007| 00 00| ..| length: 11 0x7e-0x82 (4) 0x008|00 0b |.. | 0x008| 49 44 41 54 | IDAT | type: "IDAT" 0x82-0x86 (4) - 0x008| 49 | I | ancillary: false 0x82.3-0x82.4 (0.1) - 0x008| 44 | D | private: false 0x83.3-0x83.4 (0.1) - 0x008| 41 | A | reserved: false 0x84.3-0x84.4 (0.1) - 0x008| 54 | T | safe_to_copy: true 0x85.3-0x85.4 (0.1) + 0x008| 49 | I | ancillary: false 0x82.2-0x82.3 (0.1) + 0x008| 44 | D | private: false 0x83.2-0x83.3 (0.1) + 0x008| 41 | A | reserved: false 0x84.2-0x84.3 (0.1) + 0x008| 54 | T | safe_to_copy: false 0x85.2-0x85.3 (0.1) 0x008| 08 d7 63 60 80 00 00 00 08 00| ..c`......| data: raw bits 0x86-0x91 (11) 0x009|01 |. | 0x009| 2f 20 dd 31 | / .1 | crc: 0x2f20dd31 (valid) 0x91-0x95 (4) | | | [6]{}: chunk 0x95-0xc6 (49) 0x009| 00 00 00 25 | ...% | length: 37 0x95-0x99 (4) 0x009| 74 45 58 74 | tEXt | type: "tEXt" 0x99-0x9d (4) - 0x009| 74 | t | ancillary: true 0x99.3-0x99.4 (0.1) - 0x009| 45 | E | private: false 0x9a.3-0x9a.4 (0.1) - 0x009| 58 | X | reserved: true 0x9b.3-0x9b.4 (0.1) - 0x009| 74 | t | safe_to_copy: true 0x9c.3-0x9c.4 (0.1) + 0x009| 74 | t | ancillary: true 0x99.2-0x99.3 (0.1) + 0x009| 45 | E | private: false 0x9a.2-0x9a.3 (0.1) + 0x009| 58 | X | reserved: false 0x9b.2-0x9b.3 (0.1) + 0x009| 74 | t | safe_to_copy: true 0x9c.2-0x9c.3 (0.1) 0x009| 64 61 74| dat| keyword: "date:create" 0x9d-0xa9 (12) 0x00a|65 3a 63 72 65 61 74 65 00 |e:create. | 0x00a| 32 30 32 31 2d 31 31| 2021-11| text: "2021-11-21T00:19:38+00:00" 0xa9-0xc2 (25) @@ -361,10 +361,10 @@ $ fq -d zip dv test0.zip | | | [7]{}: chunk 0xc6-0xf7 (49) 0x00c| 00 00 00 25 | ...% | length: 37 0xc6-0xca (4) 0x00c| 74 45 58 74 | tEXt | type: "tEXt" 0xca-0xce (4) - 0x00c| 74 | t | ancillary: true 0xca.3-0xca.4 (0.1) - 0x00c| 45 | E | private: false 0xcb.3-0xcb.4 (0.1) - 0x00c| 58 | X | reserved: true 0xcc.3-0xcc.4 (0.1) - 0x00c| 74 | t | safe_to_copy: true 0xcd.3-0xcd.4 (0.1) + 0x00c| 74 | t | ancillary: true 0xca.2-0xca.3 (0.1) + 0x00c| 45 | E | private: false 0xcb.2-0xcb.3 (0.1) + 0x00c| 58 | X | reserved: false 0xcc.2-0xcc.3 (0.1) + 0x00c| 74 | t | safe_to_copy: true 0xcd.2-0xcd.3 (0.1) 0x00c| 64 61| da| keyword: "date:modify" 0xce-0xda (12) 0x00d|74 65 3a 6d 6f 64 69 66 79 00 |te:modify. | 0x00d| 32 30 32 31 2d 31| 2021-1| text: "2021-11-21T00:19:38+00:00" 0xda-0xf3 (25) @@ -374,10 +374,10 @@ $ fq -d zip dv test0.zip | | | [8]{}: chunk 0xf7-0x103 (12) 0x00f| 00 00 00 00 | .... | length: 0 0xf7-0xfb (4) 0x00f| 49 45 4e 44 | IEND | type: "IEND" 0xfb-0xff (4) - 0x00f| 49 | I | ancillary: false 0xfb.3-0xfb.4 (0.1) - 0x00f| 45 | E | private: false 0xfc.3-0xfc.4 (0.1) - 0x00f| 4e | N | reserved: false 0xfd.3-0xfd.4 (0.1) - 0x00f| 44 | D | safe_to_copy: false 0xfe.3-0xfe.4 (0.1) + 0x00f| 49 | I | ancillary: false 0xfb.2-0xfb.3 (0.1) + 0x00f| 45 | E | private: false 0xfc.2-0xfc.3 (0.1) + 0x00f| 4e | N | reserved: false 0xfd.2-0xfd.3 (0.1) + 0x00f| 44 | D | safe_to_copy: false 0xfe.2-0xfe.3 (0.1) 0x00f| ae| .| crc: 0xae426082 (valid) 0xff-0x103 (4) 0x010|42 60 82| |B`.| | 0x00150| eb 0c f0 73 e7 e5 92 e2| ...s....| compressed: raw bits 0x158-0x228 (208) diff --git a/format/zip/testdata/test64.fqtest b/format/zip/testdata/test64.fqtest index 9fed4fbc8..aa5839d69 100644 --- a/format/zip/testdata/test64.fqtest +++ b/format/zip/testdata/test64.fqtest @@ -302,10 +302,10 @@ $ fq -d zip dv test64.zip | | | [0]{}: chunk 0x8-0x21 (25) 0x000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x001|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x001| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x001| 01 | . | bit_depth: 1 0x18-0x19 (1) @@ -318,20 +318,20 @@ $ fq -d zip dv test64.zip | | | [1]{}: chunk 0x21-0x31 (16) 0x002| 00 00 00 04 | .... | length: 4 0x21-0x25 (4) 0x002| 67 41 4d 41 | gAMA | type: "gAMA" 0x25-0x29 (4) - 0x002| 67 | g | ancillary: false 0x25.3-0x25.4 (0.1) - 0x002| 41 | A | private: false 0x26.3-0x26.4 (0.1) - 0x002| 4d | M | reserved: false 0x27.3-0x27.4 (0.1) - 0x002| 41 | A | safe_to_copy: false 0x28.3-0x28.4 (0.1) + 0x002| 67 | g | ancillary: true 0x25.2-0x25.3 (0.1) + 0x002| 41 | A | private: false 0x26.2-0x26.3 (0.1) + 0x002| 4d | M | reserved: false 0x27.2-0x27.3 (0.1) + 0x002| 41 | A | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x002| 00 00 b1 8f | .... | value: 45455 0x29-0x2d (4) 0x002| 0b fc 61| ..a| crc: 0xbfc6105 (valid) 0x2d-0x31 (4) 0x003|05 |. | | | | [2]{}: chunk 0x31-0x5d (44) 0x003| 00 00 00 20 | ... | length: 32 0x31-0x35 (4) 0x003| 63 48 52 4d | cHRM | type: "cHRM" 0x35-0x39 (4) - 0x003| 63 | c | ancillary: false 0x35.3-0x35.4 (0.1) - 0x003| 48 | H | private: false 0x36.3-0x36.4 (0.1) - 0x003| 52 | R | reserved: true 0x37.3-0x37.4 (0.1) - 0x003| 4d | M | safe_to_copy: false 0x38.3-0x38.4 (0.1) + 0x003| 63 | c | ancillary: true 0x35.2-0x35.3 (0.1) + 0x003| 48 | H | private: false 0x36.2-0x36.3 (0.1) + 0x003| 52 | R | reserved: false 0x37.2-0x37.3 (0.1) + 0x003| 4d | M | safe_to_copy: false 0x38.2-0x38.3 (0.1) 0x003| 00 00 7a 26 | ..z& | white_point_x: 31.27 0x39-0x3d (4) 0x003| 00 00 80| ...| white_point_y: 32.9 0x3d-0x41 (4) 0x004|84 |. | @@ -347,40 +347,40 @@ $ fq -d zip dv test64.zip 0x005| 00 00 00| ...| length: 2 0x5d-0x61 (4) 0x006|02 |. | 0x006| 62 4b 47 44 | bKGD | type: "bKGD" 0x61-0x65 (4) - 0x006| 62 | b | ancillary: false 0x61.3-0x61.4 (0.1) - 0x006| 4b | K | private: false 0x62.3-0x62.4 (0.1) - 0x006| 47 | G | reserved: false 0x63.3-0x63.4 (0.1) - 0x006| 44 | D | safe_to_copy: false 0x64.3-0x64.4 (0.1) + 0x006| 62 | b | ancillary: true 0x61.2-0x61.3 (0.1) + 0x006| 4b | K | private: false 0x62.2-0x62.3 (0.1) + 0x006| 47 | G | reserved: false 0x63.2-0x63.3 (0.1) + 0x006| 44 | D | safe_to_copy: false 0x64.2-0x64.3 (0.1) 0x006| 00 01 | .. | gray: 1 0x65-0x67 (2) 0x006| dd 8a 13 a4 | .... | crc: 0xdd8a13a4 (valid) 0x67-0x6b (4) | | | [4]{}: chunk 0x6b-0x7e (19) 0x006| 00 00 00 07 | .... | length: 7 0x6b-0x6f (4) 0x006| 74| t| type: "tIME" 0x6f-0x73 (4) 0x007|49 4d 45 |IME | - 0x006| 74| t| ancillary: true 0x6f.3-0x6f.4 (0.1) - 0x007|49 |I | private: false 0x70.3-0x70.4 (0.1) - 0x007| 4d | M | reserved: false 0x71.3-0x71.4 (0.1) - 0x007| 45 | E | safe_to_copy: false 0x72.3-0x72.4 (0.1) + 0x006| 74| t| ancillary: true 0x6f.2-0x6f.3 (0.1) + 0x007|49 |I | private: false 0x70.2-0x70.3 (0.1) + 0x007| 4d | M | reserved: false 0x71.2-0x71.3 (0.1) + 0x007| 45 | E | safe_to_copy: false 0x72.2-0x72.3 (0.1) 0x007| 07 e5 0b 15 00 13 26 | ......& | data: raw bits 0x73-0x7a (7) 0x007| 29 a8 72 42 | ).rB | crc: 0x29a87242 (valid) 0x7a-0x7e (4) | | | [5]{}: chunk 0x7e-0x95 (23) 0x007| 00 00| ..| length: 11 0x7e-0x82 (4) 0x008|00 0b |.. | 0x008| 49 44 41 54 | IDAT | type: "IDAT" 0x82-0x86 (4) - 0x008| 49 | I | ancillary: false 0x82.3-0x82.4 (0.1) - 0x008| 44 | D | private: false 0x83.3-0x83.4 (0.1) - 0x008| 41 | A | reserved: false 0x84.3-0x84.4 (0.1) - 0x008| 54 | T | safe_to_copy: true 0x85.3-0x85.4 (0.1) + 0x008| 49 | I | ancillary: false 0x82.2-0x82.3 (0.1) + 0x008| 44 | D | private: false 0x83.2-0x83.3 (0.1) + 0x008| 41 | A | reserved: false 0x84.2-0x84.3 (0.1) + 0x008| 54 | T | safe_to_copy: false 0x85.2-0x85.3 (0.1) 0x008| 08 d7 63 60 80 00 00 00 08 00| ..c`......| data: raw bits 0x86-0x91 (11) 0x009|01 |. | 0x009| 2f 20 dd 31 | / .1 | crc: 0x2f20dd31 (valid) 0x91-0x95 (4) | | | [6]{}: chunk 0x95-0xc6 (49) 0x009| 00 00 00 25 | ...% | length: 37 0x95-0x99 (4) 0x009| 74 45 58 74 | tEXt | type: "tEXt" 0x99-0x9d (4) - 0x009| 74 | t | ancillary: true 0x99.3-0x99.4 (0.1) - 0x009| 45 | E | private: false 0x9a.3-0x9a.4 (0.1) - 0x009| 58 | X | reserved: true 0x9b.3-0x9b.4 (0.1) - 0x009| 74 | t | safe_to_copy: true 0x9c.3-0x9c.4 (0.1) + 0x009| 74 | t | ancillary: true 0x99.2-0x99.3 (0.1) + 0x009| 45 | E | private: false 0x9a.2-0x9a.3 (0.1) + 0x009| 58 | X | reserved: false 0x9b.2-0x9b.3 (0.1) + 0x009| 74 | t | safe_to_copy: true 0x9c.2-0x9c.3 (0.1) 0x009| 64 61 74| dat| keyword: "date:create" 0x9d-0xa9 (12) 0x00a|65 3a 63 72 65 61 74 65 00 |e:create. | 0x00a| 32 30 32 31 2d 31 31| 2021-11| text: "2021-11-21T00:19:38+00:00" 0xa9-0xc2 (25) @@ -390,10 +390,10 @@ $ fq -d zip dv test64.zip | | | [7]{}: chunk 0xc6-0xf7 (49) 0x00c| 00 00 00 25 | ...% | length: 37 0xc6-0xca (4) 0x00c| 74 45 58 74 | tEXt | type: "tEXt" 0xca-0xce (4) - 0x00c| 74 | t | ancillary: true 0xca.3-0xca.4 (0.1) - 0x00c| 45 | E | private: false 0xcb.3-0xcb.4 (0.1) - 0x00c| 58 | X | reserved: true 0xcc.3-0xcc.4 (0.1) - 0x00c| 74 | t | safe_to_copy: true 0xcd.3-0xcd.4 (0.1) + 0x00c| 74 | t | ancillary: true 0xca.2-0xca.3 (0.1) + 0x00c| 45 | E | private: false 0xcb.2-0xcb.3 (0.1) + 0x00c| 58 | X | reserved: false 0xcc.2-0xcc.3 (0.1) + 0x00c| 74 | t | safe_to_copy: true 0xcd.2-0xcd.3 (0.1) 0x00c| 64 61| da| keyword: "date:modify" 0xce-0xda (12) 0x00d|74 65 3a 6d 6f 64 69 66 79 00 |te:modify. | 0x00d| 32 30 32 31 2d 31| 2021-1| text: "2021-11-21T00:19:38+00:00" 0xda-0xf3 (25) @@ -403,10 +403,10 @@ $ fq -d zip dv test64.zip | | | [8]{}: chunk 0xf7-0x103 (12) 0x00f| 00 00 00 00 | .... | length: 0 0xf7-0xfb (4) 0x00f| 49 45 4e 44 | IEND | type: "IEND" 0xfb-0xff (4) - 0x00f| 49 | I | ancillary: false 0xfb.3-0xfb.4 (0.1) - 0x00f| 45 | E | private: false 0xfc.3-0xfc.4 (0.1) - 0x00f| 4e | N | reserved: false 0xfd.3-0xfd.4 (0.1) - 0x00f| 44 | D | safe_to_copy: false 0xfe.3-0xfe.4 (0.1) + 0x00f| 49 | I | ancillary: false 0xfb.2-0xfb.3 (0.1) + 0x00f| 45 | E | private: false 0xfc.2-0xfc.3 (0.1) + 0x00f| 4e | N | reserved: false 0xfd.2-0xfd.3 (0.1) + 0x00f| 44 | D | safe_to_copy: false 0xfe.2-0xfe.3 (0.1) 0x00f| ae| .| crc: 0xae426082 (valid) 0xff-0x103 (4) 0x010|42 60 82| |B`.| | 0x001b0| eb 0c f0 73| ...s| compressed: raw bits 0x1bc-0x28c (208) diff --git a/format/zip/testdata/test9.fqtest b/format/zip/testdata/test9.fqtest index 5809d4ac0..1903f0a16 100644 --- a/format/zip/testdata/test9.fqtest +++ b/format/zip/testdata/test9.fqtest @@ -273,10 +273,10 @@ $ fq -d zip dv test9.zip | | | [0]{}: chunk 0x8-0x21 (25) 0x000| 00 00 00 0d | .... | length: 13 0x8-0xc (4) 0x000| 49 48 44 52| IHDR| type: "IHDR" 0xc-0x10 (4) - 0x000| 49 | I | ancillary: false 0xc.3-0xc.4 (0.1) - 0x000| 48 | H | private: false 0xd.3-0xd.4 (0.1) - 0x000| 44 | D | reserved: false 0xe.3-0xe.4 (0.1) - 0x000| 52| R| safe_to_copy: true 0xf.3-0xf.4 (0.1) + 0x000| 49 | I | ancillary: false 0xc.2-0xc.3 (0.1) + 0x000| 48 | H | private: false 0xd.2-0xd.3 (0.1) + 0x000| 44 | D | reserved: false 0xe.2-0xe.3 (0.1) + 0x000| 52| R| safe_to_copy: false 0xf.2-0xf.3 (0.1) 0x001|00 00 00 04 |.... | width: 4 0x10-0x14 (4) 0x001| 00 00 00 04 | .... | height: 4 0x14-0x18 (4) 0x001| 01 | . | bit_depth: 1 0x18-0x19 (1) @@ -289,20 +289,20 @@ $ fq -d zip dv test9.zip | | | [1]{}: chunk 0x21-0x31 (16) 0x002| 00 00 00 04 | .... | length: 4 0x21-0x25 (4) 0x002| 67 41 4d 41 | gAMA | type: "gAMA" 0x25-0x29 (4) - 0x002| 67 | g | ancillary: false 0x25.3-0x25.4 (0.1) - 0x002| 41 | A | private: false 0x26.3-0x26.4 (0.1) - 0x002| 4d | M | reserved: false 0x27.3-0x27.4 (0.1) - 0x002| 41 | A | safe_to_copy: false 0x28.3-0x28.4 (0.1) + 0x002| 67 | g | ancillary: true 0x25.2-0x25.3 (0.1) + 0x002| 41 | A | private: false 0x26.2-0x26.3 (0.1) + 0x002| 4d | M | reserved: false 0x27.2-0x27.3 (0.1) + 0x002| 41 | A | safe_to_copy: false 0x28.2-0x28.3 (0.1) 0x002| 00 00 b1 8f | .... | value: 45455 0x29-0x2d (4) 0x002| 0b fc 61| ..a| crc: 0xbfc6105 (valid) 0x2d-0x31 (4) 0x003|05 |. | | | | [2]{}: chunk 0x31-0x5d (44) 0x003| 00 00 00 20 | ... | length: 32 0x31-0x35 (4) 0x003| 63 48 52 4d | cHRM | type: "cHRM" 0x35-0x39 (4) - 0x003| 63 | c | ancillary: false 0x35.3-0x35.4 (0.1) - 0x003| 48 | H | private: false 0x36.3-0x36.4 (0.1) - 0x003| 52 | R | reserved: true 0x37.3-0x37.4 (0.1) - 0x003| 4d | M | safe_to_copy: false 0x38.3-0x38.4 (0.1) + 0x003| 63 | c | ancillary: true 0x35.2-0x35.3 (0.1) + 0x003| 48 | H | private: false 0x36.2-0x36.3 (0.1) + 0x003| 52 | R | reserved: false 0x37.2-0x37.3 (0.1) + 0x003| 4d | M | safe_to_copy: false 0x38.2-0x38.3 (0.1) 0x003| 00 00 7a 26 | ..z& | white_point_x: 31.27 0x39-0x3d (4) 0x003| 00 00 80| ...| white_point_y: 32.9 0x3d-0x41 (4) 0x004|84 |. | @@ -318,40 +318,40 @@ $ fq -d zip dv test9.zip 0x005| 00 00 00| ...| length: 2 0x5d-0x61 (4) 0x006|02 |. | 0x006| 62 4b 47 44 | bKGD | type: "bKGD" 0x61-0x65 (4) - 0x006| 62 | b | ancillary: false 0x61.3-0x61.4 (0.1) - 0x006| 4b | K | private: false 0x62.3-0x62.4 (0.1) - 0x006| 47 | G | reserved: false 0x63.3-0x63.4 (0.1) - 0x006| 44 | D | safe_to_copy: false 0x64.3-0x64.4 (0.1) + 0x006| 62 | b | ancillary: true 0x61.2-0x61.3 (0.1) + 0x006| 4b | K | private: false 0x62.2-0x62.3 (0.1) + 0x006| 47 | G | reserved: false 0x63.2-0x63.3 (0.1) + 0x006| 44 | D | safe_to_copy: false 0x64.2-0x64.3 (0.1) 0x006| 00 01 | .. | gray: 1 0x65-0x67 (2) 0x006| dd 8a 13 a4 | .... | crc: 0xdd8a13a4 (valid) 0x67-0x6b (4) | | | [4]{}: chunk 0x6b-0x7e (19) 0x006| 00 00 00 07 | .... | length: 7 0x6b-0x6f (4) 0x006| 74| t| type: "tIME" 0x6f-0x73 (4) 0x007|49 4d 45 |IME | - 0x006| 74| t| ancillary: true 0x6f.3-0x6f.4 (0.1) - 0x007|49 |I | private: false 0x70.3-0x70.4 (0.1) - 0x007| 4d | M | reserved: false 0x71.3-0x71.4 (0.1) - 0x007| 45 | E | safe_to_copy: false 0x72.3-0x72.4 (0.1) + 0x006| 74| t| ancillary: true 0x6f.2-0x6f.3 (0.1) + 0x007|49 |I | private: false 0x70.2-0x70.3 (0.1) + 0x007| 4d | M | reserved: false 0x71.2-0x71.3 (0.1) + 0x007| 45 | E | safe_to_copy: false 0x72.2-0x72.3 (0.1) 0x007| 07 e5 0b 15 00 13 26 | ......& | data: raw bits 0x73-0x7a (7) 0x007| 29 a8 72 42 | ).rB | crc: 0x29a87242 (valid) 0x7a-0x7e (4) | | | [5]{}: chunk 0x7e-0x95 (23) 0x007| 00 00| ..| length: 11 0x7e-0x82 (4) 0x008|00 0b |.. | 0x008| 49 44 41 54 | IDAT | type: "IDAT" 0x82-0x86 (4) - 0x008| 49 | I | ancillary: false 0x82.3-0x82.4 (0.1) - 0x008| 44 | D | private: false 0x83.3-0x83.4 (0.1) - 0x008| 41 | A | reserved: false 0x84.3-0x84.4 (0.1) - 0x008| 54 | T | safe_to_copy: true 0x85.3-0x85.4 (0.1) + 0x008| 49 | I | ancillary: false 0x82.2-0x82.3 (0.1) + 0x008| 44 | D | private: false 0x83.2-0x83.3 (0.1) + 0x008| 41 | A | reserved: false 0x84.2-0x84.3 (0.1) + 0x008| 54 | T | safe_to_copy: false 0x85.2-0x85.3 (0.1) 0x008| 08 d7 63 60 80 00 00 00 08 00| ..c`......| data: raw bits 0x86-0x91 (11) 0x009|01 |. | 0x009| 2f 20 dd 31 | / .1 | crc: 0x2f20dd31 (valid) 0x91-0x95 (4) | | | [6]{}: chunk 0x95-0xc6 (49) 0x009| 00 00 00 25 | ...% | length: 37 0x95-0x99 (4) 0x009| 74 45 58 74 | tEXt | type: "tEXt" 0x99-0x9d (4) - 0x009| 74 | t | ancillary: true 0x99.3-0x99.4 (0.1) - 0x009| 45 | E | private: false 0x9a.3-0x9a.4 (0.1) - 0x009| 58 | X | reserved: true 0x9b.3-0x9b.4 (0.1) - 0x009| 74 | t | safe_to_copy: true 0x9c.3-0x9c.4 (0.1) + 0x009| 74 | t | ancillary: true 0x99.2-0x99.3 (0.1) + 0x009| 45 | E | private: false 0x9a.2-0x9a.3 (0.1) + 0x009| 58 | X | reserved: false 0x9b.2-0x9b.3 (0.1) + 0x009| 74 | t | safe_to_copy: true 0x9c.2-0x9c.3 (0.1) 0x009| 64 61 74| dat| keyword: "date:create" 0x9d-0xa9 (12) 0x00a|65 3a 63 72 65 61 74 65 00 |e:create. | 0x00a| 32 30 32 31 2d 31 31| 2021-11| text: "2021-11-21T00:19:38+00:00" 0xa9-0xc2 (25) @@ -361,10 +361,10 @@ $ fq -d zip dv test9.zip | | | [7]{}: chunk 0xc6-0xf7 (49) 0x00c| 00 00 00 25 | ...% | length: 37 0xc6-0xca (4) 0x00c| 74 45 58 74 | tEXt | type: "tEXt" 0xca-0xce (4) - 0x00c| 74 | t | ancillary: true 0xca.3-0xca.4 (0.1) - 0x00c| 45 | E | private: false 0xcb.3-0xcb.4 (0.1) - 0x00c| 58 | X | reserved: true 0xcc.3-0xcc.4 (0.1) - 0x00c| 74 | t | safe_to_copy: true 0xcd.3-0xcd.4 (0.1) + 0x00c| 74 | t | ancillary: true 0xca.2-0xca.3 (0.1) + 0x00c| 45 | E | private: false 0xcb.2-0xcb.3 (0.1) + 0x00c| 58 | X | reserved: false 0xcc.2-0xcc.3 (0.1) + 0x00c| 74 | t | safe_to_copy: true 0xcd.2-0xcd.3 (0.1) 0x00c| 64 61| da| keyword: "date:modify" 0xce-0xda (12) 0x00d|74 65 3a 6d 6f 64 69 66 79 00 |te:modify. | 0x00d| 32 30 32 31 2d 31| 2021-1| text: "2021-11-21T00:19:38+00:00" 0xda-0xf3 (25) @@ -374,10 +374,10 @@ $ fq -d zip dv test9.zip | | | [8]{}: chunk 0xf7-0x103 (12) 0x00f| 00 00 00 00 | .... | length: 0 0xf7-0xfb (4) 0x00f| 49 45 4e 44 | IEND | type: "IEND" 0xfb-0xff (4) - 0x00f| 49 | I | ancillary: false 0xfb.3-0xfb.4 (0.1) - 0x00f| 45 | E | private: false 0xfc.3-0xfc.4 (0.1) - 0x00f| 4e | N | reserved: false 0xfd.3-0xfd.4 (0.1) - 0x00f| 44 | D | safe_to_copy: false 0xfe.3-0xfe.4 (0.1) + 0x00f| 49 | I | ancillary: false 0xfb.2-0xfb.3 (0.1) + 0x00f| 45 | E | private: false 0xfc.2-0xfc.3 (0.1) + 0x00f| 4e | N | reserved: false 0xfd.2-0xfd.3 (0.1) + 0x00f| 44 | D | safe_to_copy: false 0xfe.2-0xfe.3 (0.1) 0x00f| ae| .| crc: 0xae426082 (valid) 0xff-0x103 (4) 0x010|42 60 82| |B`.| | 0x00150| eb 0c f0 73 e7 e5 92 e2| ...s....| compressed: raw bits 0x158-0x228 (208) diff --git a/pkg/interp/testdata/decode.fqtest b/pkg/interp/testdata/decode.fqtest index f9b40504b..223260028 100644 --- a/pkg/interp/testdata/decode.fqtest +++ b/pkg/interp/testdata/decode.fqtest @@ -79,7 +79,7 @@ $ fq -o force=true -d png d test.mp3 | | | [0]{}: chunk 0x000| 00 23 54 53 | .#TS | length: 2315347 0x000| 53 45 00 00| SE..| type: "SE\x00\x00" -0x000| 53 | S | ancillary: true +0x000| 53 | S | ancillary: false 0x000| 45 | E | private: false 0x000| 00 | . | reserved: false 0x000| 00| .| safe_to_copy: false @@ -95,7 +95,7 @@ $ fq -d bytes 'png({force: true}) | d' test.mp3 | | | [0]{}: chunk 0x000| 00 23 54 53 | .#TS | length: 2315347 0x000| 53 45 00 00| SE..| type: "SE\x00\x00" -0x000| 53 | S | ancillary: true +0x000| 53 | S | ancillary: false 0x000| 45 | E | private: false 0x000| 00 | . | reserved: false 0x000| 00| .| safe_to_copy: false