sticker-convert 2.2.7__tar.gz → 2.3.1__tar.gz

{sticker-convert-2.2.7/src/sticker_convert.egg-info → sticker-convert-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.2.7
+Version: 2.3.1
 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>
@@ -376,7 +376,7 @@ Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
 Requires-Dist: rlottie_python~=1.2.1
-Requires-Dist: selenium~=4.16.0
+Requires-Dist: selenium~=4.17.2
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: tqdm~=4.66.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/requirements.txt

@@ -10,7 +10,7 @@ pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0
 rlottie_python~=1.2.1
-selenium~=4.16.0
+selenium~=4.17.2
 signalstickers-client~=3.3.0
 tqdm~=4.66.1
 ttkbootstrap-fork-laggykiller~=1.5.1

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/src/sticker_convert/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 '''sticker-convert'''
-__version__ = '2.2.7'
+__version__ = '2.3.1'

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/src/sticker_convert/converter.py

@@ -30,6 +30,14 @@ def get_step_value(
     else:
         return None
 
+def useful_array(plane, bytes_per_pixel=1, dtype='uint8'):
+    total_line_size = abs(plane.line_size)
+    useful_line_size = plane.width * bytes_per_pixel
+    arr = np.frombuffer(plane, np.uint8)
+    if total_line_size != useful_line_size:
+        arr = arr.reshape(-1, total_line_size)[:, 0:useful_line_size].reshape(-1)
+    return arr.view(np.dtype(dtype))
+
 class StickerConvert:
     MSG_START_COMP = '[I] Start compressing {} -> {}'
     MSG_SKIP_COMP = '[S] Compatible file found, skip compress and just copy {} -> {}'
@@ -225,30 +233,69 @@ class StickerConvert:
                 self.frames_raw.append(frame)
             return
         
-        frame_format = 'rgba'
         # Crashes when handling some webm in yuv420p and convert to rgba
         # https://github.com/PyAV-Org/PyAV/issues/1166
         metadata = iio.immeta(self.in_f, plugin='pyav', exclude_applied=False)
         context = None
         if metadata.get('video_format') == 'yuv420p':
-            if metadata.get('alpha_mode') != '1':
-                frame_format = 'rgb24'
             if metadata.get('codec') == 'vp8':
-                context = CodecContext.create('v8', 'r')
+                context = CodecContext.create('libvpx', 'r')
             elif metadata.get('codec') == 'vp9':
                 context = CodecContext.create('libvpx-vp9', 'r')
         
         with av.open(self.in_f) as container:
             if not context:
                 context = container.streams.video[0].codec_context
-            for packet in container.demux(video=0):
+
+            for packet in container.demux(container.streams.video):
                 for frame in context.decode(packet):
-                    frame = frame.to_ndarray(format=frame_format)
-                    if frame_format == 'rgb24':
-                        frame = np.dstack(
-                            (frame, np.zeros(frame.shape[:2], dtype=np.uint8)+255)
-                            )
-                    self.frames_raw.append(frame)
+                    if frame.width % 2 != 0:
+                        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')
+                        rgba_array = np.dstack(
+                            (rgb_array, np.zeros(frame.shape[:2], dtype=np.uint8) + 255)
+                        )
+                    else:
+                        # yuva420p may cause crash
+                        # https://github.com/laggykiller/sticker-convert/issues/114
+                        frame = frame.reformat(width=width, height=height, 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) - 16
+                        yuv_array[:, :, 1:] = yuv_array[:, :, 1:].clip(16, 240).astype(yuv_array.dtype) - 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)
+
+                        self.frames_raw.append(rgba_array)
 
     def frames_import_lottie(self):
         if self.in_f_ext == '.tgs':
@@ -313,11 +360,11 @@ class StickerConvert:
         # fps_ratio: 1 frame in new anim equal to how many frame in old anim
         # speed_ratio: How much to speed up / slow down
         fps_ratio = self.fps_orig / self.fps
-        if (self.opt_comp.duration_min and
+        if (self.opt_comp.duration_min != None and
             self.duration_orig < self.opt_comp.duration_min):
 
             speed_ratio = self.duration_orig / self.opt_comp.duration_min
-        elif (self.opt_comp.duration_max and
+        elif (self.opt_comp.duration_max != None and
               self.duration_orig > self.opt_comp.duration_max):
             
             speed_ratio = self.duration_orig / self.opt_comp.duration_max

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/src/sticker_convert/gui.py

@@ -543,11 +543,18 @@ class GUI(Window):
         # output_option_display = self.get_output_display_name()
         url = self.input_address_var.get()
 
-        # Input
-        if os.path.isdir(self.input_setdir_var.get()):
-            self.input_frame.input_setdir_entry.config(bootstyle='default')
+        if os.path.abspath(self.input_setdir_var.get()) == os.path.abspath(self.output_setdir_var.get()):
+            in_out_dir_same = True
         else:
+            in_out_dir_same = False
+
+        # Input
+        if in_out_dir_same == True:
+            self.input_frame.input_setdir_entry.config(bootstyle='danger')
+        elif not os.path.isdir(self.input_setdir_var.get()):
             self.input_frame.input_setdir_entry.config(bootstyle='warning')
+        else:
+            self.input_frame.input_setdir_entry.config(bootstyle='default')
 
         self.input_frame.address_lbl.config(text=self.input_presets[input_option_display]['address_lbls'])
         self.input_frame.address_entry.config(bootstyle='default')
@@ -574,10 +581,12 @@ class GUI(Window):
                 self.input_frame.address_tip.config(text=f'Detected URL: {download_option}')
 
         # Output
-        if os.path.isdir(self.output_setdir_var.get()):
-            self.output_frame.output_setdir_entry.config(bootstyle='default')
-        else:
+        if in_out_dir_same == True:
+            self.output_frame.output_setdir_entry.config(bootstyle='danger')
+        elif not os.path.isdir(self.output_setdir_var.get()):
             self.output_frame.output_setdir_entry.config(bootstyle='warning')
+        else:
+            self.output_frame.output_setdir_entry.config(bootstyle='default')
 
         if (MetadataHandler.check_metadata_required(output_option, 'title') and
             not MetadataHandler.check_metadata_provided(self.input_setdir_var.get(), input_option, 'title') and

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/src/sticker_convert/job.py

@@ -89,6 +89,10 @@ class Job:
         save_to_local_tip += '    If you want to upload the results by yourself,\n'
         save_to_local_tip += '    select "Save to local directory only" for output\n'
 
+        if os.path.abspath(self.opt_input.dir) == os.path.abspath(self.opt_output.dir):
+            error_msg += '\n'
+            error_msg += '[X] Input and output directories cannot be the same\n'
+
         if self.opt_input.option == 'auto':
             error_msg += '\n'
             error_msg += '[X] Unrecognized URL input source\n'

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/src/sticker_convert/utils/media/codec_info.py

@@ -5,6 +5,8 @@ import mimetypes
 from typing import Optional
 
 import imageio.v3 as iio
+import av # type: ignore
+from av.codec.context import CodecContext # type: ignore
 from rlottie_python import LottieAnimation  # type: ignore
 from PIL import Image, UnidentifiedImageError
 import mmap
@@ -66,8 +68,31 @@ class CodecInfo:
                 else:
                     fps = frames / total_duration * 1000
             else:
-                metadata = iio.immeta(file, plugin="pyav", exclude_applied=False)
-                fps = metadata.get("fps", 1)
+                # Getting fps from metadata is not reliable
+                # Example: https://github.com/laggykiller/sticker-convert/issues/114
+                metadata = iio.immeta(file, plugin='pyav', exclude_applied=False)
+                context = None
+                if metadata.get('video_format') == 'yuv420p':
+                    if metadata.get('codec') == 'vp8':
+                        context = CodecContext.create('libvpx', 'r')
+                    elif metadata.get('codec') == 'vp9':
+                        context = CodecContext.create('libvpx-vp9', 'r')
+
+                with av.open(file) as container:
+                    stream = container.streams.video[0]
+                    if not context:
+                        context = stream.codec_context
+
+                    last_frame = None
+                    for frame_count, frame in enumerate(container.decode(stream)):
+                        last_frame = frame
+                        if frame_count > 10:
+                            break
+
+                    if frame_count <= 1:
+                        fps = 1
+                    else:
+                        fps = frame_count / (last_frame.pts * last_frame.time_base.numerator / last_frame.time_base.denominator)
 
         return fps
 

{sticker-convert-2.2.7 → sticker-convert-2.3.1/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.2.7
+Version: 2.3.1
 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>
@@ -376,7 +376,7 @@ Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
 Requires-Dist: rlottie_python~=1.2.1
-Requires-Dist: selenium~=4.16.0
+Requires-Dist: selenium~=4.17.2
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: tqdm~=4.66.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1

{sticker-convert-2.2.7 → sticker-convert-2.3.1}/src/sticker_convert.egg-info/requires.txt

@@ -10,7 +10,7 @@ pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0
 rlottie_python~=1.2.1
-selenium~=4.16.0
+selenium~=4.17.2
 signalstickers-client~=3.3.0
 tqdm~=4.66.1
 ttkbootstrap-fork-laggykiller~=1.5.1