Update app.py

app.py

@@ -136,7 +136,7 @@ def infer(f_in, interpolation, fps_output):
     return final_vid, files
 
 
-def remove_bg(fl, s, l, v, h, l_t):
+def remove_bg(fl, s, l, v, l_t):
     frame = cv2.imread(fl).astype(np.uint8)
     
     b = 5
@@ -158,25 +158,17 @@ def remove_bg(fl, s, l, v, h, l_t):
 
 
     hsv_ = cv2.cvtColor(frame_c, cv2.COLOR_BGR2HSV)
-    hue_s = np.zeros_like(hsv_)
     edges = cv2.Laplacian(cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY), cv2.CV_64F)
     blur_s = np.zeros_like(edges)
     for i in range(2, frame.shape[0]-2):
         for j in range(2, frame.shape[1]-2):
             d = edges[i-2:i+2, j-2:j+2].var()
             blur_s[i,j] = d.astype(np.uint8)
-            
-            d = hsv_[i-1:i+1, j-1:j+1, 0].var()
-            hue_s[i,j] = (d*16).astype(np.uint8)
 
     print(fl)
-    print("hue variance")
-    print(np.average(hue_s))
-    print(np.median(hue_s))
-    print("texture")
+    print("detail")
     print(np.average(blur_s))
     print(np.median(blur_s))
-    #remove regions of low saturation and lightness (get scene without shadow)
     print("saturation")
     print(np.average(hsv_[:,:,1]))
     print(np.median(hsv_[:,:,1]))
@@ -184,21 +176,18 @@ def remove_bg(fl, s, l, v, h, l_t):
     print(np.average(hsv_[:,:,2]))
     print(np.median(hsv_[:,:,2]))
 
+    #remove regions of low saturation, lightness and detail (get scene without shadow)
     if l_t == "slider":
         m = cv2.inRange(hsv_, np.array([0,0,0]), np.array([180,s,l]))
-        m_ = cv2.inRange(hue_s, 0, h)
         mask = cv2.inRange(blur_s, 0, v)
     elif l_t == "average":
         m = cv2.inRange(hsv_, np.array([0,0,0]), np.array([180, int(np.average(hsv_[:,:,1])), int(np.average(hsv_[:,:,2]))]))
-        m_ = cv2.inRange(hue_s, 0, int(np.average(hue_s)))
         mask = cv2.inRange(blur_s, 0, int(np.average(blur_s)))
     elif l_t == "median":
         m = cv2.inRange(hsv_, np.array([0,0,0]), np.array([180, int(np.median(hsv_[:,:,1])), int(np.median(hsv_[:,:,2]))]))
-        m_ = cv2.inRange(hue_s, 0, int(np.median(hue_s)))
         mask = cv2.inRange(blur_s, 0, int(np.median(blur_s)))
         
     masks = np.bitwise_and(m, mask)
-    masks = np.bitwise_and(m_, masks)
     frame_[masks==0] = (0,0,0)
     
     
@@ -289,7 +278,7 @@ def sortFiles(e):
     e = e.split('/')
     return e[len(e)-1]
 
-def loadf(f, s, l, v, h, l_t, r_bg):
+def loadf(f, s, l, v, l_t, r_bg):
     if f != None and f[0] != None:
         f.sort(key=sortFiles)
         fnew = []
@@ -300,7 +289,7 @@ def loadf(f, s, l, v, h, l_t, r_bg):
                 fl = sharpest(fl, i)
 
             if r_bg == True:
-                fl = remove_bg(fl, s, l, v, h, l_t)
+                fl = remove_bg(fl, s, l, v, l_t)
                 
             fnew.append(fl)
 
@@ -344,11 +333,10 @@ with gr.Blocks() as demo:
                     with gr.Tab(label="Shadow maximums"):
                         max_s = gr.Slider(minimum=0, maximum=255, step=1, value=32, label="Saturation")
                         max_l = gr.Slider(minimum=0, maximum=255, step=1, value=64, label="Lightness")
-                        max_v = gr.Slider(minimum=0, maximum=255, step=1, value=16, label="Texture")
-                        max_h = gr.Slider(minimum=0, maximum=255, step=1, value=127, label="Hue variance")
+                        max_v = gr.Slider(minimum=0, maximum=255, step=1, value=16, label="Detail")
                     lt = gr.Radio(label="Maximum is", choices=["average", "median", "slider"], value="slider")
                     rbg = gr.Checkbox(label="Remove background", value=True)
-                files_input.upload(fn=loadf, inputs=[files_input, max_s, max_l, max_v, max_h, lt, rbg], outputs=[files_input, gallery_input])
+                files_input.upload(fn=loadf, inputs=[files_input, max_s, max_l, max_v, lt, rbg], outputs=[files_input, gallery_input])
                 with gr.Row():
                     interpolation_slider = gr.Slider(minimum=1, maximum=5, step=1, value=1, label="Interpolation Steps: ")
                     interpolation = gr.Number(value=1, show_label=False, interactive=False)
@@ -366,10 +354,10 @@ with gr.Blocks() as demo:
     gr.Examples(
         examples=[[
             ["./examples/0.png", "./examples/1.png", "./examples/2.png", "./examples/3.png", "./examples/4.png"], 
-            32, 64, 16, 127, "slider", True
+            32, 64, 16, "slider", True
         ]],
         fn=loadf,
-        inputs=[files_input, max_s, max_l, max_v, max_h, lt, rbg],
+        inputs=[files_input, max_s, max_l, max_v, lt, rbg],
         outputs=[files_input, gallery_input],
         cache_examples=True
     )