Update app.py

app.py

@@ -48,10 +48,10 @@ def load_model2():
 threshold = 0.50
 
 def predict(pilimg,video_in_filepath,threshold):
-    if pilimg:
+    #if pilimg:
         image_np = pil_image_as_numpy_array(pilimg)
-        return predict2(image_np,threshold),None
-    else:
+    #    return predict2(image_np,threshold),None
+    #else:
         video_reader = cv2.VideoCapture(video_in_filepath)
         
         nb_frames = int(video_reader.get(cv2.CAP_PROP_FRAME_COUNT))
@@ -59,8 +59,10 @@ def predict(pilimg,video_in_filepath,threshold):
         frame_w = int(video_reader.get(cv2.CAP_PROP_FRAME_WIDTH))
         fps = video_reader.get(cv2.CAP_PROP_FPS)
 
-       
-        video_out_filepath = 'detected.mp4'
+        if video_in_filepath:
+            video_out_filepath = 'detected.mp4'
+        else:
+            video_out_filepath = None
         video_writer = cv2.VideoWriter(video_out_filepath,
                                 cv2.VideoWriter_fourcc(*'mp4v'), 
                                 fps, 
@@ -89,7 +91,8 @@ def predict(pilimg,video_in_filepath,threshold):
         video_writer.release() 
         cv2.destroyAllWindows() 
         cv2.waitKey(1)
-        return None,video_out_filepath
+    #    return None,video_out_filepath
+        return predict2(image_np,threshold), video_out_filepath
 
 
 def predict2(image_np,threshold):
@@ -177,7 +180,7 @@ gr.Interface(fn=predict,
              description="Model: ssd_mobilenet_v2_320x320",
              theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
              cache_examples = True,
-             #examples=[["test_samples/image489.png",None,0.55], ["test_samples/image825.png",None,0.55], ["test_samples/image833.png",None,0.55], ["test_samples/image846.png",None,0.55], [None,"test_samples/test_video.mp4",0.55]]
+             examples=[["test_samples/image489.png",None,0.55], ["test_samples/image825.png",None,0.55], ["test_samples/image833.png",None,0.55], ["test_samples/image846.png",None,0.55], [None,"test_samples/test_video.mp4",0.55]]
              ).launch(share=True)
 
 # gr.Interface(fn=video_fn,