Fixed GIF and WebP animation support

Author: Ben-Brady

.gitignore

@@ -159,3 +159,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 .vscode/settings.json
+.vscode/launch.json

examples/summary.py

@@ -3,20 +3,20 @@
 with open('./input/heavy.mp4', 'rb') as f:
     data = f.read()
 
-summary = mediaify.encode_video(
-    data,
-    mediaify.AnimationSummaryConfig(
-        frames=60,
-        framerate=15,
-        encoding=mediaify.WEBPAnimationEncodeConfig(
-            resize=mediaify.ResizeConfig(
-                width=192,
-                height=108,
-            )
-        )
+config = mediaify.AnimationSummaryConfig(
+    frames=60,
+    framerate=15,
+    encoding=mediaify.WEBPAnimationEncodeConfig(
+        resize=mediaify.ResizeConfig(
+            width=192,
+            height=108,
+        ),
+        quality=70,
     )
 )
 
+summary = mediaify.encode_video(data, config)
+
 
 filepath = f"./output/summary{summary.ext}"
 with open(filepath, "wb") as f:

mediaify/animation/gif.py

@@ -6,7 +6,7 @@
 from .utils import (
     get_animation_duration_in_seconds,
     get_frame_lengths,
-    get_animation_frames,
+    extract_animation_frames,
 )
 
 import io
@@ -17,17 +17,23 @@ def encode_as_gif(
         pillow: PILImage.Image,
         config: GIFEncodeConfig
         ) -> AnimationFile:
+    frames = extract_animation_frames(pillow)
+
     if config.resize is not None:
         im_size = (pillow.width, pillow.height)
         size = calculate_downscale(im_size, config.resize)
-        pillow = pillow.resize(size, PILImage.LANCZOS)
+        frames = [
+            frame.resize(size, PILImage.LANCZOS)
+            for frame in frames
+        ]
 
+    first_frame = frames[0]
     buf = io.BytesIO()
-    pillow.save(
+    first_frame.save(
         fp=buf,
         format='gif',
         save_all=True,  # Save as an animation
-        append_images=get_animation_frames(pillow),
+        append_images=frames[1:],
         duration=get_frame_lengths(pillow),
         optimize=True,
         loop=0,
@@ -36,8 +42,8 @@ def encode_as_gif(
     return AnimationFile(
         data=buf.getvalue(),
         mimetype='image/gif',
-        width=pillow.width,
-        height=pillow.height,
+        width=first_frame.width,
+        height=first_frame.height,
         frame_count=pillow.n_frames,
         duration=get_animation_duration_in_seconds(pillow),
     )

mediaify/animation/utils.py

@@ -1,5 +1,5 @@
-from PIL.Image import Image
-from typing import List
+from PIL.Image import Image, LANCZOS
+from typing import List, Tuple
 
 
 def get_animation_duration_in_milliseconds(pillow: Image) -> int:
@@ -8,10 +8,17 @@ def get_animation_duration_in_milliseconds(pillow: Image) -> int:
 
 
 def get_animation_duration_in_seconds(pillow: Image) -> float:
-    "Get animation duration in seconds"
+    "Get animation d`uration in seconds"
     return sum(get_frame_lengths(pillow)) / 1000
 
 
+def resize_animation(pillow: Image, size: "Tuple[int, int]") -> "list[Image]":
+    return [
+        frame.resize(size, LANCZOS)
+        for frame in extract_animation_frames(pillow)
+    ]
+
+
 def get_frame_lengths(pillow: Image) -> "List[int]":
     frame_durations = []
     for x in range(pillow.n_frames):
@@ -22,10 +29,11 @@ def get_frame_lengths(pillow: Image) -> "List[int]":
     return frame_durations
 
 
-def get_animation_frames(pillow: Image) -> "List[Image]":
+def extract_animation_frames(pillow: Image) -> "List[Image]":
     frames = []
     for x in range(pillow.n_frames):
         pillow.seek(x)
         frames.append(pillow.copy())
 
+    pillow.seek(0)
     return frames

mediaify/animation/webp.py

@@ -6,7 +6,7 @@
 from .utils import (
     get_animation_duration_in_seconds,
     get_frame_lengths,
-    get_animation_frames,
+    extract_animation_frames,
 )
 
 import io
@@ -20,31 +20,39 @@ def encode_as_webp(
     if not PILFeatures.check("webp_anim"):
         raise RuntimeError("WebP animation support not available, WeBP library outdated?")
 
+    frames = extract_animation_frames(pillow)
+
     if config.resize is not None:
         im_size = (pillow.width, pillow.height)
         size = calculate_downscale(im_size, config.resize)
-        pillow = pillow.resize(size, PILImage.LANCZOS)
+        frames = [
+            frame.resize(size, PILImage.LANCZOS)
+            for frame in frames
+        ]
 
+    first_frame = frames[0]
     buf = io.BytesIO()
-    pillow.save(
+    first_frame.save(
         fp=buf,
         format='webp',
         lossless=config.lossless,
         quality=config.quality,
+        allow_mixed=not config.lossless,  # Allow mixed lossy/lossless frames
+        minimize_size=True,
+
         save_all=True,  # Save as an animation
+        append_images=frames[1:],
         transparency=0,
         duration=get_frame_lengths(pillow),
         background=(0, 0, 0, 0),  # Transparent background
-        minimize_size=True,
-        allow_mixed=not config.lossless,
         disposal=2,
     )
 
     return AnimationFile(
         data=buf.getvalue(),
         mimetype='image/webp',
-        width=pillow.width,
-        height=pillow.height,
+        width=first_frame.width,
+        height=first_frame.height,
         frame_count=pillow.n_frames,
         duration=get_animation_duration_in_seconds(pillow),
     )

test/data.py

@@ -82,21 +82,21 @@ class TestVideo:
     mimetype="image/gif",
     width=241,
     height=300,
-    frame_count=6400,
+    frame_count=128,
 )
 
 SINGLE_FRAME_ANIMATION = TestAnimation(
     filepath="./test/data/animation/single_frame.gif",
     mimetype="image/gif",
     width=241,
     height=300,
-    frame_count=50,
+    frame_count=1,
 )
 
 FRACTAL_ANIMATION = TestAnimation(
     filepath="./test/data/animation/fractal.gif",
     mimetype="image/gif",
     width=500,
     height=500,
-    frame_count=600,
+    frame_count=12,
 )

test/image/test_webp.py

@@ -22,4 +22,5 @@ def test_encode_as_png():
     assert image.width == 100
     assert image.height == 100
     assert image.mimetype == "image/webp"
+    assert image.mimetype == "image/webp"
     assert validate_image(image.data)