numpyimage 2.6.4__tar.gz → 2.8.0__tar.gz

{numpyimage-2.6.4/numpyimage.egg-info → numpyimage-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 2.6.4
+Version: 2.8.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.6.4 → numpyimage-2.8.0}/npimage/vidio.py

@@ -309,6 +309,20 @@ class VideoStreamer:
         else:
             return self.timestep
 
+    @property
+    def framerate(self):
+        """
+        Returns the frame rate of the video in frames per second.
+        """
+        if self.timestep == 'variable':
+            return 1 / self.average_timestep
+        else:
+            return 1 / self.timestep
+
+    @property
+    def fps(self):
+        return self.framerate
+
     @property
     def first_frame(self):
         if self._first_frame is None:
@@ -426,7 +440,13 @@ class VideoWriter:
 
     def write(self, frame):
         if not isinstance(frame, self.av.VideoFrame):
-            if frame.ndim == 3 and frame.shape[-1] == 3:
+            if not isinstance(frame, np.ndarray):
+                frame = np.array(frame)
+            if frame.ndim == 4:
+                for i in range(frame.shape[0]):
+                    self.write(frame[i])
+                return
+            elif frame.ndim == 3 and frame.shape[-1] == 3:
                 frame = self.av.VideoFrame.from_ndarray(frame, format='rgb24')
             elif frame.ndim == 3 and frame.shape[-1] == 4:
                 # While some video codecs support an alpha channel, most don't,
@@ -435,7 +455,8 @@ class VideoWriter:
             elif frame.ndim == 2:
                 frame = self.av.VideoFrame.from_ndarray(frame, format='gray')
             else:
-                raise ValueError(f'Frame must be (H, W) (H, W, 3) or (H, W, 4) but was {frame.shape}')
+                raise ValueError('Frame must have shape (H, W) (H, W, 3) (H, W, 4)'
+                                 f' (t, H, W, 3) or (t, H, W, 4) but was {frame.shape}')
         if self.stream.width == 0:
             self.stream.width = frame.width
         if self.stream.height == 0:

{numpyimage-2.6.4 → numpyimage-2.8.0/numpyimage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numpyimage
-Version: 2.6.4
+Version: 2.8.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.6.4 → numpyimage-2.8.0}/pyproject.toml

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