Skip to content

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

TypeScript

Jon/make multiprocessing optional (#470)

jonmatthis6af56a8a705a
diff --git a/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py
index 02b0eccf..e3ddeb68 100644
--- a/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py
+++ b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py
@@ -1,7 +1,7 @@
import logging
import multiprocessing
from pathlib import Path
-from typing import List, Optional, Union, Callable
+from typing import List, Optional, Union, Callable, Tuple
import cv2
import mediapipe as mp
@@ -36,9 +36,9 @@ face_drawing_spec = mp_drawing.DrawingSpec(thickness=1, circle_radius=1)
class MediaPipeSkeletonDetector:
def __init__(
- self,
- parameter_model: Optional[MediapipeParametersModel] = None,
- use_tqdm: bool = True,
+ self,
+ parameter_model: Optional[MediapipeParametersModel] = None,
+ use_tqdm: bool = True,
):
if parameter_model is None:
parameter_model = MediapipeParametersModel()
@@ -62,20 +62,57 @@ class MediaPipeSkeletonDetector:
self.number_of_face_tracked_points = mp.solutions.face_mesh.FACEMESH_NUM_LANDMARKS_WITH_IRISES
self.number_of_tracked_points_total = (
- self.number_of_body_tracked_points
- + self.number_of_left_hand_tracked_points
- + self.number_of_right_hand_tracked_points
- + self.number_of_face_tracked_points
+ self.number_of_body_tracked_points
+ + self.number_of_left_hand_tracked_points
+ + self.number_of_right_hand_tracked_points
+ + self.number_of_face_tracked_points
)
+ def process_folder_full_of_videos(
+ self,
+ path_to_folder_of_videos_to_process: Union[Path, str],
+ output_data_folder_path: Union[str, Path],
+ kill_event: multiprocessing.Event=None,
+ use_multiprocessing: bool = True,
+ ) -> Union[np.ndarray, None]:
+
+ path_to_folder_of_videos_to_process = Path(path_to_folder_of_videos_to_process)
+ logger.info(f"processing videos from: {path_to_folder_of_videos_to_process}")
+
+ tasks = self._create_video_processing_tasks(output_data_folder_path=output_data_folder_path,
+ path_to_folder_of_videos_to_process=path_to_folder_of_videos_to_process,
+ )
+
+ if use_multiprocessing:
+ with multiprocessing.Pool() as pool:
+ mediapipe2d_single_camera_npy_arrays_list = pool.starmap(self.process_single_video, tasks)
+ else:
+ mediapipe2d_single_camera_npy_arrays_list = []
+ for task in tasks:
+ if kill_event is not None:
+ if kill_event.is_set():
+ break
+ mediapipe2d_single_camera_npy_arrays_list.append(self.process_single_video(*task))
+
+
+ body_world_numCams_numFrames_numTrackedPts_XYZ, data2d_numCams_numFrames_numTrackedPts_XY = self._build_output_numpy_array(
+ mediapipe2d_single_camera_npy_arrays_list)
+
+ self._save_mediapipe2d_data_to_npy(
+ data2d_numCams_numFrames_numTrackedPts_XY=data2d_numCams_numFrames_numTrackedPts_XY,
+ body_world_numCams_numFrames_numTrackedPts_XYZ=body_world_numCams_numFrames_numTrackedPts_XYZ,
+ output_data_folder_path=Path(output_data_folder_path),
+ )
+ return data2d_numCams_numFrames_numTrackedPts_XY
+
@staticmethod
def process_single_video(
- synchronized_video_file_path: Path,
- output_data_folder_path: Path,
- mediapipe_parameters_model: MediapipeParametersModel,
- annotate_image: Callable,
- list_of_mediapipe_results_to_npy_arrays: Callable,
- use_tqdm: bool = True,
+ synchronized_video_file_path: Path,
+ output_data_folder_path: Path,
+ mediapipe_parameters_model: MediapipeParametersModel,
+ annotate_image: Callable,
+ list_of_mediapipe_results_to_npy_arrays: Callable,
+ use_tqdm: bool = True,
):
logger.info(f"Running `mediapipe` skeleton detection on video: {str(synchronized_video_file_path)}")
@@ -128,7 +165,7 @@ class MediaPipeSkeletonDetector:
confidence_threshold = 0.5
threshold_mask = (
- mediapipe_single_frame_npy_data.body_frameNumber_trackedPointNumber_confidence < confidence_threshold
+ mediapipe_single_frame_npy_data.body_frameNumber_trackedPointNumber_confidence < confidence_threshold
)
mediapipe_single_frame_npy_data.body_frameNumber_trackedPointNumber_XYZ[threshold_mask, :] = np.nan
@@ -138,6 +175,7 @@ class MediaPipeSkeletonDetector:
success, image = video_capture_object.read()
+
try:
annotated_video_path = output_data_folder_path.parent.parent / ANNOTATED_VIDEOS_FOLDER_NAME
annotated_video_path.mkdir(exist_ok=True, parents=True)
@@ -166,58 +204,27 @@ class MediaPipeSkeletonDetector:
# return the numpy array for this video
return camera_mediapipe_2d_single_camera_npy_arrays
- def process_folder_full_of_videos(
- self,
- path_to_folder_of_videos_to_process: Union[Path, str],
- output_data_folder_path: Union[str, Path],
- save_annotated_videos: bool = True,
- kill_event: multiprocessing.Event = None,
- ) -> Union[np.ndarray, None]:
- path_to_folder_of_videos_to_process = Path(path_to_folder_of_videos_to_process)
- logger.info(f"processing videos from: {path_to_folder_of_videos_to_process}")
-
- with multiprocessing.Pool() as pool:
- video_paths = get_video_paths(path_to_folder_of_videos_to_process)
- tasks = [
- (
- video_path,
- output_data_folder_path,
- self._parameter_model,
- self._annotate_image,
- self._list_of_mediapipe_results_to_npy_arrays,
- self._use_tqdm,
- )
- for video_path in video_paths
- ]
- mediapipe2d_single_camera_npy_arrays_list = pool.starmap(self.process_single_video, tasks)
-
+ def _build_output_numpy_array(self, mediapipe2d_single_camera_npy_arrays_list):
all_cameras_data2d_list = [
m2d.all_data2d_nFrames_nTrackedPts_XY for m2d in mediapipe2d_single_camera_npy_arrays_list
]
-
all_cameras_pose_world_data_list = [
m2d.body_world_frameNumber_trackedPointNumber_XYZ for m2d in mediapipe2d_single_camera_npy_arrays_list
]
-
all_cameras_right_hand_world_data_list = [
m2d.rightHand_frameNumber_trackedPointNumber_XYZ for m2d in mediapipe2d_single_camera_npy_arrays_list
]
-
all_cameras_left_hand_world_data_list = [
m2d.leftHand_frameNumber_trackedPointNumber_XYZ for m2d in mediapipe2d_single_camera_npy_arrays_list
]
-
all_cameras_face_world_data_list = [
m2d.face_frameNumber_trackedPointNumber_XYZ for m2d in mediapipe2d_single_camera_npy_arrays_list
]
-
number_of_cameras = len(all_cameras_data2d_list)
number_of_frames = all_cameras_data2d_list[0].shape[0]
number_of_tracked_points = all_cameras_data2d_list[0].shape[1]
number_of_spatial_dimensions = all_cameras_data2d_list[0].shape[2]
-
- number_of_body_points = all_cameras_pose_world_data_list[0].shape[1] # noqa
-
+ number_of_body_points = all_cameras_pose_world_data_list[0].shape[1] # noqa
data2d_numCams_numFrames_numTrackedPts_XY = np.empty(
(
number_of_cameras,
@@ -226,7 +233,6 @@ class MediaPipeSkeletonDetector:
number_of_spatial_dimensions,
)
)
-
body_world_numCams_numFrames_numTrackedPts_XYZ = np.empty(
(
number_of_cameras,
@@ -235,7 +241,6 @@ class MediaPipeSkeletonDetector:
number_of_spatial_dimensions,
)
)
-
for cam_num in range(number_of_cameras):
data2d_numCams_numFrames_numTrackedPts_XY[cam_num, :, :, :] = all_cameras_data2d_list[cam_num]
@@ -252,19 +257,32 @@ class MediaPipeSkeletonDetector:
f"The shape of body_world_numCams_numFrames_numTrackedPts_XYZ is "
f"{body_world_numCams_numFrames_numTrackedPts_XYZ.shape}"
)
+ return body_world_numCams_numFrames_numTrackedPts_XYZ, data2d_numCams_numFrames_numTrackedPts_XY
+
+ def _create_video_processing_tasks(self,
+ output_data_folder_path: Union[str, Path],
+ path_to_folder_of_videos_to_process: Union[Path, str],
+ ) -> List[Tuple]:
+ video_paths = get_video_paths(path_to_folder_of_videos_to_process)
+ tasks = [
+ (
+ video_path,
+ output_data_folder_path,
+ self._parameter_model,
+ self._annotate_image,
+ self._list_of_mediapipe_results_to_npy_arrays,
+ self._use_tqdm,
+ )
- self._save_mediapipe2d_data_to_npy(
- data2d_numCams_numFrames_numTrackedPts_XY=data2d_numCams_numFrames_numTrackedPts_XY,
- body_world_numCams_numFrames_numTrackedPts_XYZ=body_world_numCams_numFrames_numTrackedPts_XYZ,
- output_data_folder_path=Path(output_data_folder_path),
- )
- return data2d_numCams_numFrames_numTrackedPts_XY
+ for video_path in video_paths
+ ]
+ return tasks
def _save_mediapipe2d_data_to_npy(
- self,
- data2d_numCams_numFrames_numTrackedPts_XY: np.ndarray,
- body_world_numCams_numFrames_numTrackedPts_XYZ: np.ndarray,
- output_data_folder_path: Union[str, Path],
+ self,
+ data2d_numCams_numFrames_numTrackedPts_XY: np.ndarray,
+ body_world_numCams_numFrames_numTrackedPts_XYZ: np.ndarray,
+ output_data_folder_path: Union[str, Path],
):
mediapipe_2dData_save_path = Path(output_data_folder_path) / MEDIAPIPE_2D_NPY_FILE_NAME
mediapipe_2dData_save_path.parent.mkdir(exist_ok=True, parents=True)
@@ -316,10 +334,10 @@ class MediaPipeSkeletonDetector:
return image
def _list_of_mediapipe_results_to_npy_arrays(
- self,
- mediapipe_results_list: List,
- image_width: Union[int, float],
- image_height: Union[int, float],
+ self,
+ mediapipe_results_list: List,
+ image_width: Union[int, float],
+ image_height: Union[int, float],
) -> Mediapipe2dNumpyArrays:
number_of_frames = len(mediapipe_results_list)
number_of_spatial_dimensions = 3 # this will be 2d XY pixel data, with mediapipe's estimate of Z
@@ -385,14 +403,14 @@ class MediaPipeSkeletonDetector:
if frame_results.pose_landmarks is not None:
for landmark_number, landmark_data in enumerate(frame_results.pose_landmarks.landmark):
body_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 0] = (
- landmark_data.x * image_width
+ landmark_data.x * image_width
)
body_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 1] = (
- landmark_data.y * image_height
+ landmark_data.y * image_height
)
body_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 2] = (
- landmark_data.z
- * image_width
+ landmark_data.z
+ * image_width
# z is on roughly the same scale as x, according to mediapipe docs
)
body_frameNumber_trackedPointNumber_confidence[
@@ -401,52 +419,52 @@ class MediaPipeSkeletonDetector:
for landmark_number, landmark_data in enumerate(frame_results.pose_world_landmarks.landmark):
body_world_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 0] = (
- landmark_data.x * image_width
+ landmark_data.x * image_width
)
body_world_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 1] = (
- landmark_data.y * image_height
+ landmark_data.y * image_height
)
body_world_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 2] = (
- landmark_data.z * image_width
+ landmark_data.z * image_width
)
# get Right Hand data
if frame_results.right_hand_landmarks is not None:
for landmark_number, landmark_data in enumerate(frame_results.right_hand_landmarks.landmark):
rightHand_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 0] = (
- landmark_data.x * image_width
+ landmark_data.x * image_width
)
rightHand_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 1] = (
- landmark_data.y * image_height
+ landmark_data.y * image_height
)
rightHand_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 2] = (
- landmark_data.z * image_width
+ landmark_data.z * image_width
)
# get Left Hand data
if frame_results.left_hand_landmarks is not None:
for landmark_number, landmark_data in enumerate(frame_results.left_hand_landmarks.landmark):
leftHand_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 0] = (
- landmark_data.x * image_width
+ landmark_data.x * image_width
)
leftHand_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 1] = (
- landmark_data.y * image_height
+ landmark_data.y * image_height
)
leftHand_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 2] = (
- landmark_data.z * image_width
+ landmark_data.z * image_width
)
# get Face data
if frame_results.face_landmarks is not None:
for landmark_number, landmark_data in enumerate(frame_results.face_landmarks.landmark):
face_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 0] = (
- landmark_data.x * image_width
+ landmark_data.x * image_width
)
face_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 1] = (
- landmark_data.y * image_height
+ landmark_data.y * image_height
)
face_frameNumber_trackedPointNumber_XYZ[frame_number, landmark_number, 2] = (
- landmark_data.z * image_width
+ landmark_data.z * image_width
)
# check if all tracked points are visible on this frame
diff --git a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
index 43f70471..6b6f9f0f 100644
--- a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
+++ b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
@@ -14,12 +14,12 @@ from freemocap.core_processes.capture_volume_calibration.triangulate_3d_data imp
from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.convert_mediapipe_npy_to_csv import (
convert_mediapipe_npy_to_csv,
)
-from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_detector import (
- MediaPipeSkeletonDetector,
-)
from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.data_models.mediapipe_skeleton_names_and_connections import (
mediapipe_names_and_connections_dict,
)
+from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.mediapipe_skeleton_detector import (
+ MediaPipeSkeletonDetector,
+)
from freemocap.core_processes.post_process_skeleton_data.calculate_center_of_mass import run_center_of_mass_calculations
from freemocap.core_processes.post_process_skeleton_data.estimate_skeleton_segment_lengths import (
estimate_skeleton_segment_lengths,
@@ -34,6 +34,7 @@ from freemocap.core_processes.post_process_skeleton_data.process_single_camera_s
)
from freemocap.data_layer.data_saver.data_saver import DataSaver
from freemocap.data_layer.recording_models.post_processing_parameter_models import PostProcessingParameterModel
+from freemocap.system.logging.configure_logging import log_view_logging_format_string
from freemocap.system.logging.queue_logger import DirectQueueHandler
from freemocap.system.paths_and_filenames.file_and_folder_names import (
RAW_DATA_FOLDER_NAME,
@@ -48,16 +49,15 @@ from freemocap.tests.test_image_tracking_data_shape import (
from freemocap.tests.test_mediapipe_skeleton_data_shape import test_mediapipe_skeleton_data_shape
from freemocap.utilities.geometry.rotate_by_90_degrees_around_x_axis import rotate_by_90_degrees_around_x_axis
from freemocap.utilities.save_dictionary_to_json import save_dictionary_to_json
-from freemocap.system.logging.configure_logging import log_view_logging_format_string
logger = logging.getLogger(__name__)
def process_recording_folder(
- recording_processing_parameter_model: PostProcessingParameterModel,
- kill_event: multiprocessing.Event = None,
- queue: multiprocessing.Queue = None,
- use_tqdm: bool = True,
+ recording_processing_parameter_model: PostProcessingParameterModel,
+ kill_event: multiprocessing.Event=None,
+ queue: multiprocessing.Queue = None,
+ use_tqdm: bool = True,
):
"""
@@ -102,9 +102,10 @@ def process_recording_folder(
mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ = (
mediapipe_skeleton_detector.process_folder_full_of_videos(
- rec.recording_info_model.synchronized_videos_folder_path,
- Path(rec.recording_info_model.output_data_folder_path) / RAW_DATA_FOLDER_NAME,
+ path_to_folder_of_videos_to_process=rec.recording_info_model.synchronized_videos_folder_path,
+ output_data_folder_path=Path(rec.recording_info_model.output_data_folder_path) / RAW_DATA_FOLDER_NAME,
kill_event=kill_event,
+ use_multiprocessing=rec.mediapipe_parameters_model.use_multiprocessing,
)
)
@@ -201,7 +202,7 @@ def process_recording_folder(
array_to_save=segment_COM_frame_imgPoint_XYZ,
skeleton_file_name=SEGMENT_CENTER_OF_MASS_NPY_FILE_NAME,
path_to_folder_where_we_will_save_this_data=Path(path_to_folder_where_we_will_save_this_data)
- / CENTER_OF_MASS_FOLDER_NAME,
+ / CENTER_OF_MASS_FOLDER_NAME,
)
logger.info("Saving total body center of mass data")
@@ -209,7 +210,7 @@ def process_recording_folder(
array_to_save=totalBodyCOM_frame_XYZ,
skeleton_file_name=TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME,
path_to_folder_where_we_will_save_this_data=Path(path_to_folder_where_we_will_save_this_data)
- / CENTER_OF_MASS_FOLDER_NAME,
+ / CENTER_OF_MASS_FOLDER_NAME,
)
try:
@@ -229,7 +230,7 @@ def process_recording_folder(
)
path_to_skeleton_body_csv = (
- Path(rec.recording_info_model.output_data_folder_path) / MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME
+ Path(rec.recording_info_model.output_data_folder_path) / MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME
)
skeleton_dataframe = pd.read_csv(path_to_skeleton_body_csv)
diff --git a/freemocap/core_processes/process_motion_capture_videos/process_recording_headless.py b/freemocap/core_processes/process_motion_capture_videos/process_recording_headless.py
index 44e610bf..5eba5adc 100644
--- a/freemocap/core_processes/process_motion_capture_videos/process_recording_headless.py
+++ b/freemocap/core_processes/process_motion_capture_videos/process_recording_headless.py
@@ -1,4 +1,5 @@
import logging
+import multiprocessing
from pathlib import Path
from typing import Optional, Union
@@ -62,7 +63,8 @@ def process_recording_headless(
)
logger.info("Starting core processing pipeline...")
- process_recording_folder(recording_processing_parameter_model=rec, use_tqdm=use_tqdm)
+ process_recording_folder(recording_processing_parameter_model=rec,
+ use_tqdm=use_tqdm)
logger.info("Generating jupyter notebook...")
generate_jupyter_notebook(path_to_recording=recording_path)
diff --git a/freemocap/data_layer/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py b/freemocap/data_layer/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py
index 26200354..f9f855d9 100644
--- a/freemocap/data_layer/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py
+++ b/freemocap/data_layer/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py
@@ -99,7 +99,7 @@ def main(
##############################
# %% Set start and end frames
- start_frame = 1
+ start_frame = 0
end_frame = number_of_frames
bpy.context.scene.frame_start = start_frame
@@ -425,6 +425,7 @@ def main(
# save .blend file
bpy.ops.object.mode_set(mode="OBJECT")
+
bpy.ops.wm.save_as_mainfile(filepath=str(blender_file_save_path))
print(f"Saved .blend file to: {blender_file_save_path}")
diff --git a/freemocap/data_layer/recording_models/post_processing_parameter_models.py b/freemocap/data_layer/recording_models/post_processing_parameter_models.py
index 49032766..44b69b06 100644
--- a/freemocap/data_layer/recording_models/post_processing_parameter_models.py
+++ b/freemocap/data_layer/recording_models/post_processing_parameter_models.py
@@ -15,6 +15,7 @@ class MediapipeParametersModel(BaseModel):
min_tracking_confidence: float = 0.5
static_image_mode: bool = False
skip_2d_image_tracking: bool = False
+ use_multiprocessing: bool = False
class AniposeTriangulate3DParametersModel(BaseModel):
diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py
index 2a3678c8..4ccceaaa 100644
--- a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py
+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py
@@ -8,6 +8,7 @@ from freemocap.data_layer.recording_models.post_processing_parameter_models impo
ButterworthFilterParametersModel,
)
+
BUTTERWORTH_ORDER = "Order"
BUTTERWORTH_CUTOFF_FREQUENCY = "Cutoff Frequency"
@@ -38,6 +39,8 @@ SKIP_3D_TRIANGULATION_NAME = "Skip 3d triangulation?"
SKIP_BUTTERWORTH_FILTER_NAME = "Skip butterworth filter?"
+USE_MULTIPROCESSING_PARAMETER_NAME = "Use Multiprocessing"
+
def create_mediapipe_parameter_group(
parameter_model: MediapipeParametersModel = None,
@@ -172,6 +175,7 @@ def extract_parameter_model_from_parameter_tree(
min_tracking_confidence=parameter_values_dictionary[MINIUMUM_TRACKING_CONFIDENCE],
static_image_mode=parameter_values_dictionary[STATIC_IMAGE_MODE],
skip_2d_image_tracking=parameter_values_dictionary[SKIP_2D_IMAGE_TRACKING_NAME],
+ use_multiprocessing=parameter_values_dictionary[USE_MULTIPROCESSING_PARAMETER_NAME],
),
anipose_triangulate_3d_parameters_model=AniposeTriangulate3DParametersModel(
confidence_threshold_cutoff=parameter_values_dictionary[ANIPOSE_CONFIDENCE_CUTOFF],
diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py
index b4cb43cc..9cf4f7bb 100644
--- a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py
+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py
@@ -7,8 +7,11 @@ from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt
from PyQt6.QtGui import QFont
from PyQt6.QtWidgets import QPushButton, QVBoxLayout, QWidget, QGroupBox
from pyqtgraph.parametertree import Parameter, ParameterTree
-from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState
+from freemocap.data_layer.recording_models.post_processing_parameter_models import (
+ PostProcessingParameterModel,
+)
+from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState
from freemocap.gui.qt.widgets.control_panel.calibration_control_panel import CalibrationControlPanel
from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.parameter_groups.create_parameter_groups import (
create_mediapipe_parameter_group,
@@ -18,13 +21,11 @@ from freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.parameter_g
SKIP_2D_IMAGE_TRACKING_NAME,
SKIP_3D_TRIANGULATION_NAME,
SKIP_BUTTERWORTH_FILTER_NAME,
+ USE_MULTIPROCESSING_PARAMETER_NAME,
)
from freemocap.gui.qt.workers.process_motion_capture_data_thread_worker import (
ProcessMotionCaptureDataThreadWorker,
)
-from freemocap.data_layer.recording_models.post_processing_parameter_models import (
- PostProcessingParameterModel,
-)
logger = logging.getLogger(__name__)
@@ -121,6 +122,7 @@ class ProcessMotionCaptureDataPanel(QWidget):
type="group",
children=[
self._create_new_skip_this_step_parameter(skip_step_name=SKIP_2D_IMAGE_TRACKING_NAME),
+ self._create_use_multiprocessing_parameter(),
create_mediapipe_parameter_group(session_processing_parameter_model.mediapipe_parameters_model),
],
tip="Methods for tracking 2d points in images (e.g. mediapipe, deeplabcut(TODO), openpose(TODO), etc ...)",
@@ -186,6 +188,15 @@ class ProcessMotionCaptureDataPanel(QWidget):
return parameter
+ def _create_use_multiprocessing_parameter(self):
+ parameter = Parameter.create(
+ name=USE_MULTIPROCESSING_PARAMETER_NAME,
+ type="bool",
+ value=True,
+ tip="If your computer has issues processing larger videos, you can try disabling multiprocessing to process each video serially.",
+ )
+ return parameter
+
def disable_this_parameter_group(self, parameter):
skip_this_step_bool = parameter.value()
parameter_group = parameter.parent()