Merge a83bc15208 into 333567f481

requirements.txt

@@ -4,5 +4,4 @@ pillow
 telethon
 cryptg
 python-magic
-moviepy
 lottie[all]

sticker/lib/util.py

@@ -48,6 +48,32 @@ def guess_mime(data: bytes) -> str:
     return mime or "image/png"
 
 
+def video_to_webp(data: bytes) -> bytes:
+    mime = guess_mime(data)
+    ext = mimetypes.guess_extension(mime)
+    with tempfile.NamedTemporaryFile(suffix=ext) as video:
+        video.write(data)
+        video.flush()
+        with tempfile.NamedTemporaryFile(suffix=".webp") as webp:
+            print(".", end="", flush=True)
+            ffmpeg_encoder_args = []
+            if mime == "video/webm":
+                encode = subprocess.run(["ffprobe", "-v", "error", "-select_streams", "v:0", "-show_entries", "stream=codec_name", "-of", "default=nokey=1:noprint_wrappers=1", video.name], capture_output=True, text=True).stdout.strip()
+                ffmpeg_encoder = None
+                if encode == "vp8":
+                    ffmpeg_encoder = "libvpx"
+                elif encode == "vp9":
+                    ffmpeg_encoder = "libvpx-vp9"
+                if ffmpeg_encoder:
+                    ffmpeg_encoder_args = ["-c:v", ffmpeg_encoder]
+            result = subprocess.run(["ffmpeg", "-y", "-threads", "auto", *ffmpeg_encoder_args, "-i", video.name, "-lossless", "1", webp.name],
+                                    capture_output=True)
+            if result.returncode != 0:
+                raise RuntimeError(f"Run ffmpeg failed with code {result.returncode}, Error occurred:\n{result.stderr}")
+            webp.seek(0)
+            return webp.read()
+
+
 def video_to_gif(data: bytes, mime: str) -> bytes:
     ext = mimetypes.guess_extension(mime)
     if mime.startswith("video/"):
@@ -57,19 +83,21 @@ def video_to_gif(data: bytes, mime: str) -> bytes:
             temp.flush()
             with tempfile.NamedTemporaryFile(suffix=ext) as temp_fixed:
                 print(".", end="", flush=True)
-                result = subprocess.run(["ffmpeg", "-y", "-i", temp.name, "-codec", "copy", temp_fixed.name],
+                result = subprocess.run(["ffmpeg", "-y", "-threads", "auto", "-i", temp.name, "-codec", "copy", temp_fixed.name],
                                         capture_output=True)
                 if result.returncode != 0:
                     raise RuntimeError(f"Run ffmpeg failed with code {result.returncode}, Error occurred:\n{result.stderr}")
                 temp_fixed.seek(0)
                 data = temp_fixed.read()
+    data = video_to_webp(data)
     with tempfile.NamedTemporaryFile(suffix=ext) as temp:
         temp.write(data)
         temp.flush()
         with tempfile.NamedTemporaryFile(suffix=".gif") as gif:
-            from moviepy.editor import VideoFileClip
+            print(".", end="", flush=True)
-            clip = VideoFileClip(temp.name)
+            im = Image.open(temp.name)
-            clip.write_gif(gif.name, logger=None)
+            im.info.pop('background', None)
+            im.save(gif.name, save_all=True, lossless=True, quality=100, method=6)
             gif.seek(0)
             return gif.read()
 
@@ -105,7 +133,6 @@ def _convert_image(data: bytes, mimetype: str) -> (bytes, int, int):
             append_images=frames[1:],
             loop=image.info.get('loop', 0),  # Default loop to 0 if not present
             duration=image.info.get('duration', 100),  # Set a default duration if not present
-            transparency=image.info.get('transparency', 255),  # Default to 255 if transparency is not present
             disposal=image.info.get('disposal', 2)  # Default to disposal method 2 (restore to background)
         )
         # Get the size of the first frame to determine resizing
@@ -147,7 +174,8 @@ def _convert_sticker(data: bytes) -> (bytes, str, int, int):
                     import subprocess
                     cmd = ["lottie_convert.py", temp.name, gif.name]
                     result = subprocess.run(cmd, capture_output=True, text=True)
-                    if result.returncode != 0:
+                    retcode = result.returncode
+                    if retcode != 0:
                         raise RuntimeError(f"Run {cmd} failed with code {retcode}, Error occurred:\n{result.stderr}")
                     gif.seek(0)
                     data = gif.read()