numpyimage 3.6.0__tar.gz → 3.6.2__tar.gz

{numpyimage-3.6.0/numpyimage.egg-info → numpyimage-3.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 3.6.0
+Version: 3.6.2
 Summary: Load, save, & manipulate image files as numpy arrays
 Author-email: Jasper Phelps <jasper.s.phelps@gmail.com>
 License: MIT License

{numpyimage-3.6.0 → numpyimage-3.6.2}/npimage/imageio.py

@@ -152,7 +152,8 @@ def save(data,
          units=None,
          compress=None,
          compression_level=3,
-         metadata=None) -> None:
+         metadata=None,
+         **kwargs) -> None:
     """
     Save a numpy array to file with a file type specified by the
     filename extension.
@@ -173,7 +174,12 @@ def save(data,
         raise FileExistsError(f'File {filename} already exists. '
                               'Set overwrite=True to overwrite.')
     extension = filename.split('.')[-1].lower()
+    if extension in vidio.supported_extensions:
+        return vidio.save_video(data, filename, dim_order=dim_order,
+                                overwrite=overwrite, **kwargs)
     assert extension in supported_extensions, f'Filetype {extension} not supported'
+    if kwargs:
+        raise TypeError(f'save() got unexpected keyword arguments: {list(kwargs.keys())}')
 
     if compress is not None and extension not in ['nrrd', 'ng']:
         print('WARNING: compress argument is ignored because not saving as '

{numpyimage-3.6.0 → numpyimage-3.6.2}/npimage/vidio.py

@@ -395,6 +395,8 @@ class VideoStreamer:
         return float(1.0 / self._framerate)
 
     def frame_number_to_pts(self, frame_number: int) -> int:
+        if hasattr(frame_number, '__iter__'):
+            return [self.frame_number_to_pts(n) for n in frame_number]
         frame_number = self._normalize_frame_number(frame_number)
         if self._framerate == 'variable':
             return self.frames_pts[frame_number]
@@ -402,9 +404,13 @@ class VideoStreamer:
             return int(frame_number) * self.pts_delta + self.pts0
 
     def frame_number_to_time(self, frame_number: int) -> float:
+        if hasattr(frame_number, '__iter__'):
+            return [self.frame_number_to_time(n) for n in frame_number]
         return float(self.frame_number_to_pts(frame_number) * self.time_base)
 
     def pts_to_frame_number(self, pts: int) -> int:
+        if hasattr(pts, '__iter__'):
+            return [self.pts_to_frame_number(p) for p in pts]
         if self._framerate == 'variable':
             if pts not in self.frames_pts:
                 raise ValueError(f'PTS {pts} not in video index.')
@@ -776,14 +782,37 @@ class FFmpegVideoWriter:
         self._closed = False
         self._width = None
         self._height = None
-        self._pixel_format = None
+        self._pixel_format_in = None
+        self._pixel_format_out = 'yuv420p'
 
     @property
     def framerate(self):
         return float(self._framerate)
 
-    def _initialize_process(self, width, height, pixel_format):
+    def _initialize_process(self, width, height, pixel_format_in):
         """Initialize the FFmpeg subprocess for video encoding"""
+        self._width = width
+        self._height = height
+        self._pixel_format_in = pixel_format_in
+
+        # Check if width or height needs to be padded to an even value
+        if (self._pixel_format_out == 'yuv420p'
+                and (width % 2 != 0 or height % 2 != 0)):
+            pad = [[0, 0], [0, 0], [0, 0]]  # [h, w, c]
+            if height % 2 != 0:
+                print('INFO: Height must be even for yuv420p pixel format but image'
+                      f' has height {height}, so the bottom row will be duplicated.')
+                pad[0][1] = 1
+                height = height + 1
+            if width % 2 != 0:
+                print('INFO: Width must be even for yuv420p pixel format but image'
+                      f' has width {width}, so the right column will be duplicated.')
+                pad[1][1] = 1
+                width = width + 1
+            self._pad = pad
+        else:
+            self._pad = 0
+
         command = [
             'ffmpeg',
             '-hide_banner',
@@ -793,12 +822,12 @@ class FFmpegVideoWriter:
             '-f', 'rawvideo',
             '-vcodec', 'rawvideo',
             '-s', f'{width}x{height}',
-            '-pix_fmt', pixel_format,
+            '-pix_fmt', pixel_format_in,  # Input pixel format comes before -i
             '-r', str(self._framerate),
             '-i', '-',  # Read from stdin
             '-an',  # No audio
             '-c:v', self.codec,
-            '-pix_fmt', 'yuv420p',  # Output pixel format
+            '-pix_fmt', self._pixel_format_out,  # Output pixel format after -i
             '-crf', str(self.crf),
         ]
         if self.codec in ('libvpx', 'libvpx-vp9'):
@@ -816,9 +845,7 @@ class FFmpegVideoWriter:
             stderr=subprocess.PIPE  # Capture errors
         )
         self._stdin = self._process.stdin
-        self._width = width
-        self._height = height
-        self._pixel_format = pixel_format
+
 
     def write(self, frame):
         """Write a frame to the video file"""
@@ -861,6 +888,9 @@ class FFmpegVideoWriter:
             raise ValueError(f'Cannot write image of size (w={width}, h={height}) to video'
                              f' already containing images of size {(self._width, self._height)}')
 
+        if self._pad:
+            frame = np.pad(frame, self._pad, mode='edge')
+
         # Convert frame to bytes and write to FFmpeg
         frame_bytes = frame.tobytes()
         self._stdin.write(frame_bytes)
@@ -993,16 +1023,9 @@ def save_video(data, filename, time_axis=0, color_axis=None, overwrite=False,
         height, width = data.shape[1:]
 
     extension = filename.suffix.lower().lstrip('.')
-    if extension == 'mp4':
-        pad = [[0, 0], [0, 0], [0, 0]]
-        if height % 2 != 0:
-            pad[1][1] = 1
-        if width % 2 != 0:
-            pad[2][1] = 1
-        if pad != [[0, 0], [0, 0], [0, 0]]:
-            data = np.pad(data, pad, mode='edge')
 
     if extension == 'gif':
+        # We make gifs with PIL instead of using FFmpeg
         from PIL import Image
         pil_images = [Image.fromarray(frame) for frame in data]
 

{numpyimage-3.6.0 → numpyimage-3.6.2/numpyimage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 3.6.0
+Version: 3.6.2
 Summary: Load, save, & manipulate image files as numpy arrays
 Author-email: Jasper Phelps <jasper.s.phelps@gmail.com>
 License: MIT License

{numpyimage-3.6.0 → numpyimage-3.6.2}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'numpyimage'
-version = '3.6.0'
+version = '3.6.2'
 description = 'Load, save, & manipulate image files as numpy arrays'
 readme.file = 'README.md'
 readme.content-type = 'text/markdown'
-requires-python = ">=3.6"
-license = {file = "LICENSE"}
+requires-python = '>=3.6'
+license = {file = 'LICENSE'}
 keywords = ['images', 'pixel arrays', 'image formats', 'convert', 'graphics', 'draw simple shapes']
 authors = [{name = 'Jasper Phelps', email = 'jasper.s.phelps@gmail.com'}]
 classifiers = [