make directory

main.py

@@ -82,15 +82,18 @@ def show_tracking(video_content):
 
 
 def pose3d(video):
+    if video[:-5] == ".webm":
+        print("Format is webm, changing it to mp4...")
+        clip = moviepy.VideoFileClip(video)
+
+        new_video = video[:-5]+".mp4"
+        clip.write_videofile(new_video)
+
+    # Define new unique folder
     add_dir = str(uuid.uuid4())
-    #vidname = video.split("/")[-1]
     vis_out_dir = os.path.join("/".join(video.split("/")[:-1]), add_dir)
-    print("[INFO]: CURRENT OUT DIR: ", vis_out_dir)
-    print("[INFO]: LIST CURRENT OUT DIR: ", os.listdir("/".join(video.split("/")[:-1])))
     os.makedirs(vis_out_dir)
 
-    #full name = os.path.join(vis_out_dir, vidname)         
-
     result_generator = human3d(video, 
                                  vis_out_dir = vis_out_dir,
                                  thickness=2,
@@ -98,30 +101,26 @@ def pose3d(video):
                                  rebase_keypoint_height=True,
                                  device="cuda")    
     
-    print("OUTDIR", os.listdir(os.path.join(vis_out_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")) 
-    print("[INFO]: CURRENT OUT FILE NAME: ", out_file)
+    result = [result for result in result_generator] #next(result_generator)        
 
-    return out_file
+    out_file = glob.glob(os.path.join(vis_out_dir, "*.mp4")) #+ glob.glob(os.path.join(vis_out_dir, "*.webm")) 
+   
+    return "".join(out_file)
 
 
 def pose2d(video):
-    print("Transforming input")
-    clip = moviepy.VideoFileClip(video)
 
-    new_video = video[:-5]+".mp4"
-    clip.write_videofile(new_video)
+    if video[:-5] == ".webm":
+        print("Format is webm, changing it to mp4...")
+        clip = moviepy.VideoFileClip(video)
+
+        new_video = video[:-5]+".mp4"
+        clip.write_videofile(new_video)
 
-    vidname = video.split("/")[-1]
-    print("VIDNAME", vidname)
+    # 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)
-    print("[INFO]: CURRENT OUT DIR: ", vis_out_dir)
-    print("[INFO]: LIST CURRENT OUT DIR: ", os.listdir("/".join(video.split("/")[:-1])))
-
 
     result_generator = human(new_video, 
                             vis_out_dir = vis_out_dir,
@@ -133,26 +132,25 @@ def pose2d(video):
                             )    
     
     result = [result for result in result_generator] #next(result_generator)        
-    #print(result)
-
-    out_file = glob.glob(os.path.join(vis_out_dir, "*.mp4")) + glob.glob(os.path.join(vis_out_dir, "*.webm")) 
-    #out_file = os.path.join(vis_out_dir, "sample_flip.webm")
-    print("OTFILE: ", out_file)
-    print("ADD DIR ", os.listdir(vis_out_dir))
 
+    out_file = glob.glob(os.path.join(vis_out_dir, "*.mp4")) #+ glob.glob(os.path.join(vis_out_dir, "*.webm")) 
+   
     return "".join(out_file)
 
 
 def pose2dhand(video):
+    if video[:-5] == ".webm":
+        print("Format is webm, changing it to mp4...")
+        clip = moviepy.VideoFileClip(video)
+
+        new_video = video[:-5]+".mp4"
+        clip.write_videofile(new_video)
+
+    # 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)
 
-    print("[INFO]: CURRENT OUT DIR: ", vis_out_dir)
-    print("[INFO]: LIST CURRENT OUT DIR: ", os.listdir("/".join(video.split("/")[:-1])))
-
-    vis_out_dir = str(uuid.uuid4())
-
     result_generator = hand(video, 
                                  vis_out_dir = vis_out_dir,
                                  return_vis=True,
@@ -160,13 +158,11 @@ def pose2dhand(video):
                                  rebase_keypoint_height=True,
                                  device="cuda")    
     
-    result = [result for result in result_generator] #next(result_generator)    
-    
-    print(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(vis_out_dir, "*.mp4")) + glob.glob(os.path.join(vis_out_dir, "*.webm")) 
-    
-    return out_file
+    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")) 
+   
+    return "".join(out_file)
 
 def run_UI():
     with gr.Blocks() as demo:
@@ -174,7 +170,7 @@ def run_UI():
             with gr.Tab("Upload video"):
                 with gr.Row():
                     with gr.Column():
-                        video_input = gr.Video(source="upload", type="filepath", height=512)
+                        video_input = gr.Video(source="upload", type="filepath", height=612)
                         # Insert slider with kpt_thr
                         file_kpthr = gr.Slider(minimum=1e3, maximum=1e6, step=1e3, default=1e3, label='Keypoint threshold')
 
@@ -191,7 +187,7 @@ def run_UI():
             with gr.Tab("Record video with webcam"):
                 with gr.Row():
                     with gr.Column():
-                        webcam_input = gr.Video(source="webcam", height=512)
+                        webcam_input = gr.Video(source="webcam", height=612)
                         
                         web_kpthr = gr.Slider(minimum=1e3, maximum=1e6, step=1e3, default=1e3, label='Keypoint threshold')