From bb59b0f8f5f52e459f4d339f3df7f8dd03ae397d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 3 Jun 2018 19:46:51 +1000 Subject: [PATCH] Decode GIF's disposal method --- gen/c/std/gif.c | 12 ++++++++++-- std/gif/decode_gif.wuffs | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 51107567..c853f62b 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -3164,7 +3164,14 @@ static wuffs_gif__status wuffs_gif__decoder__decode_gc( v_flags = t_1; } self->private_impl.f_gc_has_transparent_index = ((v_flags & 1) != 0); - self->private_impl.f_gc_disposal = ((v_flags >> 2) & 7); + v_flags = ((v_flags >> 2) & 7); + if (v_flags == 2) { + self->private_impl.f_gc_disposal = 1; + } else if ((v_flags == 3) || (v_flags == 4)) { + self->private_impl.f_gc_disposal = 2; + } else { + self->private_impl.f_gc_disposal = 0; + } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); uint16_t t_3; @@ -3682,7 +3689,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( .ptr = self->private_impl.f_palettes[0], .len = 1024}); } wuffs_base__image_buffer__update(a_dst, self->private_impl.f_frame_rect, - self->private_impl.f_gc_duration, true, 0, + self->private_impl.f_gc_duration, true, + self->private_impl.f_gc_disposal, v_palette); self->private_impl.f_previous_use_global_palette = !v_use_local_palette; self->private_impl.f_seen_graphic_control = false; diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 9126dcc0..81032667 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -329,7 +329,25 @@ pri func decoder.decode_gc?(src base.io_reader)() { var flags base.u8 = in.src.read_u8?() this.gc_has_transparent_index = (flags & 0x01) != 0 - this.gc_disposal = (flags >> 2) & 0x07 + + // Convert the disposal method from GIF's wire format to Wuffs constants. + // + // The GIF spec discusses the 3-bit flag value being 0, 1, 2 or 3. Values + // in the range [4..7] are "to be defined". In practice, some encoders also + // use 4 for "restore previous". See + // https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/image-decoders/gif/gif_image_reader.cc?rcl=5161173c43324da2b13e1aa45bbe69901daa1279&l=625 + // + // TODO: named constants instead of assigning 1 for + // WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND, etc. + flags = (flags >> 2) & 0x07 + if flags == 2 { + this.gc_disposal = 1 // 1 is WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND + } else if (flags == 3) or (flags == 4) { + this.gc_disposal = 2 // 2 is WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS + } else { + this.gc_disposal = 0 + } + // There are 7056000 flicks per centisecond. this.gc_duration = (in.src.read_u16le?() as base.u64) * 7056000 this.gc_transparent_index = in.src.read_u8?() @@ -490,7 +508,7 @@ pri func decoder.decode_id_part1?(dst ptr base.image_buffer, src base.io_reader) // palette update is necessary. } in.dst.update!(dirty_rect:this.frame_rect, duration:this.gc_duration, - blend:true, disposal:0, palette:palette) + blend:true, disposal:this.gc_disposal, palette:palette) this.previous_use_global_palette = not use_local_palette