Extend animated tests to apng

image-rs · Jun 17, 2020 · 46df994 · 46df994
1 parent da78e55
commit 46df994
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 13 deletions.
diff --git a/tests/images/png/apng/ball.png b/tests/images/png/apng/ball.png
diff --git a/tests/reference/png/apng/ball.png.anim_01_01c840a9.png b/tests/reference/png/apng/ball.png.anim_01_01c840a9.png
diff --git a/tests/reference/png/apng/ball.png.anim_02_a5cb4cc1.png b/tests/reference/png/apng/ball.png.anim_02_a5cb4cc1.png
diff --git a/tests/reference/png/apng/ball.png.anim_03_cc6d71d9.png b/tests/reference/png/apng/ball.png.anim_03_cc6d71d9.png
diff --git a/tests/reference/png/apng/ball.png.anim_04_26897da3.png b/tests/reference/png/apng/ball.png.anim_04_26897da3.png
diff --git a/tests/reference/png/apng/ball.png.anim_05_123fe3c5.png b/tests/reference/png/apng/ball.png.anim_05_123fe3c5.png
diff --git a/tests/reference/png/apng/ball.png.anim_06_69c299ea.png b/tests/reference/png/apng/ball.png.anim_06_69c299ea.png
diff --git a/tests/reference/png/apng/ball.png.anim_07_765d3648.png b/tests/reference/png/apng/ball.png.anim_07_765d3648.png
diff --git a/tests/reference/png/apng/ball.png.anim_08_e44a80f7.png b/tests/reference/png/apng/ball.png.anim_08_e44a80f7.png
diff --git a/tests/reference/png/apng/ball.png.anim_09_dd6883db.png b/tests/reference/png/apng/ball.png.anim_09_dd6883db.png
diff --git a/tests/reference/png/apng/ball.png.anim_10_3b68b97b.png b/tests/reference/png/apng/ball.png.anim_10_3b68b97b.png
diff --git a/tests/reference/png/apng/ball.png.anim_11_c42e2a3f.png b/tests/reference/png/apng/ball.png.anim_11_c42e2a3f.png
diff --git a/tests/reference/png/apng/ball.png.anim_12_0796c12e.png b/tests/reference/png/apng/ball.png.anim_12_0796c12e.png
diff --git a/tests/reference/png/apng/ball.png.anim_13_bf335902.png b/tests/reference/png/apng/ball.png.anim_13_bf335902.png
diff --git a/tests/reference/png/apng/ball.png.anim_14_ee765a97.png b/tests/reference/png/apng/ball.png.anim_14_ee765a97.png
diff --git a/tests/reference/png/apng/ball.png.anim_15_56f89914.png b/tests/reference/png/apng/ball.png.anim_15_56f89914.png
diff --git a/tests/reference/png/apng/ball.png.anim_16_cd899432.png b/tests/reference/png/apng/ball.png.anim_16_cd899432.png
diff --git a/tests/reference/png/apng/ball.png.anim_17_0c3b039a.png b/tests/reference/png/apng/ball.png.anim_17_0c3b039a.png
diff --git a/tests/reference/png/apng/ball.png.anim_18_611a8f5d.png b/tests/reference/png/apng/ball.png.anim_18_611a8f5d.png
diff --git a/tests/reference/png/apng/ball.png.anim_19_d7316ce1.png b/tests/reference/png/apng/ball.png.anim_19_d7316ce1.png
diff --git a/tests/reference/png/apng/ball.png.anim_20_1e8b755f.png b/tests/reference/png/apng/ball.png.anim_20_1e8b755f.png
diff --git a/tests/reference_images.rs b/tests/reference_images.rs
@@ -91,10 +91,9 @@ enum ReferenceTestKind {
     /// against the reference image.
     SingleImage,
 
-    /// From the test image file, a single frame is extracted using
-    /// `image::gif::Decoder`, and the result is compared against the reference
-    /// image.
-    AnimatedGifFrame {
+    /// From the test image file, a single frame is extracted using a fitting animation decoder and
+    /// the result is compared against the reference image.
+    AnimatedFrame {
         /// A zero-based frame number.
         frame: usize,
     },
@@ -125,7 +124,7 @@ impl std::str::FromStr for ReferenceTestCase {
             // `anim_FRAME_CRC`
             crc = parse_crc(&meta[2]).ok_or("malformed CRC")?;
             let frame: usize = meta[1].parse().map_err(|_| "malformed frame number")?;
-            kind = ReferenceTestKind::AnimatedGifFrame {
+            kind = ReferenceTestKind::AnimatedFrame {
                 frame: frame.checked_sub(1).ok_or("frame number must be 1-based")?,
             };
         } else {
@@ -181,12 +180,18 @@ fn check_references() {
         img_path.push(case.orig_filename);
 
         // Load the test image
-        let test_img;
+        let mut test_img = None;
 
         match case.kind {
-            ReferenceTestKind::AnimatedGifFrame { frame: frame_num } => {
+            ReferenceTestKind::AnimatedFrame { frame: frame_num } => {
+                let format = image::io::Reader::open(&img_path)
+                        .unwrap()
+                        .with_guessed_format()
+                        .unwrap()
+                        .format();
+
                 #[cfg(feature = "gif")]
-                {
+                if format == Some(image::ImageFormat::Gif) {
                     // Interpret the input file as an animation file
                     use image::AnimationDecoder;
                     let stream = io::BufReader::new(fs::File::open(&img_path).unwrap());
@@ -211,11 +216,39 @@ fn check_references() {
                     let frame = frames.drain(frame_num..).nth(0).unwrap();
 
                     // Convert the frame to a`RgbaImage`
-                    test_img = frame.into_buffer();
+                    test_img = Some(frame.into_buffer());
+                }
+
+                #[cfg(feature = "png")]
+                if format == Some(image::ImageFormat::Png) {
+                    // Interpret the input file as an animation file
+                    use image::AnimationDecoder;
+                    let stream = io::BufReader::new(fs::File::open(&img_path).unwrap());
+                    let decoder = match image::png::PngDecoder::new(stream) {
+                        Ok(decoder) => decoder.apng(),
+                        Err(image::ImageError::Unsupported(_)) => return,
+                        Err(err) => {
+                            panic!(format!("decoding of {:?} failed with: {}", img_path, err))
+                        }
+                    };
+
+                    let mut frames = match decoder.into_frames().collect_frames() {
+                        Ok(frames) => frames,
+                        Err(image::ImageError::Unsupported(_)) => return,
+                        Err(err) => panic!(format!(
+                            "collecting frames of {:?} failed with: {}",
+                            img_path, err
+                        )),
+                    };
+
+                    // Select a single frame
+                    let frame = frames.drain(frame_num..).nth(0).unwrap();
+
+                    // Convert the frame to a`RgbaImage`
+                    test_img = Some(frame.into_buffer());
                 }
 
-                #[cfg(not(feature = "gif"))]
-                {
+                if test_img.is_none() {
                     println!("Skipping - GIF codec is not enabled");
                     return;
                 }
@@ -224,7 +257,7 @@ fn check_references() {
             ReferenceTestKind::SingleImage => {
                 // Read the input file as a single image
                 match image::open(&img_path) {
-                    Ok(img) => test_img = img.to_rgba(),
+                    Ok(img) => test_img = Some(img.to_rgba()),
                     // Do not fail on unsupported error
                     // This might happen because the testsuite contains unsupported images
                     // or because a specific decoder included via a feature.
@@ -234,6 +267,11 @@ fn check_references() {
             }
         }
 
+        let test_img = match test_img.as_ref() {
+            Some(img) => img,
+            None => return,
+        };
+
         let test_crc_actual = {
             let mut hasher = Crc32::new();
             hasher.update(&*test_img);
@@ -247,7 +285,7 @@ fn check_references() {
             );
         }
 
-        if *ref_img != *test_img {
+        if *ref_img != **test_img {
             panic!("Reference rendering does not match.");
         }
     })