Update app.py

app.py

@@ -159,6 +159,7 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits', blur_data
         depth_frames = []
         orig_frames = []
         backup_frames = []
+        comb_frames = []
         thumbnail_old = []
 
         while raw_video.isOpened():
@@ -191,12 +192,12 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits', blur_data
             #white_lo = np.array([250,250,250])
             #white_hi = np.array([255,255,255])
             # mask image to only select white
-            mask = cv2.inRange(depth_gray[0:int(depth_gray.shape[0]/8*7)-1, 0:depth_gray.shape[1]], 250, 255)
+            mask = cv2.inRange(depth_gray[0:int(depth_gray.shape[0]/7*6)-1, 0:depth_gray.shape[1]], 250, 255)
             # change image to black where we found white
-            depth_gray[0:int(depth_gray.shape[0]/8*7)-1, 0:depth_gray.shape[1]][mask>0] = 0
+            depth_gray[0:int(depth_gray.shape[0]/7*6)-1, 0:depth_gray.shape[1]][mask>0] = 0
 
-            mask = cv2.inRange(depth_gray[int(depth_gray.shape[0]/8*7):depth_gray.shape[0], 0:depth_gray.shape[1]], 192, 255)
-            depth_gray[int(depth_gray.shape[0]/8*7):depth_gray.shape[0], 0:depth_gray.shape[1]][mask>0] = 192
+            mask = cv2.inRange(depth_gray[int(depth_gray.shape[0]/7*6):depth_gray.shape[0], 0:depth_gray.shape[1]], 180, 255)
+            depth_gray[int(depth_gray.shape[0]/7*6):depth_gray.shape[0], 0:depth_gray.shape[1]][mask>0] = 180
 
             depth_color = cv2.cvtColor(depth_gray, cv2.COLOR_GRAY2BGR)
             # split_region = np.ones((frame_height, margin_width, 3), dtype=np.uint8) * 255
@@ -222,22 +223,6 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits', blur_data
               thumbnail_old = thumbnail
 
             blur_frame = blur_image(raw_frame, depth_color, blur_data)
-
-            # encoding depth within original video
-            dd = 5
-            cd = 255 / dd
-            mask = cv2.inRange(blur_frame, 255, 255)
-            blur_frame[mask>0] = np.array([254,254,254])
-            blur_frame = (np.floor(blur_frame / dd) * dd).astype(np.uint8)
-            
-            depth_comp = np.round(depth_gray / 2).astype(np.uint8) # 0-96
-            depth_r = np.floor(depth_comp / cd).astype(np.uint8)
-            depth_g = np.floor((depth_comp - depth_r * cd) / cd).astype(np.uint8)
-            depth_b = depth_comp - depth_r * cd - depth_g * cd
-            
-            blur_frame[:,:,0] = blur_frame[:,:,0] + depth_r
-            blur_frame[:,:,1] = blur_frame[:,:,1] + depth_g
-            blur_frame[:,:,2] = blur_frame[:,:,2] + depth_b
             
             cv2.imwrite(f"f{count}.jpg", blur_frame)
             orig_frames.append(f"f{count}.jpg")
@@ -248,6 +233,9 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits', blur_data
             cv2.imwrite(f"f{count}_dmap.jpg", depth_color)
             depth_frames.append(f"f{count}_dmap.jpg")
 
+            comb_frames.append(f"f{count}.jpg")
+            comb_frames.append(f"f{count}_dmap.jpg")
+
             depth_gray = seg_frame(depth_gray, o, b) + 128
             #print(depth_gray[depth_gray>128]-128)
 
@@ -255,7 +243,7 @@ def make_video(video_path, outdir='./vis_video_depth', encoder='vits', blur_data
             masks.append(f"f{count}_mask.jpg")            
             count += 1
 
-        final_vid = create_video(orig_frames, frame_rate, "orig")
+        final_vid = create_video(comb_frames, frame_rate, "orig")
         depth_vid = create_video(depth_frames, frame_rate, "depth")
             
         final_zip = zip_files(orig_frames, depth_frames)