add video display

app.py

@@ -328,7 +328,7 @@ def inference(stream_url, start_time, end_time, count_only_api, api_key,
                  labels={'x': 'event type', 'y': 'probability'},
                  range_y=[0, 1])
 
-    return count_msg, fig, hist, bar
+    return x, count_msg, fig, hist, bar
         
 
 DESCRIPTION = '# NextJump 🦘'
@@ -343,8 +343,12 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
     #                             max_length=150)
     with gr.Row():
         in_stream_url = gr.Textbox(label="Stream URL", elem_id='stream-url', visible=True)
-        in_stream_start = gr.Textbox(label="Start Time", elem_id='stream-start', visible=True)
-        in_stream_end = gr.Textbox(label="End Time", elem_id='stream-end', visible=True)
+        with gr.Column():
+            in_stream_start = gr.Textbox(label="Start Time", elem_id='stream-start', visible=True)
+        with gr.Column():
+            in_stream_end = gr.Textbox(label="End Time", elem_id='stream-end', visible=True)
+        with gr.Column(min_width=480):
+            out_video = gr.PlayableVideo(label="Video Clip", elem_id='output-video', format='mp4', width=400, height=400)
             
     with gr.Row():
         run_button = gr.Button(value="Run", elem_id='run-button', scale=1)
@@ -358,8 +362,6 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
                 out_text = gr.Markdown(label="Predicted Count", elem_id='output-text')
                 period_length = gr.Textbox(label="Period Length", elem_id='period-length', visible=False)
                 periodicity = gr.Textbox(label="Periodicity", elem_id='periodicity', visible=False)
-            #with gr.Column(min_width=480):
-                #out_video = gr.PlayableVideo(label="Output Video", elem_id='output-video', format='mp4')
         with gr.Row():
             out_plot = gr.Plot(label="Jumping Speed", elem_id='output-plot')
         with gr.Row():
@@ -368,21 +370,6 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
             with gr.Column():
                 out_event_type_dist = gr.Plot(label="Event Type Distribution", elem_id='output-event-type-dist')
               
-    with gr.Accordion(label="Instructions and more information", open=False):
-        instructions = "## Instructions:"
-        instructions += "\n* Upload a video and click 'Run' to get a prediction of the number of jumps (either one foot, or both). This could take a couple minutes!"
-        instructions += "\n\n## Tips (optional):"
-        instructions += "\n* Trim the video to start and end of the event"
-        instructions += "\n* Frame the jumper fully, in the center of the frame"
-        instructions += "\n* Videos are automatically resized, so higher resolution will not help, but a closer framing of the jumper might help. Try cropping the video differently."
-        gr.Markdown(instructions)
-
-        faq = "## FAQ:"
-        faq += "\n* **Q:** Does the model recognize misses?\n    * **A:** Yes, but if it fails, you can try tuning the miss threshold slider to make it more sensitive."
-        faq += "\n* **Q:** Does the model recognize double dutch?\n    * **A:** Yes, but it is trained on a smaller set of double dutch videos, so it may not work perfectly."
-        faq += "\n* **Q:** Does the model recognize double unders\n    * **A:** Yes, but it is trained on a smaller set of double under videos, so it may not work perfectly. It is also trained to count the rope, not the jumps so you will need to divide the count by 2 to get the traditional double under count."
-        faq += "\n* **Q:** Does the model count both feet?\n    * **A:** Yes, it counts every time the rope goes around no matter the event."
-        gr.Markdown(faq)
 
     demo_inference = partial(inference, count_only_api=False, api_key=None)
 
@@ -397,25 +384,14 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
     #                f"{playlist_url}rec_rd2FAyUo/vod",
     #                ]
 
-    gr.Examples(examples=[
-                        ['https://hiemdall-dev2.azurewebsites.net/api/playlist/rec_rd2FAyUo/vod', '00:43:10', '00:43:40'],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train14.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_17.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train13.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_213.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_156.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_202.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_57.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_95.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_253.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_66.mp4")],
-                        #[os.path.join(os.path.dirname(__file__), "files", "train_21.mp4")]
-                    ],
-                inputs=[in_stream_url, in_stream_start, in_stream_end],
-                outputs=[out_text, out_plot, out_hist, out_event_type_dist],
-                fn=demo_inference, cache_examples=os.getenv('SYSTEM') == 'spaces')
+    # gr.Examples(examples=[
+    #                     ['https://hiemdall-dev2.azurewebsites.net/api/playlist/rec_rd2FAyUo/vod', '00:43:10', '00:43:40'],
+    #                 ],
+    #             inputs=[in_stream_url, in_stream_start, in_stream_end],
+    #             outputs=[out_text, out_plot, out_hist, out_event_type_dist],
+    #             fn=demo_inference, cache_examples=os.getenv('SYSTEM') == 'spaces')
     
-    run_button.click(demo_inference, [in_stream_url, in_stream_start, in_stream_end], outputs=[out_text, out_plot, out_hist, out_event_type_dist])
+    run_button.click(demo_inference, [in_stream_url, in_stream_start, in_stream_end], outputs=[out_video, out_text, out_plot, out_hist, out_event_type_dist])
     api_inference = partial(inference, api_call=True)
     api_dummy_button.click(api_inference, [in_stream_url, in_stream_start, in_stream_end, count_only, api_token], outputs=[period_length], api_name='inference')