Update app.py

app.py

@@ -94,7 +94,7 @@ def create_video(frames, fps, type):
     return type + "_result.mp4"
 
     
-def infer(url_in,interpolation,fps_output,resize_n,winsize,o_flow):
+def infer(url_in,interpolation,fps_output,resize_n):
     
     fps_output = logscale(fps_output)
     # 1. break video into frames and get FPS
@@ -131,64 +131,10 @@ def infer(url_in,interpolation,fps_output,resize_n,winsize,o_flow):
     final_vid = create_video(result_frames, fps_output, "interpolated")
 
     files = final_vid
-
-    depth_map = cv2.VideoCapture(final_vid)
     print("interpolated frames: " + str(len(frames_list)) + " -> " + str(len(result_frames)))
-
-    depth_frames = []
-    ret, fr1 = depth_map.read()
-    prvs = cv2.cvtColor(fr1, cv2.COLOR_RGBA2GRAY)
-    hsv = np.zeros_like(fr1)
-    hsv[..., 1] = 255
-    res = np.zeros_like(prvs)
-    flow = res
-
-    i=0
-    while(depth_map.isOpened()):
-      ret, fr2 = depth_map.read()
-      if ret == False:
-        if o_flow == False:
-          rgb = prvs
-          alpha = 1.0/(i+1)
-          beta = (1.0 - alpha)
-          res = cv2.addWeighted(rgb, alpha, res, beta, 0.0, res)
-        break
-      nxt = cv2.cvtColor(fr2, cv2.COLOR_RGBA2GRAY)
-      if o_flow == True:
-        fl = cv2.calcOpticalFlowFarneback(prvs, nxt, flow, 0.5, 7, winsize, 7, 7, 1.5, 0)
-        mag, ang = cv2.cartToPolar(fl[..., 0], fl[..., 1])
-        hsv[..., 0] = ang*180/np.pi/2
-        hsv[..., 2] = cv2.normalize(mag, None, 0, 255, cv2.NORM_MINMAX)
-        rgb = cv2.cvtColor(hsv, cv2.COLOR_HSV2RGB)
-        rgb = cv2.cvtColor(rgb, cv2.COLOR_RGBA2GRAY)
-      else:
-        rgb = prvs
-
-      alpha = 1.0/(i+1)
-      beta = (1.0 - alpha)
-      res = cv2.addWeighted(rgb, alpha, res, beta, 0.0, res)
-      rgb = cv2.cvtColor(rgb, cv2.COLOR_GRAY2RGB)
-
-      lo = np.array([0,0,0])
-      hi = np.array([16,16,16])
-      mask = cv2.inRange(rgb, lo, hi)
-      #m = cv2.bitwise_and(mask_f, mask)
-      #diff = np.abs(rgba - bg)
-      fr2[mask>0] = (255,255,255)
-
-      cv2.imwrite(f"opticalfb{i}.png", fr2)
-      depth_frames.append(f"opticalfb{i}.png")
-        
-      i+=1
-      prvs = nxt
-
-    print("averaged frames: " + str(len(result_frames)))
-    depth_vid = create_video(depth_frames, fps_output, "depth_map")
-    cv2.imwrite('opticalfb.png', res)
-    depth_map.release()
     cv2.destroyAllWindows()
 
-    return final_vid, files, depth_vid, 'opticalfb.png'
+    return final_vid, files
 
 
 def logscale(linear):
@@ -233,11 +179,9 @@ with gr.Blocks() as demo:
                 video_input = gr.Video()
                 video_input.change(fn=loadurl, inputs=[video_input], outputs=[url_input])
                 resize_num = gr.Slider(minimum=1, maximum=4096, step=1, value=256, label="Resize to width: ")
-                of_check = gr.Checkbox(value=True, label="Detect motion to remove background: ")
-                winsize_num = gr.Slider(minimum=1, maximum=256, step=1, value=15, label="Motion detection window size: ")
                 with gr.Row():
-                    interpolation_slider = gr.Slider(minimum=1, maximum=5, step=1, value=1, label="Interpolation Steps: ")
-                    interpolation = gr.Number(value=2, show_label=False, interactive=False)
+                    interpolation_slider = gr.Slider(minimum=1, maximum=5, step=1, value=0, label="Interpolation Steps: ")
+                    interpolation = gr.Number(value=1, show_label=False, interactive=False)
                     interpolation_slider.change(fn=logscale, inputs=[interpolation_slider], outputs=[interpolation])
                 with gr.Row():
                     fps_output_slider = gr.Slider(minimum=0, maximum=5, step=1, value=0, label="FPS output: ")
@@ -248,17 +192,15 @@ with gr.Blocks() as demo:
             with gr.Column():
                 video_output = gr.Video()
                 file_output = gr.File()
-                depth_output = gr.Video()
-                depth_avg = gr.Image()
     
     gr.Examples(
-        examples=[["./examples/man-in-museum-reverse-cut.mp4", 2, 0, 256, 15, True]],
+        examples=[["./examples/man-in-museum-reverse-cut.mp4", 0, 0, 256]],
         fn=infer,
-        inputs=[url_input, interpolation_slider, fps_output_slider, resize_num, winsize_num, of_check],
-        outputs=[video_output, file_output, depth_output, depth_avg],
+        inputs=[url_input, interpolation_slider, fps_output_slider, resize_num],
+        outputs=[video_output, file_output],
         cache_examples=True
     )
     
-    submit_btn.click(fn=infer, inputs=[url_input, interpolation_slider, fps_output_slider, resize_num, winsize_num, of_check], outputs=[video_output, file_output, depth_output, depth_avg])
+    submit_btn.click(fn=infer, inputs=[url_input, interpolation_slider, fps_output_slider, resize_num], outputs=[video_output, file_output])
 
 demo.launch()