Update app.py

app.py

@@ -47,11 +47,11 @@ depths = []
 masks = []
 locations = []
 
-def zip_files(files_in, files_out):
+def zip_files(files_in, subs):
     with ZipFile("depth_result.zip", "w") as zipObj:
         for idx, file in enumerate(files_in):
             zipObj.write(file, file.split("/")[-1])
-        for idx, file in enumerate(files_out):
+        for idx, file in enumerate(subs):
             zipObj.write(file, file.split("/")[-1])
     return "depth_result.zip"
 
@@ -243,7 +243,7 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits', blur_data
 
         final_vid = create_video(comb_frames, frame_rate, "orig")
             
-        final_zip = zip_files(orig_frames, depth_frames)
+        final_zip = zip_files(comb_frames, ["orig_result.vtt"])
         raw_video.release()
         # out.release()
         cv2.destroyAllWindows()
@@ -645,6 +645,7 @@ with gr.Blocks(css=css, js=js, head=head) as demo:
               reset = gr.Button("Reset", size='sm')
               mouse.input(fn=draw_mask, show_progress="minimal", inputs=[boffset, bsize, mouse, output_mask], outputs=[output_mask])
               reset.click(fn=reset_mask, inputs=[output_mask], outputs=[output_mask])
+              output_frame.select(fn=select_frame, inputs=[output_mask], outputs=[output_mask, selected])
 
         with gr.Column():
           model_type = gr.Dropdown([("small", "vits"), ("base", "vitb"), ("large", "vitl"), ("giant", "vitg")], type="value", value="vits", label='Model Type')
@@ -711,8 +712,14 @@ with gr.Blocks(css=css, js=js, head=head) as demo:
               blur_in.input(fn=update_blur, inputs=[blur_in], outputs=None)
           with gr.Group():
             with gr.Accordion(label="Locations", open=False):
-              output_frame.select(fn=select_frame, inputs=[output_mask], outputs=[output_mask, selected])
-            coords = gr.File(elem_id="coords", label="Alignment", interactive=False)
+              example_coords = """[
+              {"lat": 50.07379596793083, "lng": 14.437146122950555, "heading": 152.70303, "pitch": 2.607833999999997}, 
+              {"lat": 50.073799567020004, "lng": 14.437146774240507, "heading": 151.12973, "pitch": 2.8672300000000064}, 
+              {"lat": 50.07377647505558, "lng": 14.437161000659017, "heading": 151.41025, "pitch": 3.4802200000000028}, 
+              {"lat": 50.07379496839027, "lng": 14.437148958238538, "heading": 151.93391, "pitch": 2.843050000000005}, 
+              {"lat": 50.073823157821664, "lng": 14.437124189538856, "heading": 152.95769, "pitch": 4.233024999999998}
+              ]"""
+              coords = gr.Textbox(elem_id="coords", value=example_coords, label="Alignment", interactive=False)
           
           model3d = gr.HTML(value="""
             <a style='color:white;font-weight:bold' href='https://freeali.se/freealise/transparent_video/' target='_blank'>Open renderer in new tab and upload your video there</a>
@@ -779,17 +786,10 @@ with gr.Blocks(css=css, js=js, head=head) as demo:
         # Process the video and get the path of the output video
         output_video_path = make_video(uploaded_video,encoder=model_type,blur_data=blurin,o=boffset,b=bsize)
 
-        return output_video_path + ("orig_result.vtt",) #(json.dumps(locations),)
+        return output_video_path + (vtt[0:-2],) #(json.dumps(locations),)
 
     submit.click(on_submit, inputs=[input_video, model_type, blur_in, boffset, bsize, coords], outputs=[processed_video, processed_zip, output_frame, output_mask, output_depth, coords])
 
-    example_coords = """[
-      {"lat": 50.07379596793083, "lng": 14.437146122950555, "heading": 152.70303, "pitch": 2.607833999999997}, 
-      {"lat": 50.073799567020004, "lng": 14.437146774240507, "heading": 151.12973, "pitch": 2.8672300000000064}, 
-      {"lat": 50.07377647505558, "lng": 14.437161000659017, "heading": 151.41025, "pitch": 3.4802200000000028}, 
-      {"lat": 50.07379496839027, "lng": 14.437148958238538, "heading": 151.93391, "pitch": 2.843050000000005}, 
-      {"lat": 50.073823157821664, "lng": 14.437124189538856, "heading": 152.95769, "pitch": 4.233024999999998}
-    ]"""
     example_files = [["./examples/streetview.mp4", "vits", blurin, 1, 32, example_coords]]
     examples = gr.Examples(examples=example_files, fn=on_submit, cache_examples=True, inputs=[input_video, model_type, blur_in, boffset, bsize, coords], outputs=[processed_video, processed_zip, output_frame, output_mask, output_depth, coords])