sports2d 0.8.22__tar.gz → 0.8.24__tar.gz

{sports2d-0.8.22 → sports2d-0.8.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.22
+Version: 0.8.24
 Summary: Compute 2D human pose and angles from a video or a webcam.
 Author-email: David Pagnon <contact@david-pagnon.com>
 Maintainer-email: David Pagnon <contact@david-pagnon.com>
@@ -22,22 +22,7 @@ Classifier: Topic :: Multimedia :: Graphics :: 3D Modeling
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: toml
-Requires-Dist: numpy>=1.19
-Requires-Dist: matplotlib
-Requires-Dist: PyQt5
-Requires-Dist: tqdm
-Requires-Dist: anytree
-Requires-Dist: pandas>=1.5
-Requires-Dist: scipy
-Requires-Dist: statsmodels
-Requires-Dist: ipython
-Requires-Dist: c3d
-Requires-Dist: rtmlib
-Requires-Dist: openvino
-Requires-Dist: opencv-python<4.12
 Requires-Dist: imageio_ffmpeg
-Requires-Dist: deep-sort-realtime
 Requires-Dist: Pose2Sim>=0.10.38
 Dynamic: license-file
 
@@ -88,7 +73,9 @@ Works on any smartphone!**\
 </br>
 
 
-https://github.com/user-attachments/assets/6a444474-4df1-4134-af0c-e9746fa433ad
+https://github.com/user-attachments/assets/2ce62012-f28c-4e23-b3b8-f68931bacb77
+
+<!-- https://github.com/user-attachments/assets/6a444474-4df1-4134-af0c-e9746fa433ad -->
 
 <!-- https://github.com/user-attachments/assets/1c6e2d6b-d0cf-4165-864e-d9f01c0b8a0e -->
 

{sports2d-0.8.22 → sports2d-0.8.24}/README.md

@@ -45,7 +45,9 @@ Works on any smartphone!**\
 </br>
 
 
-https://github.com/user-attachments/assets/6a444474-4df1-4134-af0c-e9746fa433ad
+https://github.com/user-attachments/assets/2ce62012-f28c-4e23-b3b8-f68931bacb77
+
+<!-- https://github.com/user-attachments/assets/6a444474-4df1-4134-af0c-e9746fa433ad -->
 
 <!-- https://github.com/user-attachments/assets/1c6e2d6b-d0cf-4165-864e-d9f01c0b8a0e -->
 

{sports2d-0.8.22 → sports2d-0.8.24}/Sports2D/Demo/Config_demo.toml

@@ -103,7 +103,7 @@ max_distance = 100  # in px or None # If a person is detected further than max_d
 # Pixel to meters conversion
 to_meters = true
 make_c3d = true
-save_calib = false
+save_calib = true
 
 # If conversion from first_person_height
 floor_angle = 'auto'    # 'auto' or a value in degrees, eg 2.3. If 'auto', estimated from the line formed by the toes when they are on the ground (where speed = 0)
@@ -111,7 +111,9 @@ xy_origin = ['auto']    # ['auto'] or [px_x,px_y]. N.B.: px_y points downwards.
 
 # If conversion from a calibration file
 calib_file = ''         # Calibration in the Pose2Sim format. 'calib_demo.toml', or '' if not available
-
+# subject_distance
+# focal_distance
+# recalculate_extrinsics
 
 [angles]
 display_angle_values_on = ['body', 'list'] # 'body', 'list', ['body', 'list'], 'none'. Display angle values on the body, as a list in the upper left of the image, both, or do not display them.

{sports2d-0.8.22 → sports2d-0.8.24}/Sports2D/Sports2D.py

@@ -197,7 +197,7 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                                 'calib_file': '',
                                 'floor_angle': 'auto',
                                 'xy_origin': ['auto'],
-                                'save_calib': False
+                                'save_calib': True
                                 },
                     'angles':   {'display_angle_values_on': ['body', 'list'],
                                 'fontSize': 0.3,

{sports2d-0.8.22 → sports2d-0.8.24}/Sports2D/process.py

@@ -78,11 +78,11 @@ from matplotlib import patheffects
 
 from rtmlib import PoseTracker, BodyWithFeet, Wholebody, Body, Hand, Custom
 from rtmlib.tools.object_detection.post_processings import nms
-from deep_sort_realtime.deepsort_tracker import DeepSort
 
 from Sports2D.Utilities.common import *
 from Pose2Sim.common import *
 from Pose2Sim.skeletons import *
+from Pose2Sim.calibration import toml_write
 from Pose2Sim.triangulation import indices_of_first_last_non_nan_chunks
 from Pose2Sim.personAssociation import *
 from Pose2Sim.filtering import *
@@ -1458,6 +1458,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     tracking_mode = config_dict.get('pose').get('tracking_mode')
     max_distance = config_dict.get('pose').get('max_distance', None)
     if tracking_mode == 'deepsort':
+        from deep_sort_realtime.deepsort_tracker import DeepSort
         deepsort_params = config_dict.get('pose').get('deepsort_params')
         try:
             deepsort_params = ast.literal_eval(deepsort_params)
@@ -1476,8 +1477,12 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     save_calib = config_dict.get('px_to_meters_conversion').get('save_calib')
     # Calibration from file
     calib_file = config_dict.get('px_to_meters_conversion').get('calib_file')
-    if calib_file == '': calib_file = None
-    else: calib_file = Path(calib_file).resolve()
+    if calib_file == '': 
+        calib_file = None
+    else: 
+        calib_file = video_dir / calib_file
+        if not calib_file.is_file():
+            raise FileNotFoundError(f'Error: Could not find calibration file {calib_file}. Check that the file exists.')
     # Calibration from person height
     floor_angle = config_dict.get('px_to_meters_conversion').get('floor_angle') # 'auto' or float
     floor_angle = np.radians(float(floor_angle)) if floor_angle != 'auto' else floor_angle
@@ -2107,16 +2112,47 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         trc_data_m = []
         if to_meters and save_pose:
             logging.info('\nConverting pose to meters:')
+
+            # Compute height in px of the first person
+            height_px = compute_height(trc_data[0].iloc[:,1:], new_keypoints_names,
+                                        fastest_frames_to_remove_percent=fastest_frames_to_remove_percent, close_to_zero_speed=close_to_zero_speed_px, large_hip_knee_angles=large_hip_knee_angles, trimmed_extrema_percent=trimmed_extrema_percent)
+
+            if calib_file or save_calib:
+                dist_to_cam = 10.0 # arbitrary distance between the camera and the person (m)
+                R90z = np.array([[0.0, -1.0, 0.0],
+                                [1.0, 0.0, 0.0],
+                                [0.0, 0.0, 1.0]])
+                R270x = np.array([[1.0, 0.0, 0.0],
+                                [0.0, 0.0, 1.0],
+                                [0.0, -1.0, 0.0]])
+
+            # Compute px to meter parameters from calibration file
             if calib_file:
-                logging.info(f'Using calibration file to convert coordinates in meters: {calib_file}.')
                 calib_params_dict = retrieve_calib_params(calib_file)
-                # TODO
 
-            else:
-                # Compute calibration parameters
-                height_px = compute_height(trc_data[0].iloc[:,1:], new_keypoints_names,
-                                            fastest_frames_to_remove_percent=fastest_frames_to_remove_percent, close_to_zero_speed=close_to_zero_speed_px, large_hip_knee_angles=large_hip_knee_angles, trimmed_extrema_percent=trimmed_extrema_percent)
+                f = calib_params_dict['K'][0][0][0]
+                first_person_height = height_px / f * dist_to_cam
 
+                R_cam = cv2.Rodrigues(calib_params_dict['R'][0])[0]
+                T_cam = np.array(calib_params_dict['T'][0])
+                R_world, T_world = world_to_camera_persp(R_cam, T_cam)
+                Rfloory = R90z.T @ R_world @ R270x.T
+                T_world = R90z.T @ T_world
+                floor_angle_estim = np.arctan2(Rfloory[0,2], Rfloory[0,0])
+                
+                cu = calib_params_dict['K'][0][0][2]
+                cv = calib_params_dict['K'][0][1][2]
+                cx = 0.0
+                cy = cv + T_world[2]*f/dist_to_cam
+                xy_origin_estim = [cx, cy]
+
+                logging.info(f'Using calibration file to convert coordinates in meters: {calib_file}.\n'
+                             f'Floor angle: {np.degrees(floor_angle_estim):.2f}°, '
+                             f'xy_origin: [{cx:.2f}, {cy:.2f}] px.')
+
+                
+            # Compute px to meter parameters from scene
+            else:
                 toe_speed_below = 1 # m/s (below which the foot is considered to be stationary)
                 px_per_m = height_px/first_person_height
                 toe_speed_below_px_frame = toe_speed_below * px_per_m / fps
@@ -2142,6 +2178,37 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                 logging.info(f'Using height of person #0 ({first_person_height}m) to convert coordinates in meters.\n'
                              f'Floor angle: {np.degrees(floor_angle_estim) if not floor_angle=="auto" else f"auto (estimation: {round(np.degrees(floor_angle_estim),2)}°)"}, '
                              f'xy_origin: {xy_origin if not xy_origin=="auto" else f"auto (estimation: {[round(c) for c in xy_origin_estim]})"} px.')
+                
+                # Save calibration file
+                if save_calib:
+                    calib_file_path = output_dir / f'{video_file_stem}_Sports2D_calib.toml'
+                    
+                    # name, size, distortions
+                    N = [video_file_stem]
+                    S = [[cam_width, cam_height]]
+                    D = [[0.0, 0.0, 0.0, 0.0]]
+
+                    # Intrinsics
+                    f = height_px / first_person_height * dist_to_cam
+                    cu = cam_width/2
+                    cv = cam_height/2
+                    K = np.array([[[f, 0.0, cu], [0.0, f, cv], [0.0, 0.0, 1.0]]])
+
+                    # Extrinsics
+                    Rfloory = np.array([[np.cos(floor_angle_estim), 0.0, np.sin(floor_angle_estim)],
+                                        [0.0, 1.0, 0.0],
+                                        [-np.sin(floor_angle_estim), 0.0, np.cos(floor_angle_estim)]])
+                    R_world = R90z @ Rfloory @ R270x
+                    T_world = R90z @ np.array([-(cx-cu)/f*dist_to_cam, -dist_to_cam, (cy-cv)/f*dist_to_cam])
+                    
+                    R_cam, T_cam = world_to_camera_persp(R_world, T_world)
+                    Tvec_cam = T_cam.reshape(1,3).tolist()
+                    Rvec_cam = cv2.Rodrigues(R_cam)[0].reshape(1,3).tolist()
+
+                    # Write calibration file
+                    toml_write(calib_file_path, N, S, D, K, Rvec_cam, Tvec_cam)
+                    logging.info(f'Calibration saved to {calib_file_path}.')
+
 
             # Coordinates in m
             new_visible_side = []
@@ -2206,48 +2273,6 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                 new_visible_side += [visible_side_i]
         else:
             new_visible_side = visible_side.copy()
-                
-            
-
-
-
-
-                # # plt.plot(trc_data_m.iloc[:,0], trc_data_m.iloc[:,1])
-                # # plt.ylim([0,2])
-                # # plt.show()
-
-
-
-                # z = 3.0 # distance between the camera and the person. Required in the calibration file but simplified in the equations
-                # f = height_px / first_person_height * z
-
-
-                # # Name
-                # N = [video_file]
-
-                # # Size
-                # S = [[cam_width, cam_height]]
-
-                # # Distortions
-                # D = [[0.0, 0.0, 0.0, 0.0]]
-                        
-                # # Camera matrix
-                # K = [[[f, 0.0, cx], [0.0, f, cy], [0.0, 0.0, 1.0]]] # f and Z do not matter in 2D
-                
-                # # Rot, Trans
-                # R = 
-                # T = 
-
-                # # Save calibration file
-
-                # # Convert to meters
-                # trc_data = 
-
-
-
-
-
-
 
 
     #%% ==================================================

{sports2d-0.8.22 → sports2d-0.8.24}/pyproject.toml

@@ -33,22 +33,7 @@ classifiers = [
 ]
 urls = {Homepage = "https://github.com/davidpagnon/Sports2D", "Bug Tracker" = "https://github.com/davidpagnon/Sports2D/issues"}
 dependencies = [
-    "toml",
-    "numpy>=1.19",
-    "matplotlib",
-    "PyQt5",
-    "tqdm",
-    "anytree",
-    "pandas>=1.5",
-    "scipy",
-    "statsmodels",
-    "ipython",
-    "c3d",
-    "rtmlib",
-    "openvino",
-    "opencv-python<4.12", # otherwise forces numpy>=2.0, which is incompatible with some opensim/python combinations
     "imageio_ffmpeg",
-    "deep-sort-realtime",
     "Pose2Sim>=0.10.38"
 ]
 

{sports2d-0.8.22 → sports2d-0.8.24}/sports2d.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.22
+Version: 0.8.24
 Summary: Compute 2D human pose and angles from a video or a webcam.
 Author-email: David Pagnon <contact@david-pagnon.com>
 Maintainer-email: David Pagnon <contact@david-pagnon.com>
@@ -22,22 +22,7 @@ Classifier: Topic :: Multimedia :: Graphics :: 3D Modeling
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: toml
-Requires-Dist: numpy>=1.19
-Requires-Dist: matplotlib
-Requires-Dist: PyQt5
-Requires-Dist: tqdm
-Requires-Dist: anytree
-Requires-Dist: pandas>=1.5
-Requires-Dist: scipy
-Requires-Dist: statsmodels
-Requires-Dist: ipython
-Requires-Dist: c3d
-Requires-Dist: rtmlib
-Requires-Dist: openvino
-Requires-Dist: opencv-python<4.12
 Requires-Dist: imageio_ffmpeg
-Requires-Dist: deep-sort-realtime
 Requires-Dist: Pose2Sim>=0.10.38
 Dynamic: license-file
 
@@ -88,7 +73,9 @@ Works on any smartphone!**\
 </br>
 
 
-https://github.com/user-attachments/assets/6a444474-4df1-4134-af0c-e9746fa433ad
+https://github.com/user-attachments/assets/2ce62012-f28c-4e23-b3b8-f68931bacb77
+
+<!-- https://github.com/user-attachments/assets/6a444474-4df1-4134-af0c-e9746fa433ad -->
 
 <!-- https://github.com/user-attachments/assets/1c6e2d6b-d0cf-4165-864e-d9f01c0b8a0e -->
 

sports2d-0.8.24/sports2d.egg-info/requires.txt

@@ -0,0 +1,2 @@
+imageio_ffmpeg
+Pose2Sim>=0.10.38

sports2d-0.8.22/sports2d.egg-info/requires.txt

@@ -1,17 +0,0 @@
-toml
-numpy>=1.19
-matplotlib
-PyQt5
-tqdm
-anytree
-pandas>=1.5
-scipy
-statsmodels
-ipython
-c3d
-rtmlib
-openvino
-opencv-python<4.12
-imageio_ffmpeg
-deep-sort-realtime
-Pose2Sim>=0.10.38