OSSForks/faceswap
1
0
Fork 0
mirror of https://github.com/zebrajr/faceswap.git synced 2026-01-15 12:15:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: Correctly generate thumbnails for alignments when frames are missing

Browse Source
This commit is contained in:
torzdf
2025-11-06 17:51:56 +00:00
parent bcb85b77c2
commit 57027092af
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/image.py
View File

@@ -1087,21 +1087,22 @@ class ImagesLoader(ImageIO):
self._fps = self._get_fps()
self._count = None
self._file_list = None
self._file_list: list[str] = []
self._get_count_and_filelist(fast_count, count)
@property
def count(self):
def count(self) -> int:
""" int: The number of images or video frames in the source location. This count includes
any files that will ultimately be skipped if a :attr:`skip_list` has been provided. See
also: :attr:`process_count`"""
assert self._count is not None
return self._count
@property
def process_count(self):
def process_count(self) -> int:
""" int: The number of images or video frames to be processed (IE the total count less
items that are to be skipped from the :attr:`skip_list`)"""
return self._count - len(self._skip_list)
return self.count - len(self._skip_list)
@property
def is_video(self):
@@ -1115,10 +1116,10 @@ class ImagesLoader(ImageIO):
return self._fps
@property
def file_list(self):
""" list: A full list of files in the source location. This includes any files that will
ultimately be skipped if a :attr:`skip_list` has been provided. If the input is a video
then this is a list of dummy filenames as corresponding to an alignments file """
def file_list(self) -> list[str]:
""" list[str]: A full list of files in the source location. This includes any files that
will ultimately be skipped if a :attr:`skip_list` has been provided. If the input is a
video then this is a list of dummy filenames as corresponding to an alignments file """
return self._file_list
def add_skip_list(self, skip_list):
@@ -1436,7 +1437,7 @@ class SingleFrameLoader(ImagesLoader):
self._video_meta_data = video_meta_data
super()._get_count_and_filelist(fast_count, count)
def image_from_index(self, index):
def image_from_index(self, index: int) -> tuple[str, np.ndarray]:
""" Return a single image from :attr:`file_list` for the given index.
Parameters
@@ -1468,7 +1469,7 @@ class SingleFrameLoader(ImagesLoader):
else:
file_list = [f for idx, f in enumerate(self._file_list)
if idx not in self._skip_list] if self._skip_list else self._file_list
filename = file_list[index]
image = read_image(filename, raise_error=True)
filename = os.path.basename(filename)

12
tools/manual/thumbnails.py
View File

@@ -170,14 +170,18 @@ class ThumbsCreator():
thread for some speed up.
"""
reader = SingleFrameLoader(self._location)
num_threads = min(reader.count, self._num_threads)
frame_split = reader.count // self._num_threads
skip_list = [idx for idx, f in enumerate(reader.file_list)
if os.path.basename(f) not in self._alignments.data]
if skip_list:
reader.add_skip_list(skip_list)
num_threads = min(reader.process_count, self._num_threads)
frame_split = reader.process_count // self._num_threads
logger.debug("total images: %s, num_threads: %s, frames_per_thread: %s",
reader.count, num_threads, frame_split)
reader.process_count, num_threads, frame_split)
for idx in range(num_threads):
is_final = idx == num_threads - 1
start_idx = idx * frame_split
end_idx = reader.count if is_final else start_idx + frame_split
end_idx = reader.process_count if is_final else start_idx + frame_split
thread = MultiThread(self._load_from_folder, reader, start_idx, end_idx)
thread.start()
self._threads.append(thread)