Skip to content

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

TypeScript

fps changes

Jon66775c8b7690
diff --git a/src/cameras/cam_factory.py b/src/cameras/cam_factory.py
index 2c35a9ec..04c66fad 100644
--- a/src/cameras/cam_factory.py
+++ b/src/cameras/cam_factory.py
@@ -40,8 +40,7 @@ class CVCameraManager:
for webcam in raw_webcam_obj:
single_config = self._config_service.webcam_config_by_id(webcam.webcam_id)
# TODO: OBS Studio issue causes us to ignore a specific camera ID for Jon's computer.
- if int(webcam.webcam_id) < 3:
- cv_cams.append(OpenCVCamera(config=single_config))
+ cv_cams.append(OpenCVCamera(config=single_config))
return cv_cams
diff --git a/src/cameras/frame_grabber.py b/src/cameras/frame_grabber.py
index c40353f0..a30fb20f 100644
--- a/src/cameras/frame_grabber.py
+++ b/src/cameras/frame_grabber.py
@@ -30,7 +30,7 @@ class FrameThread(threading.Thread):
return 0
if self._num_frames_processed <= 0:
return 0
- return int(math.ceil(self._num_frames_processed / self._elapsed))
+ return self._num_frames_processed / self._elapsed
@property
def latest_frame(self):
diff --git a/src/cameras/opencv_camera.py b/src/cameras/opencv_camera.py
index 825781f5..661d9190 100644
--- a/src/cameras/opencv_camera.py
+++ b/src/cameras/opencv_camera.py
@@ -48,6 +48,10 @@ class OpenCVCamera:
return self._running_thread.is_capturing_frames
+ @property
+ def current_fps_short(self) -> str:
+ return "{:.2f}".format(self._running_thread.current_fps)
+
def connect(self):
if platform.system() == "Windows":
cap_backend = cv2.CAP_DSHOW
diff --git a/src/core_processor/board_detection/board_detection.py b/src/core_processor/board_detection/board_detection.py
index a4ef7e3c..881e7f66 100644
--- a/src/core_processor/board_detection/board_detection.py
+++ b/src/core_processor/board_detection/board_detection.py
@@ -79,7 +79,7 @@ class BoardDetection:
frame, cv_cam.webcam_id_as_str, charuco_corners, charuco_ids
)
cv2.polylines(frame, np.int32([charuco_corners]), True, (0, 100, 255), 2)
- write_fps_to_image(frame, cv_cam.current_fps)
+ write_fps_to_image(frame, cv_cam.current_fps_short)
return frame
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 f77a817f..2f34f0ac 100644
--- a/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py
+++ b/src/core_processor/mediapipe_skeleton_detection/mediapipe_skeleton_detection.py
@@ -72,7 +72,7 @@ class MediapipeSkeletonDetection:
return
image = self.detect_mediapipe_skeleton(holistic, frame)
- write_fps_to_image(image, cv_cam.current_fps)
+ write_fps_to_image(image, cv_cam.current_fps_short)
return image
def detect_mediapipe_skeleton(self, holistic, image):