beautify tests

* fix index bug

* fix rounding bug

facefusion/face_store.py

@@ -11,7 +11,7 @@ FACE_STORE : FaceStore = {}
 
 def get_faces(vision_frame : VisionFrame) -> Optional[List[Face]]:
 	if numpy.any(vision_frame):
-		vision_hash = create_hash(vision_frame.tobytes())
+		vision_hash = create_hash(vision_frame.data)
 
 		if FACE_STORE.get(vision_hash):
 			return FACE_STORE.get(vision_hash).get('faces')
@@ -21,7 +21,7 @@ def get_faces(vision_frame : VisionFrame) -> Optional[List[Face]]:
 
 def set_faces(vision_frame : VisionFrame, faces : List[Face]) -> None:
 	if numpy.any(vision_frame):
-		vision_hash = create_hash(vision_frame.tobytes())
+		vision_hash = create_hash(vision_frame.data)
 		FACE_STORE.setdefault(vision_hash,
 		{
 			'lock': threading.Lock()
@@ -30,7 +30,7 @@ def set_faces(vision_frame : VisionFrame, faces : List[Face]) -> None:
 
 def resolve_lock(vision_frame : VisionFrame) -> threading.Lock:
 	if numpy.any(vision_frame):
-		vision_hash = create_hash(vision_frame.tobytes())
+		vision_hash = create_hash(vision_frame.data)
 		return FACE_STORE.setdefault(vision_hash,
 		{
 			'lock': threading.Lock()

facefusion/uis/components/webcam.py

@@ -106,7 +106,7 @@ def start(webcam_device_id : int, webcam_mode : WebcamMode, webcam_resolution :
 				yield capture_vision_frame
 			if webcam_mode in [ 'udp', 'v4l2' ]:
 				try:
-					stream.stdin.write(capture_vision_frame.tobytes())
+					stream.stdin.write(capture_vision_frame.data)
 				except Exception:
 					pass
 

facefusion/video_manager.py

@@ -133,7 +133,7 @@ def get_writer(video_path : str, temp_video_fps : Fps, temp_video_resolution : R
 
 
 def write_video_frame(video_writer : VideoWriter, vision_frame : VisionFrame) -> None:
-	video_writer.get('process').stdin.write(vision_frame.tobytes())
+	video_writer.get('process').stdin.write(vision_frame.data)
 
 
 def close_video_writer(video_writer : VideoWriter) -> bool:

tests/test_video_manager.py

@@ -50,34 +50,35 @@ def test_get_reader() -> None:
 	assert video_metadata.get('resolution') == (426, 226)
 	assert video_metadata.get('fps') == 25.0
 	assert video_metadata.get('frame_total') == 270
+
 	assert get_reader(get_test_example_file('target-240p-25fps.mp4'), 'read_video_frame') is video_reader
 	assert not get_reader(get_test_example_file('target-240p-25fps.mp4'), 'select_video_frames').get('id') == video_reader.get('id')
 
 
 def test_conditional_seek_video_reader() -> None:
 	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'), 'read_video_frame')
-	sequential_frames = {}
+	video_frames = {}
 
 	for frame_number in range(30):
-		sequential_frames[frame_number] = read_video_frame(video_reader)
+		video_frames[frame_number] = read_video_frame(video_reader)
 
 	for frame_number in [ 5, 17, 29 ]:
 		conditional_seek_video_reader(video_reader, frame_number)
 
-		assert numpy.array_equal(read_video_frame(video_reader), sequential_frames.get(frame_number)) is True
+		assert numpy.array_equal(read_video_frame(video_reader), video_frames.get(frame_number)) is True
 
 
 def test_seek_video_reader() -> None:
 	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'), 'read_video_frame')
-	sequential_frames = {}
+	video_frames = {}
 
 	for frame_number in range(30):
-		sequential_frames[frame_number] = read_video_frame(video_reader)
+		video_frames[frame_number] = read_video_frame(video_reader)
 
 	for frame_number in [ 5, 17, 29 ]:
 		seek_video_reader(video_reader, frame_number)
 
-		assert numpy.array_equal(read_video_frame(video_reader), sequential_frames.get(frame_number)) is True
+		assert numpy.array_equal(read_video_frame(video_reader), video_frames.get(frame_number)) is True
 
 
 def test_drain_video_reader() -> None:
@@ -133,6 +134,7 @@ def test_collect_video_frames() -> None:
 
 def test_close_video_reader() -> None:
 	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'), 'select_video_frames')
+
 	read_video_frames(video_reader, 0, 4)
 	close_video_reader(video_reader)
 
@@ -176,6 +178,7 @@ def test_close_video_writer() -> None:
 	create_temp_directory(target_path)
 	video_reader = get_reader(target_path, 'read_video_frame')
 	video_writer = get_writer(target_path, 30.0, (426, 226), (426, 226), 30.0)
+
 	write_video_frame(video_writer, read_video_frame(video_reader))
 
 	assert close_video_writer(video_writer) is True
@@ -186,6 +189,7 @@ def test_clear_video_pool() -> None:
 	create_temp_directory(target_path)
 	video_reader = get_reader(target_path, 'select_video_frames')
 	video_writer = get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0)
+
 	read_video_frames(video_reader, 0, 4)
 	write_video_frame(video_writer, read_video_frame(video_reader))
 	clear_video_pool()