prpy 0.2.2__tar.gz → 0.2.4__tar.gz

{prpy-0.2.2 → prpy-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: Collection of Python utils for signal, image, and video processing
 Author-email: Philipp Rouast <philipp@rouast.com>
 License: MIT License
@@ -47,14 +47,20 @@ It contains subpackages for working with `numpy`, `ffmpeg`, `tensorflow`, and `t
 
 General prerequisites are `python>=3.8` and `ffmpeg` installed and accessible via the `$PATH` environment variable.
 
-To install `prpy` and its dependencies:
+The easiest way to install the latest version of `prpy`:
+
+```
+pip install "prpy[ffmpeg,numpy,tensorflow,torch,test]"
+```
+
+Alternatively, it can be done by cloning the source:
 
 ```
 git clone https://github.com/prouast/prpy.git
 pip install "./prpy[ffmpeg,numpy,tensorflow,torch,test]"
 ```
 
-The above runs a full install of all dependencies.
+The above run full installs of all dependencies.
 It is possible to customize the install of the dependencies by only listing the desired subpackages out of `ffmpeg`, `numpy`, `tensorflow`, `torch`, and `test` in the square brackets above.
 
 ## Linting and tests

{prpy-0.2.2 → prpy-0.2.4}/README.md

@@ -9,14 +9,20 @@ It contains subpackages for working with `numpy`, `ffmpeg`, `tensorflow`, and `t
 
 General prerequisites are `python>=3.8` and `ffmpeg` installed and accessible via the `$PATH` environment variable.
 
-To install `prpy` and its dependencies:
+The easiest way to install the latest version of `prpy`:
+
+```
+pip install "prpy[ffmpeg,numpy,tensorflow,torch,test]"
+```
+
+Alternatively, it can be done by cloning the source:
 
 ```
 git clone https://github.com/prouast/prpy.git
 pip install "./prpy[ffmpeg,numpy,tensorflow,torch,test]"
 ```
 
-The above runs a full install of all dependencies.
+The above run full installs of all dependencies.
 It is possible to customize the install of the dependencies by only listing the desired subpackages out of `ffmpeg`, `numpy`, `tensorflow`, `torch`, and `test` in the square brackets above.
 
 ## Linting and tests

{prpy-0.2.2 → prpy-0.2.4}/prpy/ffmpeg/readwrite.py

@@ -105,7 +105,7 @@ def _ffmpeg_filtering(
     n: The existing number of frames
     w: The existing width
     h: The existing height
-    target_fps: Try to downsample frames to achieve this framerate (optional)
+    target_fps: Downsample frames to approximate this framerate (optional)
     crop: Coords and sizes for spatial cropping (x, y, width, height) (optional)
     scale: Size(s) for spatial scaling. Scalar or (width, height) (optional)
     trim: Frame numbers for temporal trimming (start, end) (optional)
@@ -125,14 +125,14 @@ def _ffmpeg_filtering(
   assert isinstance(w, int)
   assert isinstance(h, int)
   assert target_fps is None or isinstance(target_fps, (float, int))
-  assert crop is None or (isinstance(crop, tuple) and len(crop) == 4 and all(isinstance(i, int) for i in crop))
+  assert crop is None or (isinstance(crop, tuple) and len(crop) == 4 and all(isinstance(i, (int, np.int64)) for i in crop))
   assert scale is None or isinstance(scale, int) or (isinstance(scale, tuple) and len(scale) == 2 and all(isinstance(i, int) for i in scale))
   assert trim is None or (isinstance(trim, tuple) and len(trim) == 2 and all(isinstance(i, int) for i in trim))
   assert isinstance(preserve_aspect_ratio, bool)
   assert isinstance(scale_algorithm, str)
   ds_factor = 1
   if target_fps is not None and target_fps > fps: logging.warn("target_fps should not be greater than fps. Ignoring.")
-  elif target_fps is not None: ds_factor = int(fps // target_fps)
+  elif target_fps is not None: ds_factor = round(fps / target_fps)
   # Target number of frames
   target_n = trim[1] - trim[0] if trim is not None else n
   target_n = int(target_n / ds_factor)

{prpy-0.2.2 → prpy-0.2.4}/prpy/numpy/face.py

@@ -23,7 +23,7 @@ from prpy.numpy.image import crop_slice_resize
 from typing import Tuple, Union
 
 def _get_roi_from_det(
-    det: tuple,
+    det: Union[tuple, np.ndarray],
     rel_change: tuple,
     clip_dims: Union[tuple, None] = None
   ) -> Tuple[int, int, int, int]:
@@ -36,7 +36,7 @@ def _get_roi_from_det(
   Returns:
     out: The roi [0, H/W] in format (x0, y0, x1, y1)
   """
-  assert isinstance(det, tuple) and len(det) == 4 and all(isinstance(i, int) for i in det)
+  assert isinstance(det, (tuple, np.ndarray)) and len(det) == 4 and all(isinstance(i, (int, np.int64)) for i in det)
   assert det[2] > det[0]
   assert det[3] > det[1]
   assert isinstance(rel_change, tuple) and len(rel_change) == 4 and all(isinstance(i, float) for i in rel_change)

{prpy-0.2.2 → prpy-0.2.4}/prpy/numpy/image.py

@@ -48,7 +48,7 @@ def crop_slice_resize(
   """
   assert isinstance(inputs, np.ndarray) and (len(inputs.shape) == 3 or len(inputs.shape) == 4)
   assert isinstance(target_size, int) or (isinstance(target_size, (tuple, list)) and len(target_size) == 2 and all(isinstance(i, int) for i in target_size))
-  assert roi is None or (isinstance(roi, (tuple, list)) and len(roi) == 4 and all(isinstance(i, int) for i in roi) and roi[2] > roi[0] and roi[3] > roi[1])
+  assert roi is None or (isinstance(roi, (tuple, list)) and len(roi) == 4 and all(isinstance(i, (int, np.int64)) for i in roi) and roi[2] > roi[0] and roi[3] > roi[1])
   assert target_idxs is None or isinstance(target_idxs, np.ndarray) or (isinstance(target_idxs, (tuple, list)) and all(isinstance(i, int) for i in target_idxs))
   assert isinstance(preserve_aspect_ratio, bool)
   assert isinstance(keepdims, bool)

{prpy-0.2.2 → prpy-0.2.4}/prpy/numpy/signal.py

@@ -231,7 +231,7 @@ def detrend(
   # Return
   return proc_z
 
-# TODO write tests
+# TODO(prouast): Write tests
 def windowed_standardize(
     x: np.ndarray,
     window_size: int,
@@ -261,7 +261,7 @@ def windowed_standardize(
   x /= std
   return x
 
-# TODO write tests
+# TODO(prouast): Write tests
 def butter_bandpass(
     x: np.ndarray,
     lowcut: Union[int, float],

{prpy-0.2.2 → prpy-0.2.4}/prpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: Collection of Python utils for signal, image, and video processing
 Author-email: Philipp Rouast <philipp@rouast.com>
 License: MIT License
@@ -47,14 +47,20 @@ It contains subpackages for working with `numpy`, `ffmpeg`, `tensorflow`, and `t
 
 General prerequisites are `python>=3.8` and `ffmpeg` installed and accessible via the `$PATH` environment variable.
 
-To install `prpy` and its dependencies:
+The easiest way to install the latest version of `prpy`:
+
+```
+pip install "prpy[ffmpeg,numpy,tensorflow,torch,test]"
+```
+
+Alternatively, it can be done by cloning the source:
 
 ```
 git clone https://github.com/prouast/prpy.git
 pip install "./prpy[ffmpeg,numpy,tensorflow,torch,test]"
 ```
 
-The above runs a full install of all dependencies.
+The above run full installs of all dependencies.
 It is possible to customize the install of the dependencies by only listing the desired subpackages out of `ffmpeg`, `numpy`, `tensorflow`, `torch`, and `test` in the square brackets above.
 
 ## Linting and tests