Merge branch 'main' into bugfix-display-icon

Author: kaufManu

README.md

@@ -8,19 +8,25 @@ A set of tools to visualize and interact with sequences of 3D data with cross-pl
 ## Installation
 Basic Installation:
 ```commandline
-pip install aitviewer
+uv pip install aitviewer
 ```
+or drop the `uv` if you do not use it.
+
 Note that this does not install the GPU-version of PyTorch automatically. If your environment already contains it, you should be good to go, otherwise install it manually.
 
-Or install locally (if you need to extend or modify code)
+This installs PyQt6. If you require PyQt5, install via
+
+```commandline
+uv pip install aitviewer[pyqt5]
+```
+
+If you need to extend or modify the code, install from source via
 ```commandline
 git clone git@github.com:eth-ait/aitviewer.git
 cd aitviewer
 pip install -e .
 ```
 
-On macOS with Apple Silicon it is recommended to use PyQt6. Please check [this issue](https://github.com/eth-ait/aitviewer/issues/22) for installation instructions.
-
 For more advanced installation and for installing SMPL body models, please refer to the [documentation](https://eth-ait.github.io/aitviewer/parametric_human_models/supported_models.html) .
 
 ## Features
@@ -41,18 +47,19 @@ For more advanced installation and for installing SMPL body models, please refer
 
 
 ## Quickstart
-Display an SMPL T-pose (Requires SMPL models):
+Display an SMPL-X T-pose (Requires SMPL models to be installed):
 ```py
+from aitviewer.models.smpl import SMPLLayer
 from aitviewer.renderables.smpl import SMPLSequence
 from aitviewer.viewer import Viewer
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     v = Viewer()
-    v.scene.add(SMPLSequence.t_pose())
+    smpl_layer = SMPLLayer(model_type="smplx", gender="neutral")
+    v.scene.add(SMPLSequence.reference_pose(smpl_layer))
     v.run()
 ```
 
-
 ## Projects using the aitviewer
 A sampling of projects using the aitviewer. Let us know if you want to be added to this list!
 - Fan et al., [HOLD: Category-agnostic 3D Reconstruction of Interacting Hands and Objects from Video](https://github.com/zc-alexfan/hold), CVPR 2024

aitviewer/viewer.py

@@ -1,6 +1,7 @@
 # Copyright (C) 2022-2026  ETH Zurich, Manuel Kaufmann, Velko Vechev, Dario Mylonopoulos
 import copy
 import os
+import subprocess
 import sys
 from array import array
 from collections import namedtuple
@@ -31,6 +32,41 @@
 from aitviewer.utils.perf_timer import PerfTimer
 from aitviewer.utils.utils import get_video_paths, video_to_gif
 
+
+class FFmpegWriter:
+    """Thin ffmpeg pipe writer, replaces scikit-video which broke on NumPy 2.0."""
+
+    def __init__(self, path, inputdict, outputdict):
+        self._path = path
+        self._inputdict = inputdict
+        self._outputdict = outputdict
+        self._proc = None
+
+    def _start(self, frame):
+        h, w = frame.shape[:2]
+        pix_fmt = "rgba" if frame.ndim == 3 and frame.shape[2] == 4 else "rgb24"
+        input_args = [a for k, v in self._inputdict.items() for a in (k, str(v))]
+        output_args = [a for k, v in self._outputdict.items() for a in (k, str(v))]
+        cmd = (
+            ["ffmpeg", "-y"]
+            + input_args
+            + ["-f", "rawvideo", "-pix_fmt", pix_fmt, "-s", f"{w}x{h}", "-i", "pipe:0"]
+            + output_args
+            + [self._path]
+        )
+        self._proc = subprocess.Popen(cmd, stdin=subprocess.PIPE)
+
+    def writeFrame(self, frame):
+        if self._proc is None:
+            self._start(frame)
+        self._proc.stdin.write(frame.tobytes())
+
+    def close(self):
+        if self._proc is not None:
+            self._proc.stdin.close()
+            self._proc.wait()
+
+
 MeshMouseIntersection = namedtuple(
     "MeshMouseIntersection",
     "node instance_id tri_id vert_id point_world point_local bc_coords",
@@ -1876,9 +1912,6 @@ def export_video(
         quality="medium",
         ensure_no_overwrite=True,
     ):
-        # Load this module to reduce load time.
-        import skvideo.io
-
         if rotate_camera and not isinstance(self.scene.camera, ViewerCamera):
             print("Cannot export a video with camera rotation while using a camera that is not a ViewerCamera")
             return
@@ -1974,7 +2007,7 @@ def export_video(
                     }
                 )
 
-            writer = skvideo.io.FFmpegWriter(
+            writer = FFmpegWriter(
                 path_video,
                 inputdict={
                     "-framerate": str(output_fps),

pyproject.toml

@@ -40,7 +40,6 @@ dependencies = [
     "roma>=1.2.3",
     "joblib",
     "scikit-image>=0.9.0",
-    "scikit-video",
     "Pillow",
     "websockets",
     "usd-core>=23.5",