Update to gif.ski 1.10.0 (#292)

Author: kornelski

gifski-api/Cargo.lock

@@ -10,7 +10,7 @@ license = "AGPL-3.0-or-later"
 name = "gifski"
 readme = "README.md"
 repository = "https://github.com/ImageOptim/gifski"
-version = "1.8.1"
+version = "1.10.0"
 autobins = false
 edition = "2021"
 rust-version = "1.63"
@@ -25,11 +25,11 @@ name = "tests"
 required-features = ["png"]
 
 [dependencies]
-gifsicle = { version = "1.92.5", optional = true }
-clap = { version = "3.1.18", features = ["cargo"], optional = true }
-gif = "0.12.0"
+gifsicle = { version = "1.93.0", optional = true }
+clap = { version = "4.1.1", features = ["cargo"], optional = true }
+gif = { version = "0.12.0", default-features = false, features = ["std", "raii_no_panic"] }
 gif-dispose = "4.0.0"
-imagequant = "4.0.4"
+imagequant = "4.1.0"
 imgref = "1.9.4"
 lodepng = { version = "3.7.2", optional = true }
 pbr = { version = "1.0.4", optional = true }
@@ -44,6 +44,7 @@ loop9 = "0.1.3"
 # noisy-float 0.2 bug
 num-traits = { version = "0.2.15", features = ["i128", "std"] }
 crossbeam-utils = "0.8.12"
+scopeguard = "1.1.0"
 
 [dependencies.ffmpeg]
 package = "ffmpeg-next"

gifski-api/Cargo.toml

@@ -14,7 +14,7 @@ See [releases](https://github.com/ImageOptim/gifski/releases) page for executabl
 
 If you have [Homebrew](https://brew.sh/), you can also get it with `brew install gifski`.
 
-If you have [Rust](https://www.rust-lang.org/install.html) 1.60+, you can also build it from source with [`cargo install gifski`](https://lib.rs/crates/gifski).
+If you have [Rust from rustup](https://www.rust-lang.org/install.html) (1.63+), you can also build it from source with [`cargo install gifski`](https://lib.rs/crates/gifski).
 
 ## Usage
 

gifski-api/README.md

@@ -14,8 +14,8 @@ pub struct FfmpegDecoder {
 }
 
 impl Source for FfmpegDecoder {
-    fn total_frames(&self) -> u64 {
-        self.frames
+    fn total_frames(&self) -> Option<u64> {
+        Some(self.frames)
     }
     fn collect(&mut self, dest: &mut Collector) -> BinResult<()> {
         self.collect_frames(dest)
@@ -70,7 +70,7 @@ impl FfmpegDecoder {
         };
 
 
-        let mut add_frame = |rgba_frame: &ffmpeg::util::frame::Video, pts: f64, pos: i64| -> BinResult<()> {
+        let add_frame = |rgba_frame: &ffmpeg::util::frame::Video, pts: f64, pos: i64| -> BinResult<()> {
             let stride = rgba_frame.stride(0) as usize;
             if stride % 4 != 0 {
                 Err("incompatible video")?;

gifski-api/src/bin/ffmpeg_source.rs

@@ -0,0 +1,49 @@
+//! This is for reading GIFs as an input for re-encoding as another GIF
+
+use std::fs::File;
+use gif::Decoder;
+use gifski::Collector;
+use std::path::Path;
+use crate::{source::{Fps, Source}, BinResult};
+
+pub struct GifDecoder {
+    speed: f32,
+    decoder: Decoder<File>,
+    screen: gif_dispose::Screen,
+}
+
+impl GifDecoder {
+    pub fn new(path: &Path, fps: Fps) -> BinResult<Self> {
+        let file = std::fs::File::open(path)?;
+
+        let mut gif_opts = gif::DecodeOptions::new();
+        // Important:
+        gif_opts.set_color_output(gif::ColorOutput::Indexed);
+
+        let decoder = gif_opts.read_info(file)?;
+        let screen = gif_dispose::Screen::new_decoder(&decoder);
+
+        Ok(Self {
+            speed: fps.speed,
+            decoder,
+            screen,
+        })
+    }
+}
+
+impl Source for GifDecoder {
+    fn total_frames(&self) -> Option<u64> { None }
+    fn collect(&mut self, c: &mut Collector) -> BinResult<()> {
+        let mut idx = 0;
+        let mut delay_ts = 0;
+        while let Some(frame) = self.decoder.read_next_frame()? {
+            self.screen.blit_frame(frame)?;
+            let pixels = self.screen.pixels.clone();
+            let presentation_timestamp = f64::from(delay_ts) * (self.speed as f64 / 100.);
+            c.add_frame_rgba(idx, pixels, presentation_timestamp)?;
+            idx += 1;
+            delay_ts += frame.delay as u32;
+        }
+        Ok(())
+    }
+}