Skip to content

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

TypeScript

ready to websocket

Endurance Idehen33bf4cb234df
diff --git a/freemocap-ui/src/services/frame-capture.tsx b/freemocap-ui/src/services/frame-capture.tsx
index 175b0f4f..a14d8947 100644
--- a/freemocap-ui/src/services/frame-capture.tsx
+++ b/freemocap-ui/src/services/frame-capture.tsx
@@ -1,7 +1,7 @@
export type OnMessageHandler = (ev: MessageEvent<Blob>, data_url: string) => Promise<void>;
export enum CaptureType {
- BoardDetection = "board_detection", SkeletonDetection = "skeleton_detection",
+ BoardDetection = "board_detection", SkeletonDetection = "skeleton_detection", Preview = "preview"
}
export class FrameCapture {
@@ -9,7 +9,10 @@ export class FrameCapture {
private readonly _host: string;
private readonly _base_host: string = "ws://localhost:8080/ws";
- constructor(private readonly _webcamId: string, private readonly _captureType: CaptureType = CaptureType.BoardDetection,) {
+ constructor(
+ private readonly _webcamId: string,
+ private readonly _captureType: CaptureType = CaptureType.BoardDetection,
+ ) {
this._host = `${this._base_host}/${this._captureType}/${this._webcamId}`
}
diff --git a/freemocap-ui/src/views/prod/SetupAndPreview.tsx b/freemocap-ui/src/views/prod/SetupAndPreview.tsx
index 611c42aa..1ad45119 100644
--- a/freemocap-ui/src/views/prod/SetupAndPreview.tsx
+++ b/freemocap-ui/src/views/prod/SetupAndPreview.tsx
@@ -14,7 +14,7 @@ import React from "react";
// for freemocap (api) to save (prolly to disk).
export const SetupAndPreview = () => {
- const [frameCapture, data] = useFrameCapture("0", CaptureType.BoardDetection);
+ const [frameCapture, data] = useFrameCapture("0", CaptureType.Preview);
if (!data) {
return null;
}
diff --git a/requirements.txt b/requirements.txt
index 3772c764..b0c81c8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,6 +27,7 @@ aiomultiprocess==0.9.0
# faster-fifo==1.3.0
#viztracer==0.14.5
pre-commit==2.17.0
+pandas==1.4.2
# Requirements for core-processor
pyqtgraph==0.12.4
pyqt5==5.15.6
diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.py
index 2faab2aa..69991cd0 100644
--- a/src/api/routes/camera/cam_data_ws.py
+++ b/src/api/routes/camera/cam_data_ws.py
@@ -1,65 +1,44 @@
import logging
+import traceback
import cv2
from fastapi import APIRouter, WebSocket
-from src.api.services.board_detect_service import BoardDetectService
+from src.cameras.capture.dataclasses.frame_payload import FramePayload
+from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
+from src.config.webcam_config import WebcamConfig
logger = logging.getLogger(__name__)
cam_ws_router = APIRouter()
-@cam_ws_router.get("/begin_board_detection")
-async def begin_board_detection():
- service = BoardDetectService()
- # await service.run()
+async def websocket_send(web_socket: WebSocket, input_payload: FramePayload):
+ if not input_payload.success:
+ return
+ success, frame = cv2.imencode(".png", input_payload.image)
+ if not success:
+ return
+ await web_socket.send_bytes(frame.tobytes())
-@cam_ws_router.websocket("/ws/charuco_board_detection/{webcam_id}")
-async def board_detection_as_ws(web_socket: WebSocket, webcam_id: str):
+@cam_ws_router.websocket("/ws/preview/{webcam_id}")
+async def preview_webcam(web_socket: WebSocket, webcam_id: str):
await web_socket.accept()
+ try:
+ cv_cam = OpenCVCamera(
+ WebcamConfig(webcam_id=webcam_id),
+ )
+ cv_cam.connect()
+ cv_cam.start_frame_capture_thread()
+
+ # TODO: Allow connections to drop, allow signals to get through so we can cancel
+ while cv_cam.is_capturing_frames:
+ if cv_cam.new_frame_ready:
+ await websocket_send(web_socket, cv_cam.latest_frame)
+ except:
+ logger.error("Websocket ended")
+ traceback.print_exc()
+ return
- async def websocket_send(input_image):
- success, frame = cv2.imencode(".png", input_image)
- 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
-
-
-@cam_ws_router.websocket("/ws/skeleton_detection/{webcam_id}")
-async def skeleton_detection_as_ws(
- web_socket: WebSocket, webcam_id: str, model_complexity: int
-):
- await web_socket.accept()
-
- async def websocket_send(input_image):
- success, frame = cv2.imencode(".png", input_image)
- 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)
diff --git a/src/config/webcam_config.py b/src/config/webcam_config.py
index 76a823d9..8402f76e 100644
--- a/src/config/webcam_config.py
+++ b/src/config/webcam_config.py
@@ -12,7 +12,7 @@ class WebcamConfig(BaseModel):
exposure: int = -6
resolution_width: int = 800
resolution_height: int = 600
- save_video: bool = True
+ save_video: bool = False
# fourcc: str = "MP4V"
fourcc: str = "MJPG"
base_save_video_dir = _get_home_dir()