numpyimage 3.0.1__tar.gz → 3.1.0__tar.gz

{numpyimage-3.0.1/numpyimage.egg-info → numpyimage-3.1.0}/PKG-INFO

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

{numpyimage-3.0.1 → numpyimage-3.1.0}/npimage/vidio.py

@@ -161,6 +161,7 @@ class VideoStreamer:
         self.container = av.open(str(self.filename))
         self.stream = self.container.streams.video[0]
         self.time_base = self.stream.time_base
+        self._frame_iterator = self.container.decode(self.stream)
         self._shape = None
         self._first_frame = None
         self._width = None
@@ -313,6 +314,7 @@ 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:
@@ -321,6 +323,22 @@ class VideoStreamer:
     def frame_number_to_time(self, frame_number: int) -> float:
         return float(self.frame_number_to_pts(frame_number) * self.time_base)
 
+    def pts_to_frame_number(self, pts: int) -> int:
+        if self._framerate == 'variable':
+            if pts not in self.frames_pts:
+                raise ValueError(f'PTS {pts} not in video index.')
+            return self.frames_pts.index(pts)
+        else:
+            if pts < self.pts0:
+                raise ValueError(f'PTS {pts} is before the start of the'
+                                 f' video (PTS {self.pts0}).')
+            if pts > self.pts_delta * (self.n_frames - 1) + self.pts0:
+                raise ValueError(f'PTS {pts} is after the end of the video (PTS '
+                                 f'{self.pts_delta * (self.n_frames - 1) + self.pts0}).')
+            if (pts - self.pts0) % self.pts_delta != 0:
+                raise ValueError(f'PTS {pts} is between frames for this video.')
+            return (pts - self.pts0) // self.pts_delta
+
     def __getitem__(self, key) -> np.ndarray:
         if isinstance(key, tuple):
             frame_idx = key[0]
@@ -349,9 +367,11 @@ class VideoStreamer:
             to the requested frame number.
             """
             target_pts = self.frame_number_to_pts(frame_number)
-            for frame in self.container.decode(self.stream):
+            for frame in self._frame_iterator:
                 if frame.pts is None:
-                    continue  # Skip frames without PTS
+                    if self.verbose:
+                        print('WARNING: Skipping a frame with no PTS.')
+                    continue
                 if frame.pts == target_pts:
                     frame = frame.to_ndarray(format='rgb24')
                     self._current_frame_number = frame_number
@@ -359,23 +379,14 @@ class VideoStreamer:
                 if frame.pts > target_pts:
                     raise RuntimeError(f'Frame with PTS {target_pts} not found after'
                                        f' seeking – current frame PTS: {frame.pts}')
-            raise RuntimeError(f'Frame with PTS {target_pts} not found after'
-                               f' seeking – current frame PTS: {frame.pts}')
+            raise RuntimeError('Ran out of frames before finding frame with requested'
+                               f' PTS {target_pts} – current frame PTS: {frame.pts}')
 
         if isinstance(frame_number, slice):  # Support slicing
             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 +402,28 @@ class VideoStreamer:
                 image = np.rot90(image, k=-int(self.rotation) // 90)
             return image
 
+    def _normalize_frame_number(self, frame_number: int) -> int:
+        """
+        Support negative indexing by converting negative frame numbers to
+        positive ones, e.g. -1 becomes n_frames - 1, -2 becomes n_frames - 2, etc.
+        """
+        try:
+            frame_number = int(frame_number)
+        except ValueError:
+            raise TypeError(f'Frame number must be castable to int but got "{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.1 → numpyimage-3.1.0/numpyimage.egg-info}/PKG-INFO

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

{numpyimage-3.0.1 → numpyimage-3.1.0}/pyproject.toml

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