Free Motion Capture for Everyone πβ¨
TypeScript
ITS WORKING
Endurance Idehen89a288aedb1e
diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.pyindex 5844bf18..2faab2aa 100644--- a/src/api/routes/camera/cam_data_ws.py+++ b/src/api/routes/camera/cam_data_ws.py@@ -1,12 +1,9 @@import logging-import tracebackimport cv2from fastapi import APIRouter, WebSocketfrom src.api.services.board_detect_service import BoardDetectService-from src.api.services.mediapipe_detect_service import MediapipeSkeletonDetectionService-from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManagerlogger = logging.getLogger(__name__)@@ -16,7 +13,7 @@ cam_ws_router = APIRouter()@cam_ws_router.get("/begin_board_detection")async def begin_board_detection():service = BoardDetectService()- await service.run()+ # await service.run()@cam_ws_router.websocket("/ws/charuco_board_detection/{webcam_id}")@@ -28,14 +25,14 @@ async def board_detection_as_ws(web_socket: WebSocket, webcam_id: str):if success:await web_socket.send_bytes(frame.tobytes())- try:- await BoardDetectService().run_detection_on_cam_id(- webcam_id=webcam_id, cb=websocket_send- )- except:- logger.error("Websocket ended")- traceback.print_exc()- return+ # try:+ # await BoardDetectService().run_detection_on_cam_id(+ # webcam_id=webcam_id, cb=websocket_send+ # )+ # except:+ # logger.error("Websocket ended")+ # traceback.print_exc()+ # return@cam_ws_router.websocket("/ws/skeleton_detection/{webcam_id}")@@ -49,20 +46,20 @@ async def skeleton_detection_as_ws(if success:await web_socket.send_bytes(frame.tobytes())- try:- await MediapipeSkeletonDetectionService(OpenCVCameraManager()).run_as_loop(- webcam_id=webcam_id, cb=websocket_send, model_complexity=model_complexity- )- except:- logger.error("Websocket ended")- traceback.print_exc()- return---@cam_ws_router.get("/begin_mediapipe_skeleton_detection")-async def begin_mediapipe_skeleton_detection(model_complexity: int):- """- model_complexity can be 1 (faster, less accurate) or 2 (slower, more accurate)- """- service = MediapipeSkeletonDetectionService(OpenCVCameraManager())- service.run(model_complexity)+ # try:+ # await MediapipeSkeletonDetectionService(OpenCVCameraManager()).run_as_loop(+ # webcam_id=webcam_id, cb=websocket_send, model_complexity=model_complexity+ # )+ # except:+ # logger.error("Websocket ended")+ # traceback.print_exc()+ # return+++# @cam_ws_router.get("/begin_mediapipe_skeleton_detection")+# async def begin_mediapipe_skeleton_detection(model_complexity: int):+# """+# model_complexity can be 1 (faster, less accurate) or 2 (slower, more accurate)+# """+# service = MediapipeSkeletonDetectionService(OpenCVCameraManager())+# service.run(model_complexity)diff --git a/src/api/services/board_detect_service.py b/src/api/services/board_detect_service.pyindex 4f4aca3e..5bfdcf43 100644--- a/src/api/services/board_detect_service.py+++ b/src/api/services/board_detect_service.py@@ -1,8 +1,5 @@from typing import NamedTuple-from src.cameras.multicam_manager import CVCameraManager-from src.core_processor.camera_calibration.charuco_board_detection.charuco_board_detector import CharucoBoardDetector-class ImageResponse(NamedTuple):image: bytes@@ -10,11 +7,4 @@ class ImageResponse(NamedTuple):class BoardDetectService:- def __init__(self, cam_manager: CVCameraManager = CVCameraManager()):- self._cam_manager = cam_manager-- async def run(self):- return CharucoBoardDetector(self._cam_manager).process()-- async def run_detection_on_cam_id(self, webcam_id: str, cb=None):- await CharucoBoardDetector(self._cam_manager).process_by_cam_id(webcam_id, cb)+ pass\ No newline at end of filediff --git a/src/api/services/mediapipe_detect_service.py b/src/api/services/mediapipe_detect_service.pyindex e03c85a6..085e3f2b 100644--- a/src/api/services/mediapipe_detect_service.py+++ b/src/api/services/mediapipe_detect_service.py@@ -1,19 +1,5 @@from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager-from src.core_processor.mediapipe_skeleton_detection.mediapipe_skeleton_detection import (- MediapipeSkeletonDetection,-)class MediapipeSkeletonDetectionService:- def __init__(self, cam_manager: OpenCVCameraManager):- self._cam_manager = cam_manager-- def run(self, model_complexity: int):- MediapipeSkeletonDetection(self._cam_manager).process(- model_complexity=model_complexity- )-- async def run_as_loop(self, webcam_id, cb, model_complexity: int):- await MediapipeSkeletonDetection(self._cam_manager).process_as_frame_loop(- webcam_id, model_complexity=model_complexity, cb=cb- )+ pass\ No newline at end of file