8000 webp: Refactor to use shared riff code decode VP8X, EXIF and XMP chunks by wader · Pull Request #803 · wader/fq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

webp: Refactor to use shared riff code decode VP8X, EXIF and XMP chunks #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2023
Merged

webp: Refactor to use shared riff code decode VP8X, EXIF and XMP chunks #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/formats.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
|`vpx_ccr` |VPX&nbsp;Codec&nbsp;Configuration&nbsp;Record |<sub></sub>|
|[`wasm`](#wasm) |WebAssembly&nbsp;Binary&nbsp;Format |<sub></sub>|
|`wav` |WAV&nbsp;file |<sub>`id3v2` `id3v1` `id3v11`</sub>|
|`webp` |WebP&nbsp;image |<sub>`vp8_frame`</sub>|
|`webp` |WebP&nbsp;image |<sub>`exif` `vp8_frame` `icc_profile` `xml`</sub>|
|[`xml`](#xml) |Extensible&nbsp;Markup&nbsp;Language |<sub></sub>|
|`yaml` |YAML&nbsp;Ain't&nbsp;Markup&nbsp;Language |<sub></sub>|
|[`zip`](#zip) |ZIP&nbsp;archive |<sub>`probe`</sub>|
Expand Down
1,998 changes: 1,011 additions & 987 deletions doc/formats.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion format/all/all.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import (
_ "github.com/wader/fq/format/vorbis"
_ "github.com/wader/fq/format/vpx"
_ "github.com/wader/fq/format/wasm"
_ "github.com/wader/fq/format/webp"
_ "github.com/wader/fq/format/xml"
_ "github.com/wader/fq/format/yaml"
_ "github.com/wader/fq/format/zip"
Expand Down
51 changes: 26 additions & 25 deletions format/webp/testdata/4x4.fqtest → format/riff/testdata/4x4.fqtest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
# convert -size 4x4 "xc:#000" 4x4.webp
$ fq -d webp dv 4x4.webp
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: 4x4.webp (webp) 0x0-0x2c (44)
0x00|52 49 46 46 |RIFF | riff_id: "RIFF" (valid) 0x0-0x4 (4)
0x00| 24 00 00 00 | $... | riff_length: 36 0x4-0x8 (4)
0x00| 57 45 42 50 | WEBP | webp_id: "WEBP" (valid) 0x8-0xc (4)
| | | image{}: 0xc-0x2c (32)
0x00| 56 50 38 20| VP8 | id: "VP8" 0xc-0x10 (4)
0x10|18 00 00 00 |.... | size: 24 0x10-0x14 (4)
| | | tag{}: 0x14-0x17 (3)
0x10| 30 | 0 | first_part_size0: 1 0x14-0x14.3 (0.3)
0x10| 30 | 0 | show_frame: 1 0x14.3-0x14.4 (0.1)
0x10| 30 | 0 | version: 0 0x14.4-0x14.7 (0.3)
0x10| 30 | 0 | frame_type: "key_frame" (false) 0x14.7-0x15 (0.1)
0x10| 01 00 | .. | first_part_size1: 1 0x15-0x17 (2)
| | | first_part_size: 9
| | | reconstruction: "Bicubic"
| | | loop: "Normal"
0x10| 9d 01 2a | ..* | start_code: 0x9d012a (valid) 0x17-0x1a (3)
0x10| 04 | . | width0: 4 0x1a-0x1b (1)
0x10| 00 | . | horizontal_scale: 0 0x1b-0x1b.2 (0.2)
0x10| 00 | . | width1: 0 0x1b.2-0x1c (0.6)
| | | width: 4
0x10| 04 | . | height0: 4 0x1c-0x1d (1)
0x10| 00 | . | vertical_scale: 0 0x1d-0x1d.2 (0.2)
0x10| 00 | . | height1: 0 0x1d.2-0x1e (0.6)
| | | height: 4
0x10| 02 00| ..| data: raw bits 0x1e-0x2c (14)
0x00|52 49 46 46 |RIFF | id: "RIFF" 0x0-0x4 (4)
0x00| 24 00 00 00 | $... | size: 36 0x4-0x8 (4)
0x00| 57 45 42 50 | WEBP | format: "WEBP" (valid) 0x8-0xc (4)
| | | chunks[0:1]: 0xc-0x2c (32)
| | | [0]{}: chunk 0xc-0x2c (32)
0x00| 56 50 38 20| VP8 | id: "VP8 " 0xc-0x10 (4)
0x10|18 00 00 00 |.... | size: 24 0x10-0x14 (4)
| | | tag{}: 0x14-0x17 (3)
0x10| 30 | 0 | first_part_size0: 1 0x14-0x14.3 (0.3)
0x10| 30 | 0 | show_frame: 1 0x14.3-0x14.4 (0.1)
0x10| 30 | 0 | version: 0 0x14.4-0x14.7 (0.3)
0x10| 30 | 0 | frame_type: "key_frame" (false) 0x14.7-0x15 (0.1)
0x10| 01 00 | .. | first_part_size1: 1 0x15-0x17 (2)
| | | first_part_size: 9
| | | reconstruction: "Bicubic"
| | | loop: "Normal"
0x10| 9d 01 2a | ..* | start_code: 0x9d012a (valid) 0x17-0x1a (3)
0x10| 04 | . | width0: 4 0x1a-0x1b (1)
0x10| 00 | . | horizontal_scale: 0 0x1b-0x1b.2 (0.2)
0x10| 00 | . | width1: 72BE 0 0x1b.2-0x1c (0.6)
| | | width: 4
0x10| 04 | . | height0: 4 0x1c-0x1d (1)
0x10| 00 | . | vertical_scale: 0 0x1d-0x1d.2 (0.2)
0x10| 00 | . | height1: 0 0x1d.2-0x1e (0.6)
| | | height: 4
0x10| 02 00| ..| data: raw bits 0x1e-0x2c (14)
0x20|34 25 a4 00 03 70 00 fe fb fd 50 00| |4%...p....P.| |
0 format/webp/testdata/4x4.webp → format/riff/testdata/4x4.webp
View file
Open in desktop
File renamed without changes.
Loading
0