numpyimage 3.0.0__tar.gz → 3.0.2__tar.gz

{numpyimage-3.0.0/numpyimage.egg-info → numpyimage-3.0.2}/PKG-INFO

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

{numpyimage-3.0.0 → numpyimage-3.0.2}/npimage/vidio.py

@@ -42,7 +42,7 @@ codec_aliases = {
     'H.265': 'libx265',
 }
 
-supported_extensions = ['mp4', 'mkv', 'avi', 'mov']
+supported_extensions = ['mp4', 'mkv', 'avi', 'mov', 'webm']
 
 
 def load_video(filename,
@@ -313,13 +313,14 @@ class VideoStreamer:
         return float(1.0 / self._framerate)
 
     def frame_number_to_pts(self, frame_number: int) -> int:
+        frame_number = self._normalize_frame_number(frame_number)
         if self._framerate == 'variable':
             return self.frames_pts[frame_number]
         else:
             return int(frame_number) * self.pts_delta + self.pts0
 
     def frame_number_to_time(self, frame_number: int) -> float:
-        return self.frame_number_to_pts(frame_number) * self.time_base
+        return float(self.frame_number_to_pts(frame_number) * self.time_base)
 
     def __getitem__(self, key) -> np.ndarray:
         if isinstance(key, tuple):
@@ -366,16 +367,7 @@ class VideoStreamer:
             start, stop, step = frame_number.indices(self.n_frames)
             return np.array([self._get_frame(i) for i in range(start, stop, step)])
         with self._lock:
-            # Support negative indexing
-            if frame_number < 0 and frame_number + self.n_frames >= 0:
-                frame_number += self.n_frames
-            elif frame_number >= self.n_frames:
-                raise IndexError(f'Frame {frame_number} out of range:'
-                                 f' [0, {self.n_frames-1}]')
-            elif frame_number < 0:
-                raise IndexError(f'Negative frame {frame_number} out of'
-                                 f' range: [-{self.n_frames}, -1]')
-
+            frame_number = self._normalize_frame_number(frame_number)
             if (self._current_frame_number is None
                     or frame_number <= self._current_frame_number
                     or frame_number > self._current_frame_number + 100):
@@ -391,6 +383,24 @@ class VideoStreamer:
                 image = np.rot90(image, k=-int(self.rotation) // 90)
             return image
 
+    def _normalize_frame_number(self, frame_number: int) -> int:
+        """
+        Normalize frame number to be within the valid range.
+        """
+        if not isinstance(frame_number, int):
+            raise TypeError(f'Frame number must be an integer, not {type(frame_number)}')
+        if frame_number < -self.n_frames:
+            raise IndexError(f'Negative frame {frame_number} not in'
+                             f' valid range [-{self.n_frames}, -1]')
+        elif -self.n_frames <= frame_number and frame_number < 0:
+            return frame_number + self.n_frames
+        elif 0 <= frame_number and frame_number < self.n_frames:
+            return frame_number
+        elif self.n_frames <= frame_number:
+            raise IndexError(f'Frame {frame_number} not in'
+                             f' valid range [0, {self.n_frames-1}]')
+        raise IndexError(f'Frame {frame_number} not understood')
+
     @property
     def first_frame(self):
         if self._first_frame is None:

{numpyimage-3.0.0 → numpyimage-3.0.2/numpyimage.egg-info}/PKG-INFO

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

{numpyimage-3.0.0 → numpyimage-3.0.2}/pyproject.toml

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