3d change

main_noweb.py

@@ -112,30 +112,33 @@ def show_tracking(video_content):
         return out_file
 
 
-def pose3d(video):
+def pose3d(video, kpt_threshold):
     video = check_extension(video)
     print(device)
     temp_3d = human3d
 
-
     # Define new unique folder
     add_dir = str(uuid.uuid4())
     vis_out_dir = os.path.join("/".join(video.split("/")[:-1]), add_dir)
-    os.makedirs(vis_out_dir)
 
+    os.makedirs(add_dir)
+    print(check_fps(video))
     result_generator = temp_3d(video, 
-                                vis_out_dir = vis_out_dir,
-                                thickness=4,
-                                radius = 5,
-                                return_vis=True,
-                                kpt_thr=0.3,
-                                rebase_keypoint_height=True,
-                                device=device)    
+                            vis_out_dir = add_dir,
+                            #return_vis=True,
+                            radius = 5,
+                            thickness=4,
+                            rebase_keypoint_height=True,
+                            kpt_thr=kpt_threshold,
+                            device=device,
+                            pred_out_dir = add_dir
+                            )    
     
     result = [result for result in result_generator] #next(result_generator)        
 
-    out_file = glob.glob(os.path.join(vis_out_dir, "*.mp4")) #+ glob.glob(os.path.join(vis_out_dir, "*.webm")) 
-    
+    out_file = glob.glob(os.path.join(add_dir, "*.mp4")) #+ glob.glob(os.path.join(vis_out_dir, "*.webm")) 
+    kpoints = glob.glob(os.path.join(add_dir, "*.json"))
+    print(kpoints) 
     # Reinitialize
     return "".join(out_file)
 
@@ -223,47 +226,47 @@ with block:
                             \n If you choose to run the code, start by installing the packages json and numpy. The complete overview of the keypoint indices can be seen in the tab 'General information'. """)
                 gr.Code(
                     value="""
-                            # Importing packages needed  
-                            import json
-                            import numpy as np
+                    # Importing packages needed  
+                    import json
+                    import numpy as np
+                    
+                    kpointlist=[]
+
+                    # First we load the data
+                    with open(file_path, 'r') as json_file:
+                        data = json.load(json_file)
+
+                    # The we define a function for calculating angles    
+                    def calculate_angle(a, b, c):
+                        a = np.array(a) # First point
+                        b = np.array(b) # Middle point
+                        c = np.array(c) # End point
+                        
+                        radians = np.arctan2(c[1]-b[1], c[0]-b[0]) - np.arctan2(a[1]-b[1], a[0]-b[0])
+                        angle = np.abs(radians*180.0/np.pi)
+                        
+                        if angle >180.0:
+                            angle = 360-angle
                             
-                            kpointlist=[]
-
-                            # First we load the data
-                            with open(file_path, 'r') as json_file:
-                                data = json.load(json_file)
-
-                            # The we define a function for calculating angles    
-                            def calculate_angle(a, b, c):
-                                a = np.array(a) # First point
-                                b = np.array(b) # Middle point
-                                c = np.array(c) # End point
-                                
-                                radians = np.arctan2(c[1]-b[1], c[0]-b[0]) - np.arctan2(a[1]-b[1], a[0]-b[0])
-                                angle = np.abs(radians*180.0/np.pi)
-                                
-                                if angle >180.0:
-                                    angle = 360-angle
-                                    
-                                return angle 
-
-                            # We select the first identified person in the first frame (zero index) as an example
-                            # To calculate the angle of the right elbow we take the point before and after and according to the indices that will be 6 (right shoulder) and 9 (right wrist)
-                            predictions = data['predictions'][0]  # Assuming batch_size is 1
-
-                            # COCO keypoint indices
-                            shoulder_index = 6
-                            elbow_index = 8
-                            wrist_index = 9
-
-                            shoulder_point = data[0]['instances'][0]['keypoints'][shoulder_index]
-                            elbow_point = data[0]['instances'][0]['keypoints'][elbow_index]
-                            wrist_point = data[0]['instances'][0]['keypoints'][wrist_index]
-
-                            angle = calculate_angle(shoulder_point, elbow_point, wrist_point)
-                            print("Angle is: ", angle)    
-
-                          """,
+                        return angle 
+
+                    # We select the first identified person in the first frame (zero index) as an example
+                    # To calculate the angle of the right elbow we take the point before and after and according to the indices that will be 6 (right shoulder) and 9 (right wrist)
+                    predictions = data['predictions'][0]  # Assuming batch_size is 1
+
+                    # COCO keypoint indices
+                    shoulder_index = 6
+                    elbow_index = 8
+                    wrist_index = 9
+
+                    shoulder_point = data[0]['instances'][0]['keypoints'][shoulder_index]
+                    elbow_point = data[0]['instances'][0]['keypoints'][elbow_index]
+                    wrist_point = data[0]['instances'][0]['keypoints'][wrist_index]
+
+                    angle = calculate_angle(shoulder_point, elbow_point, wrist_point)
+                    print("Angle is: ", angle)    
+
+                    """,
                     language="python",
                     interactive=False,
                     show_label=False,
@@ -287,27 +290,26 @@ with block:
                         
                         \n The keypoints in the 2D pose model has the following order:
 
-                        \n ``` 0: Nose
-                               1: Left Eye
-                               2: Right Eye
-                               3: Left Ear
-                               4: Right Ear
-                               5: Left Shoulder
-                               6: Right Shoulder
-                               7: Left Elbow
-                               8: Right Elbow
-                               9: Left Wrist
-                               10: Right Wrist
-                               11: Left Hip
-                               12: Right Hip
-                               13: Left Knee
-                               14: Right Knee
-                               15: Left Ankle
-                               16: Right Ankle ```
-
-                        
+                        \n ``` 
+                        0: Nose
+                        1: Left Eye
+                        2: Right Eye
+                        3: Left Ear
+                        4: Right Ear
+                        5: Left Shoulder
+                        6: Right Shoulder
+                        7: Left Elbow
+                        8: Right Elbow
+                        9: Left Wrist
+                        10: Right Wrist
+                        11: Left Hip
+                        12: Right Hip
+                        13: Left Knee
+                        14: Right Knee
+                        15: Left Ankle
+                        16: Right Ankle 
+                        ```
                         """)
-            gr.Markdown("You can load the keypoints in python in the following way: ")
 
             
 
@@ -318,7 +320,7 @@ with block:
                             queue=True)
         
         submit_pose3d_file.click(fn=pose3d, 
-                                inputs= video_input, 
+                                inputs= [video_input, file_kpthr], 
                                 outputs = video_output2,
                                 queue=True)