Free Motion Capture for Everyone πβ¨
TypeScript
CAMERAS WORK?
Endurance Idehen35ca3cfaaf19
diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.pyindex 7a3a29ba..ebb8a9db 100644--- a/src/api/routes/camera/camera_route.py+++ b/src/api/routes/camera/camera_route.py@@ -25,7 +25,8 @@ async def config_cam(webcam_config_model: WebcamConfigModel, session_id):@camera_router.post("/camera/cv2_imshow_one_camera/{webcam_id}")async def cv2_imshow_one_camera(webcam_id: str, camera_preview_model: CameraPreviewModel):- with OpenCVCameraManager(session_id=camera_preview_model.session_id).start_capture_session_single_cam() as connected_camera_and_writer:+ cv_cam_manager = OpenCVCameraManager(session_id=camera_preview_model.session_id)+ with cv_cam_manager.start_capture_session_single_cam(webcam_id) as connected_camera_and_writer:should_continue = Truethis_camera = connected_camera_and_writer.cv_camerawhile should_continue:@@ -40,8 +41,9 @@ async def cv2_imshow_one_camera(webcam_id: str, camera_preview_model: CameraPrev@camera_router.post("/camera/cv2_imshow_all_cameras")-async def cv2_imshow_all_camera():- with OpenCVCameraManager().start_capture_session_all_cams() as connected_cameras_dict:+async def cv2_imshow_all_camera(camera_preview_model: CameraPreviewModel):+ cv_cam_manager = OpenCVCameraManager(session_id=camera_preview_model.session_id)+ with cv_cam_manager.start_capture_session_all_cams() as connected_cameras_dict:should_continue = Truewhile should_continue:for this_webcam_id, this_open_cv_camera in connected_cameras_dict.items():diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.pyindex 98aa96c2..f150bf0d 100644--- a/src/cameras/multicam_manager/cv_camera_manager.py+++ b/src/cameras/multicam_manager/cv_camera_manager.py@@ -1,7 +1,7 @@import loggingimport tracebackfrom contextlib import contextmanager-from typing import ContextManager, Dict, List+from typing import ContextManager, Dict, List, Optionalfrom pydantic import BaseModel@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)class CamAndWriterResponse(BaseModel):cv_camera: OpenCVCamera- video_recorder: VideoRecorder+ video_recorder: Optional[VideoRecorder]class Config:arbitrary_types_allowed = True@@ -50,7 +50,7 @@ class OpenCVCameraManager:@contextmanagerdef start_capture_session_single_cam(- self, webcam_id: str = None+ self, webcam_id: str) -> ContextManager[CamAndWriterResponse]:"""Context manager for easy start up, usage, and cleanup of camera resources.