Canonicalize stills' NIA conversion's loops to 0

This commit is contained in:
Nigel Tao committed 2021-11-23 21:39:29 +11:00
1 parent c2eb4f5b93
commit 3a9933f2a0
2 files changed
+20 -3

No files matched your search

+18 -1
View File
@@ -130,6 +130,7 @@ int32_t g_fourcc = 0;
uint32_t g_width = 0;
uint32_t g_height = 0;
uint32_t g_num_animation_loops = 0;
uint64_t g_num_printed_frames = 0;
wuffs_base__image_decoder* g_image_decoder = NULL;
union {
@@ -467,6 +468,7 @@ print_nia_duration(wuffs_base__flicks duration) {
void //
print_nie_frame() {
g_num_printed_frames++;
print_nix_header(0x45AFC36E); // "nïE" as a u32le.
wuffs_base__table_u8 tab = wuffs_base__pixel_buffer__plane(&g_pixbuf, 0);
if (tab.width == tab.stride) {
@@ -491,8 +493,23 @@ print_nia_padding() {
void //
print_nia_footer() {
// For still (non-animated) frames, the number of animation loops has no
// practical effect: the pixels on screen do not change over time regardless
// of its value. In the wire format encoding, there might be no explicit
// "number of animation loops" value listed in the source bytes. Various
// codec implementations may therefore choose an implicit default of 0 ("loop
// forever") or 1 ("loop exactly once"). Either is equally valid.
//
// However, when comparing the output of this convert-to-NIA program (backed
// by Wuffs' image codecs) with other convert-to-NIA programs, it is useful
// to canonicalize still images' "number of animation loops" to 0.
uint32_t n = g_num_animation_loops;
if (g_num_printed_frames <= 1) {
n = 0;
}
uint8_t data[8];
wuffs_base__poke_u32le__no_bounds_check(data + 0x00, g_num_animation_loops);
wuffs_base__poke_u32le__no_bounds_check(data + 0x00, n);
wuffs_base__poke_u32le__no_bounds_check(data + 0x04, 0x80000000);
ignore_return_value(write(STDOUT_FD, &data[0], 8));
}
+2 -2
View File
@@ -9,8 +9,8 @@ e651a889 test/data/animated-red-blue.000002.nie
f9a10dac test/data/artificial-gif/background-color.gif
36e7d9c7 test/data/artificial-gif/empty-palette.gif
db4c30eb test/data/artificial-gif/frame-out-of-bounds.gif
fdcc644f test/data/artificial-gif/metadata-empty.gif
fdcc644f test/data/artificial-gif/metadata-full.gif
f2dc2c43 test/data/artificial-gif/metadata-empty.gif
f2dc2c43 test/data/artificial-gif/metadata-full.gif
a1a9b56d test/data/artificial-gif/multiple-graphic-controls.gif
046a2d07 test/data/artificial-gif/multiple-loop-counts.gif
ba6e48f8 test/data/artificial-gif/no-frames.gif