Skip to content

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

TypeScript

refactor

Endurance Idehen71219f0cfc8b
diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.py
index f4f45846..6d82f9d1 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, WebSocket
from src.api.services.board_detect_service import BoardDetectService
from src.api.services.mediapipe_detect_service import MediapipeSkeletonDetectionService
-from src.cameras.capture.multicam_manager import CVCameraManager
+from src.cameras.multicam_manager import CVCameraManager
logger = logging.getLogger(__name__)
diff --git a/src/api/services/board_detect_service.py b/src/api/services/board_detect_service.py
index bc09f1ed..993e7f74 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.capture.multicam_manager import CVCameraManager
+from src.cameras.multicam_manager import CVCameraManager
from src.core_processor.board_detection.board_detection import BoardDetection
diff --git a/src/api/services/mediapipe_detect_service.py b/src/api/services/mediapipe_detect_service.py
index 6e2c416f..f9a624a3 100644
--- a/src/api/services/mediapipe_detect_service.py
+++ b/src/api/services/mediapipe_detect_service.py
@@ -1,4 +1,4 @@
-from src.cameras.capture.multicam_manager import CVCameraManager
+from src.cameras.multicam_manager import CVCameraManager
from src.core_processor.mediapipe_skeleton_detection.mediapipe_skeleton_detection import (
MediapipeSkeletonDetection,
)
diff --git a/src/cameras/capture/opencv_camera/frame_grabber.py b/src/cameras/capture/opencv_camera/frame_grabber.py
index f4ac0207..acc3bbbf 100644
--- a/src/cameras/capture/opencv_camera/frame_grabber.py
+++ b/src/cameras/capture/opencv_camera/frame_grabber.py
@@ -6,8 +6,9 @@ from pathlib import Path
from uuid import uuid4
from src.cameras.capture.frame_payload import FramePayload
+from src.cameras.persistence.video_writer.save_options import SaveOptions
+from src.cameras.persistence.video_writer.video_writer import VideoWriter
from src.utils.time_str import get_canonical_time_str
-from src.cameras.persistence.video_writer.video_writer import SaveOptions, VideoWriter
from src.config.data_paths import freemocap_data_path
logger = logging.getLogger(__name__)
diff --git a/src/cameras/detection/cam_singleton.py b/src/cameras/detection/cam_singleton.py
index 16bcb53d..30a5c68e 100644
--- a/src/cameras/detection/cam_singleton.py
+++ b/src/cameras/detection/cam_singleton.py
@@ -1,8 +1,9 @@
from src.cameras.detection.cam_detection import DetectPossibleCameras
+from src.cameras.detection.models import FoundCamerasResponse
# No consumer should call this "private" variable
-_available_cameras = None
+_available_cameras: FoundCamerasResponse = None
# If you want cams, you call this function
diff --git a/src/cameras/capture/multicam_manager/__init__.py b/src/cameras/multicam_manager/__init__.py
similarity index 100%
rename from src/cameras/capture/multicam_manager/__init__.py
rename to src/cameras/multicam_manager/__init__.py
diff --git a/src/cameras/capture/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.py
similarity index 100%
rename from src/cameras/capture/multicam_manager/cv_camera_manager.py
rename to src/cameras/multicam_manager/cv_camera_manager.py
diff --git a/src/cameras/persistence/video_writer/save_options.py b/src/cameras/persistence/video_writer/save_options.py
new file mode 100644
index 00000000..a693b93d
--- /dev/null
+++ b/src/cameras/persistence/video_writer/save_options.py
@@ -0,0 +1,16 @@
+from pathlib import Path
+
+from pydantic import BaseModel
+
+
+class SaveOptions(BaseModel):
+ writer_dir: Path
+ filename: str = "movie.mp4"
+ fps: float
+ fourcc: str = "MP4V"
+ frame_width: int
+ frame_height: int
+
+ @property
+ def full_path(self):
+ return Path().joinpath(self.writer_dir, self.filename)
diff --git a/src/cameras/persistence/video_writer/video_writer.py b/src/cameras/persistence/video_writer/video_writer.py
index a51cda08..66b3abc7 100644
--- a/src/cameras/persistence/video_writer/video_writer.py
+++ b/src/cameras/persistence/video_writer/video_writer.py
@@ -1,33 +1,16 @@
import logging
import os
import traceback
-from pathlib import Path
-from typing import List, Optional
+from typing import List
import cv2
-from pydantic import BaseModel
from src.cameras.capture.frame_payload import FramePayload
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
-from src.config.data_paths import create_path
+from src.cameras.persistence.video_writer.save_options import SaveOptions
logger = logging.getLogger(__name__)
-class SaveOptions(BaseModel):
- writer_dir: Path
- filename: str = "movie.mp4"
- fps: float
- fourcc: str = "MP4V"
- frame_width: int
- frame_height: int
- cv_cam: Optional[OpenCVCamera]
-
- @property
- def full_path(self):
- return Path().joinpath(self.writer_dir, self.filename)
-
-
class VideoWriter:
def __init__(self):
self._frames: List[FramePayload] = []
@@ -39,20 +22,6 @@ class VideoWriter:
def write(self, frame_payload: FramePayload):
self._frames.append(frame_payload)
- def save_by_cam(self, cv_cam: OpenCVCamera, fps: float):
- options = SaveOptions(
- writer_dir=create_path(
- cv_cam.session_writer_base_path,
- "board_detection",
- f"webcam_{cv_cam.webcam_id_as_str}",
- ),
- fps=fps,
- frame_width=cv_cam.get_frame_width(),
- frame_height=cv_cam.get_frame_height(),
- )
-
- self.save(options)
-
def save(self, options: SaveOptions):
if not os.path.exists(options.writer_dir):
os.makedirs(options.writer_dir.resolve())
@@ -65,6 +34,7 @@ class VideoWriter:
logger.debug("Failed during save in video writer")
traceback.print_exc()
finally:
+ logger.info(f"Saved video to path: {options.full_path.resolve()}")
cv2_writer.release()
def _create_cv2_video_writer(self, options: SaveOptions):
diff --git a/src/core_processor/board_detection/board_detection.py b/src/core_processor/board_detection/board_detection.py
index 5222a648..0ba377c5 100644
--- a/src/core_processor/board_detection/board_detection.py
+++ b/src/core_processor/board_detection/board_detection.py
@@ -6,8 +6,8 @@ from pathlib import Path
import cv2
import numpy as np
-from src.cameras.capture.multicam_manager import CVCameraManager
from src.cameras.capture.frame_payload import FramePayload
+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManager
from src.cameras.persistence.video_writer.video_writer import SaveOptions
from src.core_processor.board_detection.base_pose_estimation import detect_charuco_board
from src.core_processor.board_detection.charuco_image_annotator import (
diff --git a/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py b/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py
index b4a12eca..ca63c002 100644
--- a/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py
+++ b/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py
@@ -8,8 +8,8 @@ import cv2
import mediapipe as mp
import numpy as np
-from src.cameras.capture.multicam_manager import CVCameraManager
from src.cameras.capture.frame_payload import FramePayload
+from src.cameras.multicam_manager.cv_camera_manager import CVCameraManager
from src.cameras.persistence.video_writer.video_writer import SaveOptions
from src.config.data_paths import create_home_data_directory
from src.core_processor.fps.fps_counter import FPSCamCounter
@@ -125,7 +125,6 @@ class MediapipeSkeletonDetection:
if not frame_payload.success:
return
if frame_payload.image is None:
- logger.error("Frame is empty")
return
processed_image = self.detect_mediapipe_skeleton(holistic, frame_payload.image)