Update app.py

app.py

@@ -161,10 +161,10 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits'):
 
             cv2.imwrite(f"f{count}.jpg", raw_frame)
             orig_frames.append(f"f{count}.jpg")
-            masks.append(f"f{count}.jpg")
             
             cv2.imwrite(f"f{count}_dmap.jpg", depth_color)
             depth_frames.append(f"f{count}_dmap.jpg")
+            masks.append(f"f{count}_dmap.jpg")
             count += 1
 
         final_vid = create_video(depth_frames, frame_rate, "depth")
@@ -241,8 +241,7 @@ def pano_depth_to_world_points(depth):
 def rgb2gray(rgb):
     return np.dot(rgb[...,:3], [0.333, 0.333, 0.333])
 
-def get_mesh(image, mask, blur_data, loadall):
-    global depths
+def get_mesh(image, depth, blur_data, loadall):
     global locations
     global mesh
     if loadall == False:
@@ -250,9 +249,8 @@ def get_mesh(image, mask, blur_data, loadall):
     fnum = frame_selected
 
     #print(depth["composite"])
-    print(depths[fnum])
-    blur_img = blur_image(mask["composite"], cv2.cvtColor(depths[fnum], cv2.COLOR_RGB2GRAY), blur_data)
-    gdepth = rgb2gray(depths[fnum])
+    blur_img = blur_image(image[fnum][0], depth["composite"], blur_data)
+    gdepth = rgb2gray(depth["composite"])
     
     print('depth to gray - ok')
     points = pano_depth_to_world_points(gdepth)
@@ -299,8 +297,8 @@ def blur_image(image, depth, blur_data):
     j = 0
     while j < 256:
         i = 255 - j
-        blur_lo = i
-        blur_hi = i+1
+        blur_lo = [i,i,i]
+        blur_hi = [i+1,i+1,i+1]
         blur_mask = cv2.inRange(depth, blur_lo, blur_hi)
         
         print(f'kernel size {int(blur_a[j])}')
@@ -352,12 +350,7 @@ def draw_mask(v, d, evt: gr.EventData):
     print(mask)
     mask0 = mask[0]
     newmask = np.where((mask0==2)|(mask0==0),1,0).astype('uint8')
-
-    d["layers"][0][mask0==2] = (0,0,0,255)
-    d["layers"][0][mask0==0] = (0,0,0,255)
     d["composite"] = cv2.cvtColor(rgb*newmask[:,:,np.newaxis], cv2.COLOR_RGB2RGBA)
-    d["composite"][mask0==2] = (0,0,0,0)
-    d["composite"][mask0==0] = (0,0,0,0)
     
     return gr.ImageEditor(value=d)