Free Motion Capture for Everyone πβ¨
TypeScript
organize code
Endurance Idehenf18979444a6d
diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.pyindex 187acb0a..f2eb25ea 100644--- a/src/api/routes/camera/cam_data_ws.py+++ b/src/api/routes/camera/cam_data_ws.py@@ -6,7 +6,7 @@ from fastapi import APIRouter, WebSocketfrom src.api.services.board_detect_service import BoardDetectServicefrom src.api.services.mediapipe_detect_service import MediapipeSkeletonDetectionService-from src.cameras.cv_camera_manager import CVCameraManager+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManagerlogger = logging.getLogger(__name__)diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.pyindex 01e1e390..9e360bad 100644--- a/src/api/routes/camera/camera_route.py+++ b/src/api/routes/camera/camera_route.py@@ -2,7 +2,7 @@ from fastapi import APIRouterfrom src.api.services.user_config import UserConfigServicefrom src.cameras.cam_singleton import get_or_create_cams-from src.cameras.opencv_camera import WebcamConfig+from src.cameras.opencv_camera.opencv_camera import WebcamConfigcamera_router = APIRouter()diff --git a/src/api/services/board_detect_service.py b/src/api/services/board_detect_service.pyindex d3431928..52a4ff8a 100644--- a/src/api/services/board_detect_service.py+++ b/src/api/services/board_detect_service.py@@ -1,6 +1,6 @@from typing import NamedTuple-from src.cameras.cv_camera_manager import CVCameraManager+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManagerfrom src.core_processor.board_detection.board_detection import BoardDetectiondiff --git a/src/api/services/mediapipe_detect_service.py b/src/api/services/mediapipe_detect_service.pyindex f7b29787..87b4b234 100644--- a/src/api/services/mediapipe_detect_service.py+++ b/src/api/services/mediapipe_detect_service.py@@ -1,4 +1,4 @@-from src.cameras.cv_camera_manager import CVCameraManager+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManagerfrom src.core_processor.mediapipe_skeleton_detection.mediapipe_skeleton_detection import (MediapipeSkeletonDetection,)diff --git a/src/api/services/user_config.py b/src/api/services/user_config.pyindex de4b2f13..cfb19e13 100644--- a/src/api/services/user_config.py+++ b/src/api/services/user_config.py@@ -2,7 +2,7 @@ from typing import Dictfrom singleton_decorator import singleton-from src.cameras.opencv_camera import WebcamConfig+from src.cameras.opencv_camera.opencv_camera import WebcamConfig@singletondiff --git a/src/cameras/cam_singleton.py b/src/cameras/cam_singleton.pyindex 3f8fc982..16bcb53d 100644--- a/src/cameras/cam_singleton.py+++ b/src/cameras/cam_singleton.py@@ -1,4 +1,4 @@-from src.cameras.cam_detection import DetectPossibleCameras+from src.cameras.detection.cam_detection import DetectPossibleCameras# No consumer should call this "private" variablediff --git a/src/cameras/detection/__init__.py b/src/cameras/detection/__init__.pynew file mode 100644index 00000000..e69de29bdiff --git a/src/cameras/cam_detection.py b/src/cameras/detection/cam_detection.pysimilarity index 86%rename from src/cameras/cam_detection.pyrename to src/cameras/detection/cam_detection.pyindex a1edcf64..270ed2cf 100644--- a/src/cameras/cam_detection.py+++ b/src/cameras/detection/cam_detection.py@@ -3,7 +3,7 @@ import platformimport cv2-from src.cameras.dto import FindAvailableResponse, RawCamera+from src.cameras.detection.models import FoundCamerasResponse, RawCameraCAM_CHECK_NUM = 5@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)class DetectPossibleCameras:- def find_available_cameras(self) -> FindAvailableResponse:+ def find_available_cameras(self) -> FoundCamerasResponse:cv2_backend = self._determine_backend()cams_to_use_list = []@@ -33,7 +33,7 @@ class DetectPossibleCameras:cap.release()print(cams_to_use_list)- return FindAvailableResponse(+ return FoundCamerasResponse(camera_found_count=len(cams_to_use_list),cams_to_use=cams_to_use_list,cv2_backend=cv2_backend,diff --git a/src/cameras/detection/models.py b/src/cameras/detection/models.pynew file mode 100644index 00000000..dee5c0f8--- /dev/null+++ b/src/cameras/detection/models.py@@ -0,0 +1,13 @@+from typing import List++from pydantic import BaseModel+++class RawCamera(BaseModel):+ webcam_id: str+++class FoundCamerasResponse(BaseModel):+ camera_found_count: int+ cams_to_use: List[RawCamera]+ cv2_backend: intdiff --git a/src/cameras/dto.py b/src/cameras/dto.pyindex c4dae48c..a38ad793 100644--- a/src/cameras/dto.py+++ b/src/cameras/dto.py@@ -1,17 +1,6 @@-from typing import List, NamedTuple, Union+from typing import NamedTuple, Unionimport numpy as np-from pydantic import BaseModel---class RawCamera(BaseModel):- webcam_id: str---class FindAvailableResponse(BaseModel):- camera_found_count: int- cams_to_use: List[RawCamera]- cv2_backend: intclass FramePayload(NamedTuple):diff --git a/src/cameras/dtos/create_writer_options.py b/src/cameras/dtos/create_writer_options.pydeleted file mode 100644index 30c8b256..00000000--- a/src/cameras/dtos/create_writer_options.py+++ /dev/null@@ -1,20 +0,0 @@-import time-from pathlib import Path--from pydantic import BaseModel---class CreateWriterOptions(BaseModel):- writer_dir: Path---def get_canonical_time_str():- return time.strftime("%m_%d_%Y_%H%M%S")---def get_base_options():- return CreateWriterOptions(- writer_dir=Path().joinpath(- "raw_frame_capture", f"{get_canonical_time_str()}.mp4"- )- )diff --git a/src/cameras/multicam_manager/__init__.py b/src/cameras/multicam_manager/__init__.pynew file mode 100644index 00000000..e69de29bdiff --git a/src/cameras/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.pysimilarity index 96%rename from src/cameras/cv_camera_manager.pyrename to src/cameras/multicam_manager/cv_camera_manager.pyindex 30be736a..5e2c7b84 100644--- a/src/cameras/cv_camera_manager.py+++ b/src/cameras/multicam_manager/cv_camera_manager.py@@ -3,13 +3,11 @@ import tracebackfrom contextlib import contextmanagerfrom typing import ContextManager, Dict, List-import cv2from pydantic import BaseModelfrom src.api.services.user_config import UserConfigServicefrom src.cameras.cam_singleton import get_or_create_cams-from src.cameras.dtos.create_writer_options import CreateWriterOptions-from src.cameras.opencv_camera import OpenCVCamera+from src.cameras.opencv_camera.opencv_camera import OpenCVCamerafrom src.cameras.video_writer.video_writer import VideoWriterlogger = logging.getLogger(__name__)diff --git a/src/cameras/opencv_camera/__init__.py b/src/cameras/opencv_camera/__init__.pynew file mode 100644index 00000000..e69de29bdiff --git a/src/cameras/frame_grabber.py b/src/cameras/opencv_camera/frame_grabber.pysimilarity index 97%rename from src/cameras/frame_grabber.pyrename to src/cameras/opencv_camera/frame_grabber.pyindex fa9ae6cc..dbaff624 100644--- a/src/cameras/frame_grabber.py+++ b/src/cameras/opencv_camera/frame_grabber.py@@ -6,7 +6,7 @@ from pathlib import Pathfrom uuid import uuid4from src.cameras.dto import FramePayload-from src.cameras.dtos.create_writer_options import get_canonical_time_str+from src.cameras.utils.time_str import get_canonical_time_strfrom src.cameras.video_writer.video_writer import SaveOptions, VideoWriterfrom src.config.data_paths import freemocap_data_pathdiff --git a/src/cameras/opencv_camera.py b/src/cameras/opencv_camera/opencv_camera.pysimilarity index 98%rename from src/cameras/opencv_camera.pyrename to src/cameras/opencv_camera/opencv_camera.pyindex 263a9e64..d866de0a 100644--- a/src/cameras/opencv_camera.py+++ b/src/cameras/opencv_camera/opencv_camera.py@@ -8,7 +8,7 @@ import cv2from pydantic import BaseModelfrom src.cameras.dto import FramePayload-from src.cameras.frame_grabber import FrameThread+from src.cameras.opencv_camera.frame_grabber import FrameThreadlogger = logging.getLogger(__name__)diff --git a/src/cameras/utils/time_str.py b/src/cameras/utils/time_str.pynew file mode 100644index 00000000..aecc6cf0--- /dev/null+++ b/src/cameras/utils/time_str.py@@ -0,0 +1,5 @@+import time+++def get_canonical_time_str():+ return time.strftime("%m_%d_%Y_%H%M%S")diff --git a/src/cameras/video_writer/open_cv_cam_writer.py b/src/cameras/video_writer/open_cv_cam_writer.pydeleted file mode 100644index 78d3ff5d..00000000--- a/src/cameras/video_writer/open_cv_cam_writer.py+++ /dev/null@@ -1,42 +0,0 @@-import logging-from pathlib import Path--import cv2--from src.cameras.dtos.create_writer_options import CreateWriterOptions, get_base_options-from src.config.data_paths import freemocap_data_path--logger = logging.getLogger(__name__)---class OpenCVCamWriter:- def create_writer(self, video_capture_obj, options: CreateWriterOptions = None):- """- Create writer makes a writer based off a video capture object- If a write location is specified, then the videos are written there.- If not, the videos are written to the current working directory-- OS specifics are handled by the Path module.- """-- if options is None:- options = get_base_options()- frame_width = int(video_capture_obj.get(3))- frame_height = int(video_capture_obj.get(4))- fps = int(video_capture_obj.get(5))-- if options:- final_path = Path().joinpath(freemocap_data_path, options.writer_dir)- else:- assert False, "A path for writer dir must be sent."-- logger.debug(f"Video save path: {final_path}")- return cv2.VideoWriter(- str(final_path),- cv2.VideoWriter_fourcc(*"MJPG"),- fps,- (frame_width, frame_height),- )-- def close_writer(self, writer: cv2.VideoWriter):- writer.release()diff --git a/src/core_processor/board_detection/board_detection.py b/src/core_processor/board_detection/board_detection.pyindex 5e5b86e8..0efb3a8f 100644--- a/src/core_processor/board_detection/board_detection.py+++ b/src/core_processor/board_detection/board_detection.py@@ -6,7 +6,7 @@ from pathlib import Pathimport cv2import numpy as np-from src.cameras.cv_camera_manager import CVCameraManager+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManagerfrom src.cameras.dto import FramePayloadfrom src.cameras.video_writer.video_writer import SaveOptionsfrom src.core_processor.board_detection.base_pose_estimation import detect_charuco_boarddiff --git a/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py b/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.pyindex a563c232..a48eafeb 100644--- a/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py+++ b/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py@@ -8,7 +8,7 @@ import cv2import mediapipe as mpimport numpy as np-from src.cameras.cv_camera_manager import CVCameraManager+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManagerfrom src.cameras.dto import FramePayloadfrom src.cameras.video_writer.video_writer import SaveOptionsfrom src.config.data_paths import create_home_data_directory