sticker-convert 2.8.10__tar.gz → 2.8.11__tar.gz

{sticker_convert-2.8.10/src/sticker_convert.egg-info → sticker_convert-2.8.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.10
+Version: 2.8.11
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>

{sticker_convert-2.8.10 → sticker_convert-2.8.11}/src/sticker_convert/converter.py

@@ -430,19 +430,37 @@ class StickerConvert:
                 and im.n_frames != 0
                 and self.codec_info_orig.fps != 0.0
             ):
+                # Pillow is not reliable for getting webp frame durations
+                durations: Optional[List[int]]
+                if im.format == "WEBP":
+                    _, _, _, durations = CodecInfo._get_file_fps_frames_duration_webp(
+                        self.in_f
+                    )
+                else:
+                    durations = None
+
                 duration_ptr = 0.0
                 duration_inc = 1 / self.codec_info_orig.fps * 1000
-                next_frame_start_duration = im.info.get("duration", 1000)
                 frame = 0
+                if durations is None:
+                    next_frame_start_duration = cast(int, im.info.get("duration", 1000))
+                else:
+                    next_frame_start_duration = durations[0]
                 while True:
                     self.frames_raw.append(np.asarray(im.convert("RGBA")))
                     duration_ptr += duration_inc
                     if duration_ptr >= next_frame_start_duration:
+                        frame += 1
                         if frame == im.n_frames:
                             break
                         im.seek(frame)
-                        next_frame_start_duration += im.info.get("duration", 1000)
-                        frame += 1
+
+                        if durations is None:
+                            next_frame_start_duration += cast(
+                                int, im.info.get("duration", 1000)
+                            )
+                        else:
+                            next_frame_start_duration += durations[frame]
             else:
                 self.frames_raw.append(np.asarray(im.convert("RGBA")))
 
@@ -725,11 +743,11 @@ class StickerConvert:
         if self.out_f.suffix in (".apng", ".png"):
             codec = "apng"
             pixel_format = "rgba"
-            options_container["plays"] = "0"
+            options_stream["plays"] = "0"
         elif self.out_f.suffix in (".webm", ".mkv"):
             codec = "libvpx-vp9"
             pixel_format = "yuva420p"
-            options_container["loop"] = "0"
+            options_stream["loop"] = "0"
         elif self.out_f.suffix == ".webp":
             codec = "webp"
             pixel_format = "yuva420p"
@@ -737,7 +755,7 @@ class StickerConvert:
         else:
             codec = "libvpx-vp9"
             pixel_format = "yuv420p"
-            options_container["loop"] = "0"
+            options_stream["loop"] = "0"
 
         with av.open(
             self.tmp_f,

{sticker_convert-2.8.10 → sticker_convert-2.8.11}/src/sticker_convert/utils/media/codec_info.py

@@ -80,9 +80,9 @@ class CodecInfo:
     @staticmethod
     def get_file_fps_frames_duration(
         file: Union[Path, bytes], file_ext: Optional[str] = None
-    ) -> Tuple[float, int, float]:
+    ) -> Tuple[float, int, int]:
         fps: float
-        duration: float
+        duration: int
 
         if not file_ext and isinstance(file, Path):
             file_ext = CodecInfo.get_file_ext(file)
@@ -94,7 +94,9 @@ class CodecInfo:
             else:
                 duration = 0
         elif file_ext == ".webp":
-            fps, frames, duration = CodecInfo._get_file_fps_frames_duration_webp(file)
+            fps, frames, duration, _ = CodecInfo._get_file_fps_frames_duration_webp(
+                file
+            )
         elif file_ext in (".gif", ".apng", ".png"):
             fps, frames, duration = CodecInfo._get_file_fps_frames_duration_pillow(file)
         else:
@@ -115,7 +117,7 @@ class CodecInfo:
         if file_ext == ".tgs":
             return CodecInfo._get_file_fps_tgs(file)
         elif file_ext == ".webp":
-            fps, _, _ = CodecInfo._get_file_fps_frames_duration_webp(file)
+            fps, _, _, _ = CodecInfo._get_file_fps_frames_duration_webp(file)
             return fps
         elif file_ext in (".gif", ".apng", ".png"):
             fps, _, _ = CodecInfo._get_file_fps_frames_duration_pillow(file)
@@ -159,8 +161,8 @@ class CodecInfo:
     @staticmethod
     def get_file_duration(
         file: Union[Path, bytes], file_ext: Optional[str] = None
-    ) -> float:
-        duration: float
+    ) -> int:
+        duration: int
 
         # Return duration in miliseconds
         if not file_ext and isinstance(file, Path):
@@ -173,7 +175,7 @@ class CodecInfo:
             else:
                 duration = 0
         elif file_ext == ".webp":
-            _, _, duration = CodecInfo._get_file_fps_frames_duration_webp(file)
+            _, _, duration, _ = CodecInfo._get_file_fps_frames_duration_webp(file)
         elif file_ext in (".gif", ".png", ".apng"):
             _, _, duration = CodecInfo._get_file_fps_frames_duration_pillow(file)
         else:
@@ -233,9 +235,9 @@ class CodecInfo:
     @staticmethod
     def _get_file_fps_frames_duration_pillow(
         file: Union[Path, bytes], frames_only: bool = False
-    ) -> Tuple[float, int, float]:
-        total_duration = 0.0
-        durations: List[float] = []
+    ) -> Tuple[float, int, int]:
+        total_duration = 0
+        durations: List[int] = []
 
         with Image.open(file) as im:
             if "n_frames" in dir(im):
@@ -244,7 +246,7 @@ class CodecInfo:
                     return 0.0, frames, 1
                 for i in range(im.n_frames):
                     im.seek(i)
-                    frame_duration = cast(float, im.info.get("duration", 1000))
+                    frame_duration = cast(int, im.info.get("duration", 1000))
                     if frame_duration not in durations and frame_duration != 0:
                         durations.append(frame_duration)
                     total_duration += frame_duration
@@ -255,7 +257,7 @@ class CodecInfo:
                 else:
                     duration_gcd = durations_gcd(*durations)
                     frames_apparent = total_duration / duration_gcd
-                    fps = frames_apparent / total_duration * 1000
+                    fps = float(frames_apparent / total_duration * 1000)
                 return fps, frames, total_duration
 
         return 0.0, 1, 0
@@ -263,10 +265,11 @@ class CodecInfo:
     @staticmethod
     def _get_file_fps_frames_duration_webp(
         file: Union[Path, bytes],
-    ) -> Tuple[float, int, int]:
+    ) -> Tuple[float, int, int, List[int]]:
         total_duration = 0
         frames = 0
         durations: List[int] = []
+        durations_unique: List[int] = []
 
         def _open_f(file: Union[Path, bytes]) -> BinaryIO:
             if isinstance(file, Path):
@@ -285,22 +288,23 @@ class CodecInfo:
                         int(frame_duration_32[-1]) & 0b11111100
                     )
                     frame_duration = int.from_bytes(frame_duration_bytes, "little")
-                    if frame_duration not in durations and frame_duration != 0:
-                        durations.append(frame_duration)
+                    if frame_duration not in durations_unique and frame_duration != 0:
+                        durations_unique.append(frame_duration)
+                    durations.append(frame_duration)
                     total_duration += frame_duration
                     frames += 1
 
         if frames <= 1:
-            return 0.0, 1, 0
+            return 0.0, 1, 0, durations
 
-        if len(durations) == 1:
+        if len(durations_unique) == 1:
             fps = frames / total_duration * 1000
         else:
-            duration_gcd = durations_gcd(*durations)
+            duration_gcd = durations_gcd(*durations_unique)
             frames_apparent = total_duration / duration_gcd
             fps = float(frames_apparent / total_duration * 1000)
 
-        return fps, frames, total_duration
+        return fps, frames, total_duration, durations
 
     @staticmethod
     def _get_file_frames_duration_av(

{sticker_convert-2.8.10 → sticker_convert-2.8.11}/src/sticker_convert/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "2.8.10"
+__version__ = "2.8.11"

{sticker_convert-2.8.10 → sticker_convert-2.8.11/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.10
+Version: 2.8.11
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>