numpyimage 3.1.0__tar.gz → 3.1.2__tar.gz

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

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

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

@@ -202,14 +202,14 @@ class VideoStreamer:
             frames_pts = []
             # Fallback to ffprobe if PyAV didn't work
             cmd = ['ffprobe',
-                    '-select_streams', 'v:0',
-                    '-show_frames',
-                    '-show_entries', 'frame=pts',
-                    '-of', 'default=noprint_wrappers=1:nokey=1',
-                    '-v', 'quiet',
-                    self.filename]
+                   '-select_streams', 'v:0',
+                   '-show_frames',
+                   '-show_entries', 'frame=pts',
+                   '-of', 'default=noprint_wrappers=1:nokey=1',
+                   '-v', 'quiet',
+                   self.filename]
             ffprobe_result = subprocess.run(cmd, stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE, text=True)
+                                            stderr=subprocess.PIPE, text=True)
             if ffprobe_result.returncode != 0:
                 raise RuntimeError(f'ffprobe failed: {ffprobe_result.stderr}')
 
@@ -377,10 +377,12 @@ class VideoStreamer:
                     self._current_frame_number = frame_number
                     return frame
                 if frame.pts > target_pts:
+                    self._current_frame_number = self.pts_to_frame_number(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}')
+            raise RuntimeError('Hit end of video before finding frame {frame_number} (PTS '
+                               f'{target_pts}). Last seen frame was {self._current_frame_number}'
+                               f' (PTS {self.frame_number_to_pts(self._current_frame_number)}')
 
         if isinstance(frame_number, slice):  # Support slicing
             start, stop, step = frame_number.indices(self.n_frames)
@@ -391,11 +393,14 @@ class VideoStreamer:
                     or frame_number <= self._current_frame_number
                     or frame_number > self._current_frame_number + 100):
                 target_pts = self.frame_number_to_pts(frame_number)
+                if self.verbose:
+                    print(f'Seeking to frame {frame_number} (PTS {target_pts})')
                 # The following actually seeks to the closest keyframe before
                 # target_pts, because it's not possible to seek directly to
                 # non-keyframes due to video files being compressed.
                 self.container.seek(target_pts, any_frame=False,
                                     backward=True, stream=self.stream)
+                self._frame_iterator = self.container.decode(self.stream)
             # Now we decode frames forward until we get to the requested frame
             image = decode_until(frame_number)
             if self.rotation not in [None, '0', 0]:
@@ -649,6 +654,8 @@ class FFmpegVideoWriter:
         command = [
             'ffmpeg',
             '-hide_banner',
+            '-loglevel', 'error',
+            '-nostats',
             '-y',  # Overwrite output
             '-f', 'rawvideo',
             '-vcodec', 'rawvideo',
@@ -714,8 +721,8 @@ class FFmpegVideoWriter:
 
         # Validate frame dimensions
         if (width, height) != (self._width, self._height):
-            raise ValueError(f'Frame dimensions {(width, height)} do not match '
-                             f'initial dimensions {(self._width, self._height)}')
+            raise ValueError(f'Cannot write image of size (w={width}, h={height}) to video'
+                             f' already containing images of size {(self._width, self._height)}')
 
         # Convert frame to bytes and write to FFmpeg
         frame_bytes = frame.tobytes()
@@ -733,12 +740,13 @@ class FFmpegVideoWriter:
 
             # Wait for FFmpeg to finish
             if self._process:
+                stderr_data = self._process.stderr.read()
                 return_code = self._process.wait()
 
                 # Check for errors
                 if return_code != 0:
-                    stderr_output = self._process.stderr.read().decode()
-                    raise RuntimeError(f'FFmpeg failed with return code {return_code}: {stderr_output}')
+                    raise RuntimeError(f'FFmpeg failed with return code {return_code}:'
+                                       f' {stderr_data.decode()}')
         finally:
             # Clean up process references
             self._process = None
@@ -766,7 +774,7 @@ def save_video(data, filename, time_axis=0, color_axis=None, overwrite=False,
 
     Parameters
     ----------
-    data : numpy.ndarray or list of filenames
+    data : numpy.ndarray or list of images
         A 3D (grayscale) or 4D (RGB) numpy array of pixel values.
 
     filename : str
@@ -820,6 +828,8 @@ def save_video(data, filename, time_axis=0, color_axis=None, overwrite=False,
         raise FileExistsError(f'File {filename} already exists. '
                               'Set overwrite=True to overwrite.')
 
+    if not isinstance(data, np.ndarray):
+        data = np.array(data)
     if color_axis is None and data.ndim == 4:
         color_axis = utils.find_channel_axis(data, possible_channel_lengths=3)
         if color_axis is None:

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

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

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

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