sticker-convert 2.7.9__tar.gz → 2.7.11__tar.gz

{sticker-convert-2.7.9/src/sticker_convert.egg-info → sticker-convert-2.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.9
+Version: 2.7.11
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -378,7 +378,7 @@ Requires-Dist: Pillow==10.1.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
-Requires-Dist: rlottie_python~=1.3.3
+Requires-Dist: rlottie_python~=1.3.4
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: sqlcipher3-wheels~=0.5.2.post1
 Requires-Dist: tqdm~=4.66.2

{sticker-convert-2.7.9 → sticker-convert-2.7.11}/requirements.txt

@@ -12,7 +12,7 @@ Pillow==10.1.0
 pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0
-rlottie_python~=1.3.3
+rlottie_python~=1.3.4
 signalstickers-client~=3.3.0
 sqlcipher3-wheels~=0.5.2.post1
 tqdm~=4.66.2

{sticker-convert-2.7.9 → sticker-convert-2.7.11}/src/sticker_convert/converter.py

@@ -19,6 +19,7 @@ from sticker_convert.utils.media.codec_info import CodecInfo
 from sticker_convert.utils.media.format_verify import FormatVerify
 
 if TYPE_CHECKING:
+    from av.video.frame import VideoFrame  # type: ignore
     from av.video.plane import VideoPlane  # type: ignore
 
 MSG_START_COMP = "[I] Start compressing {} -> {}"
@@ -34,6 +35,14 @@ MSG_FAIL_COMP = (
     "cannot get below limit {} with lowest quality under current settings (Best size: {})"
 )
 
+YUV_RGB_MATRIX = np.array(
+    [
+        [1.164, 0.000, 1.793],
+        [1.164, -0.213, -0.533],
+        [1.164, 2.112, 0.000],
+    ]
+)
+
 
 def rounding(value: float) -> Decimal:
     return Decimal(value).quantize(0, ROUND_HALF_UP)
@@ -76,6 +85,40 @@ def useful_array(
     return arr.view(np.dtype(dtype))
 
 
+def yuva_to_rgba(frame: "VideoFrame") -> "np.ndarray[Any, Any]":
+    # https://stackoverflow.com/questions/72308308/converting-yuv-to-rgb-in-python-coefficients-work-with-array-dont-work-with-n
+
+    width = frame.width
+    height = frame.height
+
+    y = useful_array(frame.planes[0]).reshape(height, width)
+    u = useful_array(frame.planes[1]).reshape(height // 2, width // 2)
+    v = useful_array(frame.planes[2]).reshape(height // 2, width // 2)
+    a = useful_array(frame.planes[3]).reshape(height, width)
+
+    u = u.repeat(2, axis=0).repeat(2, axis=1)
+    v = v.repeat(2, axis=0).repeat(2, axis=1)
+
+    y = y.reshape((y.shape[0], y.shape[1], 1))
+    u = u.reshape((u.shape[0], u.shape[1], 1))
+    v = v.reshape((v.shape[0], v.shape[1], 1))
+    a = a.reshape((a.shape[0], a.shape[1], 1))
+
+    yuv_array = np.concatenate((y, u, v), axis=2)
+
+    yuv_array = yuv_array.astype(np.float32)
+    yuv_array[:, :, 0] = (
+        yuv_array[:, :, 0].clip(16, 235).astype(yuv_array.dtype) - 16  # type: ignore
+    )
+    yuv_array[:, :, 1:] = (
+        yuv_array[:, :, 1:].clip(16, 240).astype(yuv_array.dtype) - 128  # type: ignore
+    )
+
+    rgb_array = np.matmul(yuv_array, YUV_RGB_MATRIX.T).clip(0, 255).astype("uint8")
+
+    return np.concatenate((rgb_array, a), axis=2)
+
+
 class StickerConvert:
     def __init__(
         self,
@@ -131,6 +174,11 @@ class StickerConvert:
         self.fps: Optional[Fraction] = None
         self.color: Optional[int] = None
 
+        self.bg_color: Optional[Tuple[int, int, int, int]] = None
+        if self.opt_comp.bg_color:
+            r, g, b = bytes.fromhex(self.opt_comp.bg_color)
+            self.bg_color = (r, g, b, 0)
+
         self.tmp_f: BytesIO = BytesIO()
         self.result: Optional[bytes] = None
         self.result_size: int = 0
@@ -407,10 +455,12 @@ class StickerConvert:
                         width = frame.width - 1
                     else:
                         width = frame.width
+
                     if frame.height % 2 != 0:
                         height = frame.height - 1
                     else:
                         height = frame.height
+
                     if frame.format.name == "yuv420p":
                         rgb_array = frame.to_ndarray(format="rgb24")
                         cast("np.ndarray[Any, Any]", rgb_array)
@@ -422,6 +472,7 @@ class StickerConvert:
                         )
                     else:
                         # yuva420p may cause crash
+                        # Not safe to directly call frame.to_ndarray(format="rgba")
                         # https://github.com/laggykiller/sticker-convert/issues/114
                         frame = frame.reformat(
                             width=width,
@@ -429,50 +480,7 @@ class StickerConvert:
                             format="yuva420p",
                             dst_colorspace=1,
                         )
-
-                        # https://stackoverflow.com/questions/72308308/converting-yuv-to-rgb-in-python-coefficients-work-with-array-dont-work-with-n
-                        y = useful_array(frame.planes[0]).reshape(height, width)
-                        u = useful_array(frame.planes[1]).reshape(
-                            height // 2,
-                            width // 2,
-                        )
-                        v = useful_array(frame.planes[2]).reshape(
-                            height // 2,
-                            width // 2,
-                        )
-                        a = useful_array(frame.planes[3]).reshape(height, width)
-
-                        u = u.repeat(2, axis=0).repeat(2, axis=1)
-                        v = v.repeat(2, axis=0).repeat(2, axis=1)
-
-                        y = y.reshape((y.shape[0], y.shape[1], 1))
-                        u = u.reshape((u.shape[0], u.shape[1], 1))
-                        v = v.reshape((v.shape[0], v.shape[1], 1))
-                        a = a.reshape((a.shape[0], a.shape[1], 1))
-
-                        yuv_array = np.concatenate((y, u, v), axis=2)
-
-                        yuv_array = yuv_array.astype(np.float32)
-                        yuv_array[:, :, 0] = (
-                            yuv_array[:, :, 0].clip(16, 235).astype(yuv_array.dtype)  # type: ignore
-                            - 16
-                        )
-                        yuv_array[:, :, 1:] = (
-                            yuv_array[:, :, 1:].clip(16, 240).astype(yuv_array.dtype)  # type: ignore
-                            - 128
-                        )
-
-                        convert = np.array(
-                            [
-                                [1.164, 0.000, 1.793],
-                                [1.164, -0.213, -0.533],
-                                [1.164, 2.112, 0.000],
-                            ]
-                        )
-                        rgb_array = (
-                            np.matmul(yuv_array, convert.T).clip(0, 255).astype("uint8")
-                        )
-                        rgba_array = np.concatenate((rgb_array, a), axis=2)
+                        rgba_array = yuva_to_rgba(frame)
 
                     self.frames_raw.append(rgba_array)
 
@@ -505,6 +513,27 @@ class StickerConvert:
 
         anim.lottie_animation_destroy()
 
+    def determine_bg_color(self) -> Tuple[int, int, int, int]:
+        # Calculate average color of all frames for selecting background color
+        frames_raw_np = np.array(self.frames_raw)
+        s = frames_raw_np.shape
+        colors = frames_raw_np.reshape((-1, s[3]))  # type: ignore
+        # Do not count in alpha=0
+        # If alpha > 0, use alpha as weight
+        colors = colors[colors[:, 3] != 0]
+        if colors.shape[0] == 0:
+            return (0, 0, 0, 0)
+        else:
+            alphas = colors[:, 3] / 255
+            r_mean = np.mean(colors[:, 0] * alphas)
+            g_mean = np.mean(colors[:, 1] * alphas)
+            b_mean = np.mean(colors[:, 2] * alphas)
+            mean = (r_mean + g_mean + b_mean) / 3
+            if mean < 128:
+                return (255, 255, 255, 0)
+            else:
+                return (0, 0, 0, 0)
+
     def frames_resize(
         self, frames_in: "List[np.ndarray[Any, Any]]"
     ) -> "List[np.ndarray[Any, Any]]":
@@ -526,25 +555,8 @@ class StickerConvert:
         else:
             resample = Image.BICUBIC
 
-        if not self.opt_comp.bg_color:
-            # Calculate average color of all frames for selecting background color
-            frames_raw_np = np.array(self.frames_raw)
-            s = frames_raw_np.shape
-            colors = frames_raw_np.reshape((-1, s[3]))  # type: ignore
-            # Do not count in alpha=0
-            # If alpha > 0, use alpha as weight
-            colors = colors[colors[:, 3] != 0]
-            if colors.shape[0] == 0:
-                bg = (0, 0, 0, 0)
-            else:
-                colors = colors * (colors[3] / 255)
-                if np.mean(colors[:, :3]) < 128:
-                    bg = (255, 255, 255, 0)
-                else:
-                    bg = (0, 0, 0, 0)
-        else:
-            r, g, b = bytes.fromhex(self.opt_comp.bg_color)
-            bg = (r, g, b, 0)
+        if self.bg_color is None:
+            self.bg_color = self.determine_bg_color()
 
         for frame in frames_in:
             with Image.fromarray(frame, "RGBA") as im:  # type: ignore
@@ -563,7 +575,9 @@ class StickerConvert:
                 width_new = width * self.res_h // height
 
             with im.resize((width_new, height_new), resample=resample) as im_resized:
-                with Image.new("RGBA", (self.res_w, self.res_h), bg) as im_new:
+                with Image.new(
+                    "RGBA", (self.res_w, self.res_h), self.bg_color
+                ) as im_new:
                     im_new.alpha_composite(
                         im_resized,
                         ((self.res_w - width_new) // 2, (self.res_h - height_new) // 2),
@@ -700,20 +714,24 @@ class StickerConvert:
         else:
             extra_kwargs["optimize"] = True
 
-        # Only enable transparency if all pixels have alpha channel
-        # with value of 0 or 255
-        alpha_channel_values = np.unique(np.array(self.frames_raw)[:, :, :, 3])
-        illegals = np.setxor1d(
-            alpha_channel_values, [0, 255]
-        )  # Find all values not 0 or 255
-        if illegals.size == 0:
+        # GIF can only have one alpha color
+        # Change lowest alpha to alpha=0
+        # Only keep alpha=0 and alpha=255, nothing in between
+        frames_processed = np.array(self.frames_processed)
+        alpha = frames_processed[:, :, :, 3]
+        alpha_min = np.min(alpha)  # type: ignore
+        if alpha_min < 255:
+            alpha[alpha > alpha_min] = 255
+            alpha[alpha == alpha_min] = 0
+
+        if 0 in alpha:
             extra_kwargs["transparency"] = 0
             extra_kwargs["disposal"] = 2
-            im_out = [self.quantize(Image.fromarray(i)) for i in self.frames_processed]
+            im_out = [self.quantize(Image.fromarray(i)) for i in frames_processed]
         else:
             im_out = [
                 self.quantize(Image.fromarray(i).convert("RGB")).convert("RGB")
-                for i in self.frames_processed
+                for i in frames_processed
             ]
 
         if self.fps:

{sticker-convert-2.7.9 → sticker-convert-2.7.11}/src/sticker_convert/job.py

@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import os
-import platform
 import shutil
 import traceback
 from datetime import datetime
@@ -182,11 +181,7 @@ class Executor:
         self.is_cancel_job.value = 1  # type: ignore
 
         for process in self.processes:
-            if platform.system() == "Windows":
-                process.terminate()
-            else:
-                process.close()
-            process.join()
+            process.terminate()
 
         self.cleanup(killed=True)
 

{sticker-convert-2.7.9 → sticker-convert-2.7.11}/src/sticker_convert/version.py

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

{sticker-convert-2.7.9 → sticker-convert-2.7.11/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.9
+Version: 2.7.11
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -378,7 +378,7 @@ Requires-Dist: Pillow==10.1.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
-Requires-Dist: rlottie_python~=1.3.3
+Requires-Dist: rlottie_python~=1.3.4
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: sqlcipher3-wheels~=0.5.2.post1
 Requires-Dist: tqdm~=4.66.2

{sticker-convert-2.7.9 → sticker-convert-2.7.11}/src/sticker_convert.egg-info/requires.txt

@@ -12,7 +12,7 @@ Pillow==10.1.0
 pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0
-rlottie_python~=1.3.3
+rlottie_python~=1.3.4
 signalstickers-client~=3.3.0
 sqlcipher3-wheels~=0.5.2.post1
 tqdm~=4.66.2