Update app

app.py

@@ -72,7 +72,6 @@ def bb_intersection_over_union(boxA, boxB):
 	return iou
 
 def track_shot(scenefaces):
-	print("Tracking video...")
 	iouThres = 0.5  # Minimum IOU between consecutive face detections
 	tracks = []
 
@@ -128,7 +127,6 @@ def read_video(o, start_idx):
 		return video_stream
 
 def crop_video(avi_dir, tmp_dir, track, cropfile, tight_scale=1):
-	print("Cropping video...")
 	fourcc = cv2.VideoWriter_fourcc(*'XVID')
 	vOut = cv2.VideoWriter(cropfile + '.avi', fourcc, frame_rate, (480, 270))
 
@@ -239,7 +237,6 @@ def inference_video(avi_dir, work_dir, padding=0):
 	return dets
 
 def scene_detect(avi_dir, work_dir):
-	print("Detecting scenes in the video...")
 	video_manager = VideoManager([os.path.join(avi_dir, 'video.avi')])
 	stats_manager = StatsManager()
 	scene_manager = SceneManager(stats_manager)
@@ -300,38 +297,55 @@ def process_video_asd(file, sd_root, work_root, data_root, avi_dir, tmp_dir, wor
 	command = ("ffmpeg -hide_banner -loglevel panic -y -i %s -qscale:v 2 -async 1 -r 25 %s" % (videofile, 
 																os.path.join(avi_dir, 
 																'video.avi')))
-	output = subprocess.call(command, shell=True, stdout=None)
-	if output != 0:
-		return
+	status = subprocess.call(command, shell=True, stdout=None)
+	if status != 0:
+		msg = "Error in pre-processing the video, please check the input video and try again"
+		return msg
 
 	command = ("ffmpeg -hide_banner -loglevel panic -y -i %s -ac 1 -vn -acodec pcm_s16le -ar 16000 %s" % (os.path.join(avi_dir,
 																			 'video.avi'), 
 																			 os.path.join(avi_dir, 
 																			'audio.wav')))
-	output = subprocess.call(command, shell=True, stdout=None)
-	if output != 0:
-		return
+	status = subprocess.call(command, shell=True, stdout=None)
+	if status != 0:
+		msg = "Error in pre-processing the video, please check the input video and try again"
+		return msg
 
-	faces = inference_video(avi_dir, work_dir)
+	try:
+		faces = inference_video(avi_dir, work_dir)
+	except:
+		msg = "Error in pre-processing the video, please check the input video and try again"
+		return msg
 
+	print("Detecting scenes in the video...")
 	try:
 		scene = scene_detect(avi_dir, work_dir)
-	except scenedetect.video_stream.VideoOpenFailure:
-		return
-
+	except:
+		msg = "Error in detecting the scenes in the video, please check the input video and try again"
+		return msg
 	
+	print("Tracking video...")
 	allscenes = []
-	for shot in scene:
-		if shot[1].frame_num - shot[0].frame_num >= min_track:
-			allscenes.append(track_shot(faces[shot[0].frame_num:shot[1].frame_num]))
+	try:
+		for shot in scene:
+			if shot[1].frame_num - shot[0].frame_num >= min_track:
+				allscenes.append(track_shot(faces[shot[0].frame_num:shot[1].frame_num]))
+	except:
+		msg = "Error in pre-processing the video, please check the input video and try again"
+		return msg
 
+	print("Cropping video...")
 	alltracks = []
-	for sc_num in range(len(allscenes)):
-		vidtracks = []
-		for ii, track in enumerate(allscenes[sc_num]):
-			os.makedirs(os.path.join(crop_dir, 'scene_'+str(sc_num)), exist_ok=True)
-			vidtracks.append(crop_video(avi_dir, tmp_dir, track, os.path.join(crop_dir, 'scene_'+str(sc_num), '%05d' % ii)))
-		alltracks.append(vidtracks)
+	try:
+		for sc_num in range(len(allscenes)):
+			vidtracks = []
+			for ii, track in enumerate(allscenes[sc_num]):
+				os.makedirs(os.path.join(crop_dir, 'scene_'+str(sc_num)), exist_ok=True)
+				vidtracks.append(crop_video(avi_dir, tmp_dir, track, os.path.join(crop_dir, 'scene_'+str(sc_num), '%05d' % ii)))
+			alltracks.append(vidtracks)
+	except:
+		msg = "Error in pre-processing the video, please check the input video and try again"
+		return msg
 
 	savepath = os.path.join(work_dir, 'tracks.pckl')
 
@@ -344,6 +358,9 @@ def process_video_asd(file, sd_root, work_root, data_root, avi_dir, tmp_dir, wor
 	copytree(crop_dir, sd_dest_folder)
 	copytree(work_dir, work_dest_folder)
 
+	return "success"
+
+
 @spaces.GPU(duration=140)
 def preprocess_video(path, result_folder, apply_preprocess, padding=20):
 
@@ -1205,14 +1222,13 @@ def preprocess_asd(video_path, result_folder_input):
 	crop_dir = os.path.join(data_dir, 'pycrop')
 	frames_dir = os.path.join(data_dir, 'pyframes')
 
-	process_video_asd(file, sd_root, work_root, data_root, avi_dir, tmp_dir, work_dir, crop_dir, frames_dir)
-
 	print("Pre-processing the input video...")
-	status = subprocess.call("python preprocess/inference_preprocess.py --data_dir={}/temp --sd_root={}/crops --work_root={}/metadata --data_root={}".format(result_folder_input, result_folder_input, result_folder_input, video_path), shell=True)
-	if status != 0:
-		msg = "Error in pre-processing the input video, please check the input video and try again..."
-		return msg
-		
+	status = process_video_asd(file, sd_root, work_root, data_root, avi_dir, tmp_dir, work_dir, crop_dir, frames_dir)
+
+	if status != "success":
+		return status
+	print("Successfully pre-processed the video")
+
 	return "success"
 
 def process_video_syncoffset(video_path, num_avg_frames, apply_preprocess):