numpyimage 2.5.0__tar.gz → 2.6.0__tar.gz

{numpyimage-2.5.0 → numpyimage-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 2.5.0
+Version: 2.6.0
 Summary: Load, save, & manipulate image files as numpy arrays
 Author-email: Jasper Phelps <jasper.s.phelps@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{numpyimage-2.5.0 → numpyimage-2.6.0}/npimage/core.py

@@ -409,8 +409,10 @@ def load_video(filename,
         data = np.empty((num_frames, *first_img.shape), dtype=first_img.dtype)
         # Then fill it up frame by frame
         data[0] = first_img
-        for i, frame in tqdm(enumerate(frame_iter, start=1), total=num_frames,
+        for i, frame in tqdm(enumerate(frame_iter), total=num_frames,
                              desc='Loading video', disable=not progress_bar):
+            if i == 0:
+                continue
             img = frame.to_ndarray(format='rgb24')
             data[i] = img
         if return_framerate:
@@ -459,8 +461,7 @@ codec_aliases = {
 }
 
 
-def video_writer(filename, framerate=30, crf=23, compression_speed='medium',
-                 codec: Literal['libx264', 'libx265'] = 'libx264') -> 'VideoWriter':
+class VideoWriter:
     """
     Create a video writer object for saving frames to a video file.
 
@@ -478,59 +479,57 @@ def video_writer(filename, framerate=30, crf=23, compression_speed='medium',
     codec : Literal['libx264', 'libx265'], default 'libx264'
         The video codec to use for encoding. Can be any of a number of aliases for
         these two codecs, including avc1/h264 vs hevc/hvc1/hev1/h265.
-
-    Returns
-    -------
-    VideoWriter
-        The video writer object supporting context manager protocol.
     """
-    try:
-        import av
-    except ImportError:
-        raise ImportError('Missing optional dependency for video processing,'
-                          ' run `pip install av tqdm`')
-
-    class VideoWriter:
-        def __init__(self, filename, framerate, crf, compression_speed, codec):
-            self.filename = filename
-            self.framerate = framerate
-            self.crf = crf
-            self.compression_speed = compression_speed
-            self.codec = codec_aliases[codec]
-            self.container = av.open(filename, mode='w')
-            self.stream = self.container.add_stream(codec, rate=framerate)
-            self.stream.pix_fmt = 'yuv420p'
-            self.stream.options = {'crf': str(crf), 'preset': compression_speed}
-            self._closed = False
-            self.stream.width = 0
-            self.stream.height = 0
-
-        def write(self, frame):
-            if not isinstance(frame, av.VideoFrame):
-                if frame.ndim == 3 and frame.shape[-1] == 3:
-                    frame = av.VideoFrame.from_ndarray(frame, format='rgb24')
-                elif frame.ndim == 2:
-                    frame = av.VideoFrame.from_ndarray(frame, format='gray')
-                else:
-                    raise ValueError(f'Frame must be (H, W) or (H, W, 3) but was {frame.shape}')
-            if self.stream.width == 0:
-                self.stream.width = frame.width
-            if self.stream.height == 0:
-                self.stream.height = frame.height
-            for packet in self.stream.encode(frame):
-                self.container.mux(packet)
-
-        def __enter__(self):
-            return self
+    def __init__(self, filename, framerate=30, crf=23, compression_speed='medium',
+                 codec: Literal['libx264', 'libx265'] = 'libx264',
+                 overwrite=False):
+        try:
+            import av
+        except ImportError:
+            raise ImportError('Missing optional dependency for video processing,'
+                              ' run `pip install av tqdm`')
+        self.av = av
+        filename = os.path.expanduser(str(filename))
+        if os.path.exists(filename) and not overwrite:
+            raise FileExistsError(f'File {filename} already exists. '
+                                  'Set overwrite=True to overwrite.')
+        self.filename = filename
+        self.framerate = framerate
+        self.crf = crf
+        self.compression_speed = compression_speed
+        self.codec = codec_aliases[codec.lower()]
+        self.container = av.open(filename, mode='w')
+        self.stream = self.container.add_stream(self.codec, rate=framerate)
+        self.stream.pix_fmt = 'yuv420p'
+        self.stream.options = {'crf': str(crf), 'preset': compression_speed}
+        self._closed = False
+        self.stream.width = 0
+        self.stream.height = 0
+
+    def write(self, frame):
+        if not isinstance(frame, self.av.VideoFrame):
+            if frame.ndim == 3 and frame.shape[-1] == 3:
+                frame = self.av.VideoFrame.from_ndarray(frame, format='rgb24')
+            elif frame.ndim == 2:
+                frame = self.av.VideoFrame.from_ndarray(frame, format='gray')
+            else:
+                raise ValueError(f'Frame must be (H, W) or (H, W, 3) but was {frame.shape}')
+        if self.stream.width == 0:
+            self.stream.width = frame.width
+        if self.stream.height == 0:
+            self.stream.height = frame.height
+        for packet in self.stream.encode(frame):
+            self.container.mux(packet)
 
-        def __exit__(self, exc_type, exc_val, exc_tb):
-            # Flush stream
-            for packet in self.stream.encode():
-                self.container.mux(packet)
-            self.container.close()
-            self._closed = True
+    def __enter__(self):
+        return self
 
-    return VideoWriter(filename, framerate, crf, compression_speed, codec)
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # Flush stream
+        for packet in self.stream.encode():
+            self.container.mux(packet)
+        self.container.close()
+        self._closed = True
 
 
 def save_video(data, filename, time_axis=0, color_axis=None, overwrite=False,
@@ -634,8 +633,9 @@ def save_video(data, filename, time_axis=0, color_axis=None, overwrite=False,
         if pad != [[0, 0], [0, 0], [0, 0]]:
             data = np.pad(data, pad, mode='edge')
 
-    with video_writer(filename, framerate=framerate, crf=crf,
-                      compression_speed=compression_speed, codec=codec) as writer:
+    with VideoWriter(filename, framerate=framerate, crf=crf,
+                     compression_speed=compression_speed, codec=codec,
+                     overwrite=overwrite) as writer:
         for frame_i in tqdm(range(n_frames), total=n_frames,
                             desc='Saving video', disable=not progress_bar):
             writer.write(data[frame_i])

{numpyimage-2.5.0 → numpyimage-2.6.0}/numpyimage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 2.5.0
+Version: 2.6.0
 Summary: Load, save, & manipulate image files as numpy arrays
 Author-email: Jasper Phelps <jasper.s.phelps@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{numpyimage-2.5.0 → numpyimage-2.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'numpyimage'
-version = '2.5.0'
+version = '2.6.0'
 description = 'Load, save, & manipulate image files as numpy arrays'
 readme.file = 'README.md'
 readme.content-type = 'text/markdown'