prpy 0.4.4__tar.gz → 0.4.5__tar.gz

{prpy-0.4.4 → prpy-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prpy
-Version: 0.4.4
+Version: 0.4.5
 Summary: Collection of Python utils for signal, image, and video processing
 Author-email: Philipp Rouast <philipp@rouast.com>
 License: MIT License
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24
@@ -50,8 +50,6 @@ It contains subpackages for working with `numpy`, `ffmpeg`, `tensorflow`, and `t
 
 General prerequisites are `python>=3.10` and `ffmpeg` installed and accessible via the `$PATH` environment variable.
 
-- Please note: If using `numpy` or `tensorflow` options, we only support Python `<3.12` because of the dependencies. 
-
 The easiest way to install the latest version of `prpy`:
 
 ```

{prpy-0.4.4 → prpy-0.4.5}/README.md

@@ -10,8 +10,6 @@ It contains subpackages for working with `numpy`, `ffmpeg`, `tensorflow`, and `t
 
 General prerequisites are `python>=3.10` and `ffmpeg` installed and accessible via the `$PATH` environment variable.
 
-- Please note: If using `numpy` or `tensorflow` options, we only support Python `<3.12` because of the dependencies. 
-
 The easiest way to install the latest version of `prpy`:
 
 ```

{prpy-0.4.4 → prpy-0.4.5}/prpy/ffmpeg/probe.py

@@ -172,9 +172,18 @@ def probe_video(
 
   return fps, total_frames, width, height, codec, bitrate, rotation, issues
 
+def _parse_ffprobe_csv_floats(raw: str) -> np.ndarray:
+  """Parse ffprobe's `-of csv=p=0` stdout (one value per line, possibly with a
+  trailing comma) into a float array."""
+  cleaned = "\n".join(line.rstrip(",") for line in raw.splitlines())
+  return np.fromstring(cleaned, dtype=float, sep="\n")
+
 def probe_video_frame_timestamps(path: str, sanity_check: bool = False) -> list:
   """Probe a video file for a best effort estimate of its frame timestamps.
 
+  Tries reading each packet's pts directly and sorting (no decode needed).
+  Falls back to decoding every frame otherwise.
+
   Args:
     path: The path of the video.
     sanity_check: Whether to check result against ffprobe count
@@ -184,23 +193,45 @@ def probe_video_frame_timestamps(path: str, sanity_check: bool = False) -> list:
   if not os.path.exists(path):
     raise FileNotFoundError(f"File {path} does not exist")
 
-  # Build the ffprobe command to extract the best effort timestamp for each frame.
-  ts_cmd = [
-    "ffprobe", "-v", "error",
-    "-select_streams", "v:0",
-    "-show_entries", "frame=best_effort_timestamp_time",
-    "-of", "csv=p=0",
-    path
-  ]
+  timestamps = None
   try:
-    proc = subprocess.run(ts_cmd, capture_output=True, text=True, check=True)
-    raw = proc.stdout
+    proc = subprocess.run([
+      "ffprobe", "-v", "error",
+      "-select_streams", "v:0",
+      "-show_entries", "packet=pts_time",
+      "-of", "csv=p=0",
+      path
+    ], capture_output=True, text=True, check=True)
+    lines = proc.stdout.splitlines()
+    if lines and all(line.rstrip(",") for line in lines):
+      candidate = np.sort(_parse_ffprobe_csv_floats(proc.stdout))
+      # A handful of tied pts (e.g. a GOP-boundary rounding artifact) is fine
+      # -- sorting already guarantees non-decreasing order, so the only real
+      # question is whether too many packets are tied to trust the result.
+      n_dupes = int(np.sum(np.diff(candidate) <= 0)) if candidate.size else 0
+      if candidate.size == len(lines) and n_dupes <= max(1, int(0.01 * candidate.size)):
+        timestamps = candidate
+      else:
+        logging.debug("Packet-level pts unusable (incomplete or too many duplicates); falling back.")
   except subprocess.CalledProcessError as e:
-    logging.error("ffprobe error: %s", e)
-    return []
-  # Clean trailing commas and process with numpy
-  cleaned = "\n".join(line.rstrip(",") for line in raw.splitlines())
-  timestamps = np.fromstring(cleaned, dtype=float, sep="\n")
+    logging.debug("Fast packet-level probe failed, falling back: %s", e)
+
+  if timestamps is None:
+    # Fallback: decode every frame to read its best-effort timestamp.
+    ts_cmd = [
+      "ffprobe", "-v", "error",
+      "-select_streams", "v:0",
+      "-show_entries", "frame=best_effort_timestamp_time",
+      "-of", "csv=p=0",
+      path
+    ]
+    try:
+      proc = subprocess.run(ts_cmd, capture_output=True, text=True, check=True)
+      raw = proc.stdout
+    except subprocess.CalledProcessError as e:
+      logging.error("ffprobe error: %s", e)
+      return []
+    timestamps = _parse_ffprobe_csv_floats(raw)
 
   if sanity_check:
     # Grab the frame count

{prpy-0.4.4 → prpy-0.4.5}/prpy/numpy/filters.py

@@ -21,6 +21,7 @@
 import math
 import numpy as np
 from scipy import signal
+from scipy.linalg import solveh_banded
 from scipy.ndimage import uniform_filter1d
 from scipy.sparse import spdiags
 from typing import Union, Tuple
@@ -151,18 +152,20 @@ def detrend(
   T = z.shape[axis]
   if T < 3:
    return z
-  # Identity matrix
-  I = np.identity(T)
   # Regularization matrix
   D2 = spdiags(
     [np.ones(T), -2*np.ones(T), np.ones(T)],
-    [0, 1, 2], (T-2), T).toarray()
-  # Inverse of I+lambda^2*D2’*D2
-  A = I + (Lambda**2) * np.dot(D2.T, D2)
+    [0, 1, 2], (T-2), T)
+  # I+lambda^2*D2’*D2 is symmetric pentadiagonal, so solve it in banded form
+  DTD = (D2.T @ D2).todia()
+  ab = np.zeros((3, T))
+  ab[2] = 1. + (Lambda**2) * DTD.diagonal(0)
+  ab[1, 1:] = (Lambda**2) * DTD.diagonal(1)
+  ab[0, 2:] = (Lambda**2) * DTD.diagonal(2)
   # Compute the detrending operation (vectorized)
   if axis == 0:
     z = np.transpose(z)
-  z_trend = np.linalg.solve(A, z.T)
+  z_trend = solveh_banded(ab, z.T)
   proc_z = (z.T - z_trend)
   if axis == 1:
     proc_z = np.transpose(proc_z)

{prpy-0.4.4 → prpy-0.4.5}/prpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prpy
-Version: 0.4.4
+Version: 0.4.5
 Summary: Collection of Python utils for signal, image, and video processing
 Author-email: Philipp Rouast <philipp@rouast.com>
 License: MIT License
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24
@@ -50,8 +50,6 @@ It contains subpackages for working with `numpy`, `ffmpeg`, `tensorflow`, and `t
 
 General prerequisites are `python>=3.10` and `ffmpeg` installed and accessible via the `$PATH` environment variable.
 
-- Please note: If using `numpy` or `tensorflow` options, we only support Python `<3.12` because of the dependencies. 
-
 The easiest way to install the latest version of `prpy`:
 
 ```

prpy-0.4.5/prpy.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.4.5",
+  "distance": 0,
+  "node": "g063e0301dacb74684528594aff483fb30e31ea65",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-08"
+}

{prpy-0.4.4 → prpy-0.4.5}/pyproject.toml

@@ -15,7 +15,11 @@ authors = [
 ]
 description = "Collection of Python utils for signal, image, and video processing"
 readme = "README.md"
-requires-python = ">=3.10"
+# Upper bound must match the newest version actually tested (main.yml's
+# matrix) and built (release.yml's CIBW_BUILD) - keep all three in sync
+# when adding/dropping a Python version. Without this ceiling, pip will
+# silently attempt an untested sdist build on any newer Python.
+requires-python = ">=3.10,<3.13"
 keywords = ["python", "numpy", "ffmpeg", "tensorflow", "torch"]
 license = {text = "MIT License"}
 classifiers = [

{prpy-0.4.4 → prpy-0.4.5}/tests/conftest.py

@@ -23,6 +23,7 @@ from PIL import Image
 import os
 import pytest
 import random as rand
+import subprocess
 import tempfile
 from typing import Optional, Union
 
@@ -138,6 +139,19 @@ def sample_video_file(temp_dir):
   _ffmpeg_output_to_file(stream, output_dir=temp_dir, output_file=filename, overwrite=True)
   yield os.path.join(temp_dir, filename)
 
+@pytest.fixture(scope='session')
+def sample_video_file_no_bframes(temp_dir):
+  # H264 with B-frames disabled, for probe_video_frame_timestamps' fast path.
+  filename = 'test_no_bframes.mp4'
+  path = os.path.join(temp_dir, filename)
+  subprocess.run([
+    'ffmpeg', '-y', '-v', 'error',
+    '-f', 'lavfi', '-i', 'testsrc=size=320x240:rate=25:duration=2',
+    '-c:v', 'libx264', '-bf', '0', '-pix_fmt', 'yuv420p',
+    path
+  ], check=True)
+  yield path
+
 @pytest.fixture(scope='session')
 def sample_video_data():
   # Create sample stream

{prpy-0.4.4 → prpy-0.4.5}/tests/test_ffmpeg.py

@@ -26,7 +26,7 @@ import pytest
 import sys
 sys.path.append('../prpy')
 
-from prpy.ffmpeg.probe import probe_video
+from prpy.ffmpeg.probe import probe_video, probe_video_frame_timestamps
 from prpy.ffmpeg.readwrite import read_video_from_path
 from prpy.ffmpeg.readwrite import write_video_from_path, write_video_from_numpy
 
@@ -49,6 +49,32 @@ def test_probe_video(sample_video_file):
   assert r == SAMPLE_ROTATION
   assert i == SAMPLE_ISSUES
 
+def test_probe_video_frame_timestamps_no_bframes_uses_fast_path(sample_video_file_no_bframes, caplog):
+  with caplog.at_level("DEBUG"):
+    timestamps = probe_video_frame_timestamps(sample_video_file_no_bframes)
+  assert "falling back" not in caplog.text
+  assert len(timestamps) == 50  # 2s at 25fps
+  assert np.all(np.diff(timestamps) > 0)
+  np.testing.assert_allclose(timestamps, np.arange(50) / 25., atol=1e-3)
+
+def test_probe_video_frame_timestamps_bframes_still_uses_fast_path(sample_video_file, caplog):
+  # sample_video_file has B-frames (libx264 defaults); sorting packet pts
+  # handles that without needing the decode fallback.
+  with caplog.at_level("DEBUG"):
+    timestamps = probe_video_frame_timestamps(sample_video_file)
+  assert "falling back" not in caplog.text
+  assert len(timestamps) == SAMPLE_FRAMES
+  assert np.all(np.diff(timestamps) > 0)
+  np.testing.assert_allclose(timestamps, np.arange(SAMPLE_FRAMES) / SAMPLE_FPS, atol=1e-3)
+
+def test_probe_video_frame_timestamps_sanity_check(sample_video_file_no_bframes, sample_video_file):
+  assert len(probe_video_frame_timestamps(sample_video_file_no_bframes, sanity_check=True)) == 50
+  assert len(probe_video_frame_timestamps(sample_video_file, sanity_check=True)) == SAMPLE_FRAMES
+
+def test_probe_video_frame_timestamps_missing_file():
+  with pytest.raises(FileNotFoundError):
+    probe_video_frame_timestamps("does_not_exist.mp4")
+
 @pytest.mark.parametrize("target_fps", [25., 8.])
 @pytest.mark.parametrize("crop", [None, (256, 94, 416, 214)])
 @pytest.mark.parametrize("scale", [None, 30, (40, 40)])

{prpy-0.4.4 → prpy-0.4.5}/tests/test_numpy_filters.py

@@ -134,6 +134,17 @@ def test_detrend():
               [-.0582996, .03747831, -.27848467, .31075766, .33470214]]),
     rtol=1e-6)
 
+@pytest.mark.parametrize("T", [3, 4, 10, 500])
+def test_detrend_matches_dense_solution(T):
+  rng = np.random.default_rng(T)
+  z = np.cumsum(rng.normal(size=(2, T)), axis=1)
+  D2 = np.diff(np.identity(T), n=2, axis=0)
+  A = np.identity(T) + 25. * D2.T @ D2
+  expected = z - np.linalg.solve(A, z.T).T
+  np.testing.assert_allclose(detrend(z=z, Lambda=5., axis=-1), expected, rtol=1e-8, atol=1e-10)
+  np.testing.assert_allclose(detrend(z=z.T, Lambda=5., axis=0), expected.T, rtol=1e-8, atol=1e-10)
+  np.testing.assert_allclose(detrend(z=z[0], Lambda=5.), expected[0], rtol=1e-8, atol=1e-10)
+
 def test_detrend_frequency_response():
   # Example from the paper
   f_s = 4

prpy-0.4.4/prpy.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.4.4",
-  "distance": 0,
-  "node": "g47e51af67da79b0b9e7a69027b4f7406cbf6fd63",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-24"
-}