Skip to content

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

TypeScript

making camera preview routes

Jon7678597c2371
diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.py
index 33fa89f3..3d9f8da9 100644
--- a/src/api/routes/camera/camera_route.py
+++ b/src/api/routes/camera/camera_route.py
@@ -1,15 +1,59 @@
+import logging
+import traceback
+
+import cv2
from fastapi import APIRouter
+from pydantic import BaseModel
from src.api.services.user_config import UserConfigService, WebcamConfigModel
+from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
from src.cameras.detection.cam_singleton import get_or_create_cams
+from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
camera_router = APIRouter()
+logger = logging.getLogger(__name__)
+
+
+class CameraPreviewModel(BaseModel):
+ session_id: str
@camera_router.post("/camera/config")
async def config_cam(webcam_config_model: WebcamConfigModel):
s = UserConfigService()
- return s.save_webcam_config_to_disk(webcam_config_model)
+ return s.save_webcam_config_to_disk(webcam_config_model, 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:
+ should_continue = True
+ this_camera = connected_camera_and_writer.cv_camera
+ while should_continue:
+ if not this_camera.new_frame_ready:
+ continue
+ cv2.imshow('(ESC to close) PREVIEWING camera_' + webcam_id, this_camera.latest_frame.image)
+ # exit loop when user presses ESC key
+ exit_key = cv2.waitKey(1)
+ if exit_key == 27:
+ logger.info("ESC has been pressed.")
+ should_continue = False
+
+
+@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:
+ should_continue = True
+ while should_continue:
+ for this_webcam_id, this_open_cv_camera in connected_cameras_dict.items():
+ if not this_open_cv_camera.new_frame_ready:
+ continue
+ cv2.imshow('(ESC to close) PREVIEWING camera_' + this_webcam_id, this_open_cv_camera.latest_frame.image)
+ # exit loop when user presses ESC key
+ exit_key = cv2.waitKey(1)
+ if exit_key == 27:
+ logger.info("ESC has been pressed.")
+ should_continue = False
@camera_router.get("/camera/detect")
@@ -20,3 +64,4 @@ async def get_cameras():
@camera_router.get("/camera/redetect")
async def redetect_cameras():
return get_or_create_cams(always_create=True)
+
diff --git a/src/api/routes/session/session_router.py b/src/api/routes/session/session_router.py
index dd08e1cf..e21864c8 100644
--- a/src/api/routes/session/session_router.py
+++ b/src/api/routes/session/session_router.py
@@ -4,14 +4,12 @@ from pathlib import Path
from fastapi import APIRouter
from pydantic import BaseModel
-from src.config.home_dir import os_independent_home_dir, create_session_id
+from src.config.home_dir import os_independent_home_dir, create_session_id, get_session_path
logger = logging.getLogger(__name__)
session_router = APIRouter()
-BASE_FOLDER_NAME = "freemocap_data"
-
class SessionCreateModel(BaseModel):
user_session_str: str
@@ -25,8 +23,7 @@ class SessionResponse(BaseModel):
@session_router.post("/session/create")
async def create_session(session_create_model: SessionCreateModel):
session_id = create_session_id(session_create_model.user_session_str)
- base_save_path = Path(os_independent_home_dir(), BASE_FOLDER_NAME)
- session_path = base_save_path / session_id
+ session_path = Path(get_session_path(session_id))
logger.info(f'Creating session folder at: {str(session_path)}')
session_path.mkdir(parents=True, exist_ok=False)
return SessionResponse(session_id=session_id,
diff --git a/src/api/services/user_config.py b/src/api/services/user_config.py
index c9e3d42b..7325c59a 100644
--- a/src/api/services/user_config.py
+++ b/src/api/services/user_config.py
@@ -3,21 +3,36 @@ from pathlib import Path
from pydantic import BaseModel
+from src.config.home_dir import get_session_path
+
class WebcamConfigModel(BaseModel):
webcam_id: str = '0'
exposure: int = -6
resolution_width: int = 800
resolution_height: int = 600
- session_path: str
+
+
+def get_camera_name(camera_id: str):
+ return "camera_" + camera_id
class UserConfigService:
"""take things like WebcamConfigModel and save it to a text file or whatever"""
- def save_webcam_config_to_disk(self, webcam_config_model: WebcamConfigModel):
- webcam_config_json = webcam_config_model.dict(exclude={'session_path'})
- webcam_config_json_path = Path(webcam_config_model.session_path) / 'webcam_config.json'
+ def save_webcam_config_to_disk(self, webcam_config_model: WebcamConfigModel, session_id:str):
+ webcam_config_json = webcam_config_model.dict()
+ camera_name = get_camera_name(webcam_config_model.webcam_id)
+ json_file_name = camera_name + '_config.json'
+ webcam_config_json_path = Path(webcam_config_model.session_path) / json_file_name
with open(webcam_config_json_path, 'w') as outfile:
outfile.write(str(webcam_config_json))
return webcam_config_json
+
+ def webcam_config_by_id(self, webcam_id: str, session_id: str)->WebcamConfigModel:
+ session_path = get_session_path(session_id)
+ camera_name = get_camera_name(webcam_id)
+ json_file_name = camera_name + '_config.json'
+ webcam_config_json_path = Path(session_path) / json_file_name
+ webcam_config_model = WebcamConfigModel.parse_file(webcam_config_json_path)
+ return webcam_config_model
diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.py
index a0efce0a..08abe678 100644
--- a/src/cameras/multicam_manager/cv_camera_manager.py
+++ b/src/cameras/multicam_manager/cv_camera_manager.py
@@ -10,6 +10,7 @@ from src.api.services.user_config import UserConfigService
from src.cameras.detection.cam_singleton import get_or_create_cams
from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
+from src.config.webcam_config import WebcamConfig
logger = logging.getLogger(__name__)
@@ -25,7 +26,7 @@ class CamAndWriterResponse(BaseModel):
class OpenCVCameraManager:
- def __init__(self, session_id=str):
+ def __init__(self, session_id: str):
self._session_id = session_id
self._config_service = UserConfigService()
self._detected_cams_data = get_or_create_cams()
@@ -86,7 +87,11 @@ class OpenCVCameraManager:
raw_camera_objects = self._detected_cams_data.cameras_found_list
open_cv_cameras: List[OpenCVCamera] = []
for this_raw_cam in raw_camera_objects:
- single_camera_config = self._config_service.webcam_config_by_id(this_raw_cam.webcam_id)
+ webcam_config_model = self._config_service.webcam_config_by_id(this_raw_cam.webcam_id, self._session_id)
+ single_camera_config = WebcamConfig(webcam_id=webcam_config_model.webcam_id,
+ exposure=webcam_config_model.exposure,
+ resolution_width=webcam_config_model.resolution_width,
+ resolution_height=webcam_config_model.resolution_height, )
this_opencv_camera = OpenCVCamera(config=single_camera_config)
open_cv_cameras.append(this_opencv_camera)
return open_cv_cameras
diff --git a/src/config/home_dir.py b/src/config/home_dir.py
index fc0213f5..31999f63 100644
--- a/src/config/home_dir.py
+++ b/src/config/home_dir.py
@@ -1,6 +1,8 @@
import time
from pathlib import Path
+BASE_FOLDER_NAME = "freemocap_data"
+
def os_independent_home_dir():
return str(Path.home())
@@ -12,3 +14,9 @@ def create_session_id(string_tag: str = None):
return session_id
else:
return session_id + '_' + string_tag
+
+
+def get_session_path(session_id: str):
+ base_save_path = Path(os_independent_home_dir(), BASE_FOLDER_NAME)
+ session_path = base_save_path / session_id
+ return str(session_path)