Free Motion Capture for Everyone πβ¨
TypeScript
refactor of cv_cam_manager
Endurance Idehen082baece7dcb
diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.pyindex acbec4fd..98aa96c2 100644--- a/src/cameras/multicam_manager/cv_camera_manager.py+++ b/src/cameras/multicam_manager/cv_camera_manager.py@@ -3,19 +3,16 @@ import tracebackfrom contextlib import contextmanagerfrom typing import ContextManager, Dict, List-import numpy as npfrom pydantic import BaseModelfrom src.api.services.user_config import UserConfigService-from src.cameras.detection.cam_singleton import get_or_create_camsfrom src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera+from src.cameras.detection.cam_singleton import get_or_create_camsfrom src.cameras.persistence.video_writer.video_recorder import VideoRecorderfrom src.config.webcam_config import WebcamConfiglogger = logging.getLogger(__name__)-_open_cv_cameras = None-class CamAndWriterResponse(BaseModel):cv_camera: OpenCVCamera@@ -31,114 +28,65 @@ class OpenCVCameraManager:self._config_service = UserConfigService()self._detected_cams_data = get_or_create_cams()-- @property- def number_of_cameras(self):- return self._number_of_cameras-@propertydef available_webcam_ids(self):- return [cv_cam.webcam_id_as_str for cv_cam in self._open_cv_camera_objects]-- @property- def camera0_id(self):- """ ID of the first camera found. This camera will be used as the reference point for time sync and camera position and rotation"""- return self.available_webcam_ids[0]-- @property- def open_cv_cameras(self):- return self._open_cv_camera_objects-- @property- def new_synchronized_frame_available(self):- new_frame_bool_list = [cam.new_frame_ready for cam in self._open_cv_camera_objects]- if all(new_frame_bool_list):- return True- return False-- def latest_synchronized_frame(self):- synchronized_frame_dict = {}- for this_cam in self._open_cv_camera_objects:-- if not self.new_synchronized_frame_available:- logger.error(f'New frame not available for camera {this_cam.webcam_id_as_str}')- synchronized_frame_dict[this_cam.webcam_id_as_str] = None-- synchronized_frame_dict[this_cam.webcam_id_as_str] = this_cam.latest_frame- return synchronized_frame_dict-- def cv_cam_by_id(self, webcam_id: str):- for cam in self._open_cv_camera_objects:- if cam.webcam_id_as_str == str(webcam_id):- return cam- return None+ return [cam_id.webcam_id for cam_id in get_or_create_cams().cameras_found_list]def _create_opencv_cameras(self):raw_camera_objects = self._detected_cams_data.cameras_found_listopen_cv_cameras: List[OpenCVCamera] = []for this_raw_cam in raw_camera_objects:- webcam_config_model = self._config_service.webcam_config_by_id(this_raw_cam.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, )- this_opencv_camera = OpenCVCamera(config=single_camera_config)- open_cv_cameras.append(this_opencv_camera)+ opencv_cam_obj = self._create_single_opencv_cam(this_raw_cam.webcam_id)+ open_cv_cameras.append(opencv_cam_obj)return open_cv_cameras+ def _create_single_opencv_cam(self, webcam_id: str):+ 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)+@contextmanagerdef start_capture_session_single_cam(- self, webcam_id: str = None+ self, webcam_id: str = None) -> ContextManager[CamAndWriterResponse]:"""Context manager for easy start up, usage, and cleanup of camera resources.Can capture frames from a single webcam or all webcams detected."""+ cv_camera = self._create_single_opencv_cam(webcam_id)try:- video_recorder = self._start_frame_capture_on_cam_id(webcam_id)- cv_camera = self.cv_cam_by_id(webcam_id)- yield CamAndWriterResponse(cv_camera=cv_camera, video_recorder=video_recorder)- self._stop_frame_capture_all_cams()+ self._start_frame_capture_on_cam_id(cv_camera)+ yield CamAndWriterResponse(cv_camera=cv_camera)+ self._stop_frame_capture([cv_camera])except:logger.error("Printing traceback from starting capture session by cam")traceback.print_exc()@contextmanagerdef start_capture_session_all_cams(- self,+ self,) -> ContextManager[Dict[str, OpenCVCamera]]:open_cv_camera_objects = self._create_opencv_cameras()- number_of_cameras = len(open_cv_camera_objects)-try:connected_cameras_dict = {}for cv_cam in open_cv_camera_objects:connected_cameras_dict[cv_cam.webcam_id_as_str] = cv_cam- cv_cam.connect()- cv_cam.start_frame_capture_thread()+ self._start_frame_capture_on_cam_id(cv_cam)yield connected_cameras_dict- self._stop_frame_capture_all_cams()+ self._stop_frame_capture(open_cv_camera_objects)except:logger.error("Printing traceback from starting capture session by cam")traceback.print_exc()- def _start_frame_capture_on_cam_id(self, webcam_id: str):- filtered_cams = list(- filter(lambda c: c.webcam_id_as_str == str(webcam_id), self._open_cv_camera_objects)- )- assert (- len(filtered_cams) == 1- ), "The CV Cams list should only have 1 cam per webcam_id"- cv_cam = filtered_cams[0]- cv_cam.connect()- cv_cam.start_frame_capture_thread()-- def _stop_frame_capture_all_cams(self):- for cv_cam in self._open_cv_camera_objects:- cv_cam.stop_frame_capture()+ def _start_frame_capture_on_cam_id(self, opencv_cam: OpenCVCamera):+ opencv_cam.connect()+ opencv_cam.start_frame_capture_thread()- def _close_all_cameras(self):- for cv_cam in self._open_cv_camera_objects:- cv_cam.close()+ def _stop_frame_capture(self, opencv_cam_objs: List[OpenCVCamera]):+ for cv_cam in opencv_cam_objs:+ cv_cam.stop_frame_capture()