Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

blorp

jonmatthis42a05921bffc
diff --git a/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py b/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py
index 2d644793..7c3f2cd9 100644
--- a/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py
+++ b/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py
@@ -83,6 +83,7 @@ class CalibrationCameraNode(BaseCameraNode):
observation, raw_results = charuco_tracker.process_image(frame.image, annotate_image=False)
if camera_calibration_estimator is None:
camera_calibration_estimator = SingleCameraCalibrator.create_initial(
+ camera_id=camera_id,
image_size=frame.image.shape[:2],
aruco_marker_ids=list(charuco_tracker.detector.board.getIds()),
aruco_corners_in_object_coordinates=charuco_tracker.aruco_corners_in_object_coordinates,
diff --git a/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py b/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py
index ec0dba5e..1181c2a5 100644
--- a/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py
+++ b/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py
@@ -17,16 +17,21 @@ class MultiCameraCalibrator(BaseModel):
shared_charuco_views: dict[FrameNumber, dict[CameraId, CalibrationCameraNodeOutputData]],
calibrate_cameras: bool = True):
# Find the principal camera
- principal_camera_id = min(key for key in shared_charuco_views.keys())
- principal_camera_6dof = Positional6DOF(translation=[0., 0., 0.],
- rotation=[0., 0., 0.])
# Calculate the calibration estimate for each camera
- camera_node_outputs_by_camera = {camera_id: [] for camera_id in shared_charuco_views[0].keys()}
+
+ camera_node_outputs_by_camera = {}
+
for frame_number, camera_node_outputs in shared_charuco_views.items():
for camera_id in camera_node_outputs.keys():
+ if camera_id not in camera_node_outputs_by_camera:
+ camera_node_outputs_by_camera[camera_id] = []
camera_node_outputs_by_camera[camera_id].append(camera_node_outputs[camera_id])
+ principal_camera_id = min(key for key in camera_node_outputs_by_camera.keys())
+ principal_camera_6dof = Positional6DOF(translation=[0., 0., 0.],
+ rotation=[0., 0., 0.])
+
camera_estimates = {}
for camera_id, camera_node_outputs in camera_node_outputs_by_camera.items():
camera_estimates[camera_id] = SingleCameraCalibrator.from_camera_node_outputs(camera_node_outputs=camera_node_outputs,
diff --git a/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py b/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py
index eb846a17..a05466ea 100644
--- a/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py
+++ b/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py
@@ -4,6 +4,7 @@ import cv2
import numpy as np
from numpydantic import NDArray, Shape
from pydantic import BaseModel, Field
+from skellycam import CameraId
from skellytracker.trackers.charuco_tracker.charuco_observation import CharucoObservations, CharucoObservation
from freemocap.pipelines.calibration_pipeline.calibration_camera_node_output_data import CalibrationCameraNodeOutputData
@@ -41,6 +42,7 @@ class SingleCameraCalibrator(BaseModel):
relative to the world coordinate space for each view.
error (SingleCameraCalibrationError | None): Calibration error details.
"""
+ camera_id: CameraId
image_size: tuple[int, ...]
charuco_corner_ids: list[int]
@@ -82,12 +84,14 @@ class SingleCameraCalibrator(BaseModel):
)
@classmethod
- def from_camera_node_outputs(cls, camera_node_outputs: list[CalibrationCameraNodeOutputData], calibrate_camera: bool = True):
- view0 = camera_node_outputs[0]
- camera_id = view0.camera_id
- observation = view0.camera_node_output.charuco_observation
+ def from_camera_node_outputs(cls, camera_node_outputs: list[CalibrationCameraNodeOutputData],
+ calibrate_camera: bool = True):
+ output0 = camera_node_outputs[0]
+ camera_id = output0.camera_id
+ observation = output0.charuco_observation
instance = cls.create_initial(
- image_size=view0.camera_node_output.image_size,
+ camera_id=camera_id,
+ image_size=observation.image_size,
aruco_marker_ids=observation.all_aruco_ids,
aruco_corners_in_object_coordinates=observation.all_aruco_corners_in_object_coordinates,
charuco_corner_ids=observation.all_charuco_ids,
@@ -95,16 +99,17 @@ class SingleCameraCalibrator(BaseModel):
)
for view in camera_node_outputs:
if view.camera_id != camera_id:
- raise ValueError("All camera views must be from the same camera")
+ raise ValueError(f"Camera ID mismatch: {view.camera_id} != {camera_id}")
instance.add_observation(view.camera_node_output.charuco_observation)
if calibrate_camera:
- logger.info(f"Calibrating camera {view0.camera_id} with {len(instance.object_points_views)} views")
+ logger.info(f"Calibrating camera {output0.camera_id} with {len(instance.object_points_views)} views")
instance.update_calibration_estimate()
return instance
@classmethod
def create_initial(cls,
+ camera_id: CameraId,
image_size: tuple[int, ...],
aruco_marker_ids: list[int],
aruco_corners_in_object_coordinates: list[np.ndarray[..., 3]],
@@ -123,7 +128,8 @@ class SingleCameraCalibrator(BaseModel):
if len(aruco_marker_ids) != len(aruco_corners_in_object_coordinates):
raise ValueError("Number of aruco marker IDs must match the number of aruco corners.")
- return cls(image_size=image_size,
+ return cls(camera_id=camera_id,
+ image_size=image_size,
charuco_corner_ids=charuco_corner_ids,
charuco_corners_in_object_coordinates=charuco_corners_in_object_coordinates,
aruco_marker_ids=aruco_marker_ids,
@@ -140,6 +146,10 @@ class SingleCameraCalibrator(BaseModel):
)
def add_observation(self, observation: CharucoObservation):
+ if observation.image_size != self.image_size:
+ raise ValueError(f"Image size mismatch: {observation.image_size} != {self.image_size}")
+ if observation.camera_id != self.camera_id:
+ raise ValueError(f"Camera ID mismatch: {observation.camera_id} != {self.camera_id}")
if observation.charuco_empty or len(observation.detected_charuco_corner_ids) < MIN_CHARUCO_CORNERS:
return
self._validate_observation(observation)