Free Motion Capture for Everyone πβ¨
TypeScript
blah blah
Jone209f3459f41
diff --git a/src/cameras/capture/opencv_camera/opencv_camera.py b/src/cameras/capture/opencv_camera/opencv_camera.pyindex 61b89e0f..9577557b 100644--- a/src/cameras/capture/opencv_camera/opencv_camera.py+++ b/src/cameras/capture/opencv_camera/opencv_camera.py@@ -18,7 +18,7 @@ class OpenCVCamera:Performant implementation of video capture against webcams"""- def __init__(self, config: WebcamConfig, session_id: str = None):+ def __init__(self, config: WebcamConfig, session_id: str = None, calibration_video_bool:bool=False):self._config = configself._name = f"Camera_{self._config.webcam_id}"self._opencv_video_capture_object: cv2.VideoCapture = None@@ -26,6 +26,7 @@ class OpenCVCamera:self._running_thread: VideoCaptureThread = Noneself._new_frame_ready = Falseself._number_of_frames_recorded = 0+ self._calibration_video_bool = calibration_video_boolself._session_id = session_id@property@@ -118,7 +119,8 @@ class OpenCVCamera:self._video_recorder = VideoRecorder(self._name,image_width=image_width,image_height=image_height,- session_id=self.session_id)+ session_id=self.session_id,+ calibration_video_bool=self._calibration_video_bool)except:logger.error(f"could not create video recorder for image with shape (image_width={image_width}, image_height={image_height}) ")diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.pyindex ac223984..426f1bef 100644--- a/src/cameras/multicam_manager/cv_camera_manager.py+++ b/src/cameras/multicam_manager/cv_camera_manager.py@@ -32,22 +32,23 @@ class OpenCVCameraManager:def available_webcam_ids(self):return [cam_id.webcam_id for cam_id in get_or_create_cams().cameras_found_list]- def _create_opencv_cameras(self):+ def _create_opencv_cameras(self, calibration_videos:bool=False):raw_camera_objects = self._detected_cams_data.cameras_found_listopen_cv_cameras: List[OpenCVCamera] = []for this_raw_cam in raw_camera_objects:- opencv_cam_obj = self._create_single_opencv_cam(this_raw_cam.webcam_id)+ opencv_cam_obj = self._create_single_opencv_cam(this_raw_cam.webcam_id, calibration_video_bool =calibration_videos)open_cv_cameras.append(opencv_cam_obj)return open_cv_cameras- def _create_single_opencv_cam(self, webcam_id: str):+ def _create_single_opencv_cam(self, webcam_id: str, calibration_video_bool:bool =False):webcam_config_model = self._config_service.webcam_config_by_id(webcam_id, self._session_id)single_camera_config = WebcamConfig(webcam_id=webcam_config_model.webcam_id,exposure=webcam_config_model.exposure,resolution_width=webcam_config_model.resolution_width,resolution_height=webcam_config_model.resolution_height, )return OpenCVCamera(config=single_camera_config,- session_id=self._session_id)+ session_id=self._session_id,+ calibration_video_bool = calibration_video_bool)@contextmanagerdef start_capture_session_single_cam(@@ -69,9 +70,10 @@ class OpenCVCameraManager:@contextmanagerdef start_capture_session_all_cams(self,+ calibration_videos=False,) -> ContextManager[Dict[str, OpenCVCamera]]:- open_cv_camera_objects = self._create_opencv_cameras()+ open_cv_camera_objects = self._create_opencv_cameras(calibration_videos=True)try:connected_cameras_dict = {}for cv_cam in open_cv_camera_objects:diff --git a/src/cameras/persistence/video_writer/video_recorder.py b/src/cameras/persistence/video_writer/video_recorder.pyindex 92724263..34ccb177 100644--- a/src/cameras/persistence/video_writer/video_recorder.py+++ b/src/cameras/persistence/video_writer/video_recorder.py@@ -23,6 +23,7 @@ class VideoRecorder:image_height: int,session_id: str,fourcc: str = "MP4V",+ calibration_video_bool:bool=False,):self._camera_name = camera_nameself._image_width = image_width@@ -35,9 +36,13 @@ class VideoRecorder:# get yr paths straightsession_path = Path(get_session_path(session_id))- self._synchronized_videos_folder_path = session_path / 'synchronized_videos'+ if calibration_video_bool:+ self._synchronized_videos_folder_path = session_path / 'calibration_videos'+ else:+ self._synchronized_videos_folder_path = session_path / 'synchronized_videos'+self._synchronized_videos_folder_path.mkdir(parents=True, exist_ok=True)- video_file_name = self._camera_name + '_synchronized.mp4'+ video_file_name = self._camera_name + '.mp4'self._path_to_save_video_file = self._synchronized_videos_folder_path / video_file_namediff --git a/src/pipelines/calibration_pipeline/anipose_camera_calibration/anipose_camera_calibration.py b/src/pipelines/calibration_pipeline/anipose_camera_calibration/anipose_camera_calibration.pyindex 5f2ce839..8d641b4f 100644--- a/src/pipelines/calibration_pipeline/anipose_camera_calibration/anipose_camera_calibration.py+++ b/src/pipelines/calibration_pipeline/anipose_camera_calibration/anipose_camera_calibration.py@@ -35,9 +35,9 @@ class AniposeCameraCalibrator:def get_paths_and_whatnot(self):self.session_folder_path = Path(get_session_path(self._session_id))- synchronized_videos_folder = self.session_folder_path / 'synchronized_videos'+ calibration_videos_folder = self.session_folder_path / 'calibration_videos'self._list_of_video_paths = [this_video_path for this_video_path in- synchronized_videos_folder.glob('*.mp4'.lower())]+ calibration_videos_folder.glob('*.mp4'.lower())]def initialize_anipose_objects(self):list_of_camera_names = [this_video_path.stem for this_video_path in self._list_of_video_paths]diff --git a/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.py b/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.pyindex b774e646..b432b6d1 100644--- a/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.py+++ b/src/pipelines/calibration_pipeline/calibration_pipeline_orchestrator.py@@ -48,7 +48,7 @@ class CalibrationPipelineOrchestrator:):"""open all cameras and start recording, detect charuco boards until the user closes the windows, then send recorded videos to `aniposelib` for processingproduces `[session_id]_calibration.toml` file that can be used to estiamte 3d trajectorires from synchronized images"""- with self._open_cv_camera_manager.start_capture_session_all_cams() as connected_cameras_dict:+ with self._open_cv_camera_manager.start_capture_session_all_cams(calibration_videos=True) as connected_cameras_dict:try:if show_visualizer_gui:self._visualizer_gui.setup_and_launch(self._open_cv_camera_manager.available_webcam_ids)