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

Bugfix: Alignments tool sorting error in 'from-faces'

Browse Source
This commit is contained in:
torzdf 2022-09-23 19:48:48 +01:00
parent 8776e21629
commit fba2e6e851
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/extract/_config.py
View File

@ -67,9 +67,9 @@ class Config(FaceswapConfig):
section=section,
title="aligner_distance",
datatype=float,
min_max=(0.0, 25.0),
min_max=(0.0, 45.0),
rounding=1,
default=15,
default=22.5,
group="filters",
info="Filters out faces who's landmarks are above this distance from an 'average' "
"face. Values above 15 tend to be fairly safe. Values above 10 will remove more "

16
tools/alignments/jobs.py
View File

@ -2,6 +2,7 @@
""" Tools for manipulating the alignments serialized file """
import logging
from operator import itemgetter
import os
import sys
from datetime import datetime
@ -850,10 +851,10 @@ class FromFaces(): # pylint:disable=too-few-public-methods
def _sort_alignments(self,
alignments: Dict[str, Dict[str, List[Tuple[int,
AlignmentFileDict,
str,
dict]]]]
) -> Dict[str, Dict[str, List[AlignmentFileDict]]] :
AlignmentFileDict,
str,
dict]]]]
) -> Dict[str, Dict[str, List[AlignmentFileDict]]]:
""" Sort the faces into face index order as they appeared in the original alignments file.
If the face index stored in the png header does not match it's position in the alignments
@ -878,10 +879,11 @@ class FromFaces(): # pylint:disable=too-few-public-methods
this_file: Dict[str, List[AlignmentFileDict]] = {}
for frame in tqdm(sorted(frames), desc=f"Sorting {fname}", leave=False):
this_file[frame] = []
for real_idx, (f_id, alignment, f_path, f_src) in enumerate(sorted(frames[frame])):
for real_idx, (f_id, almt, f_path, f_src) in enumerate(sorted(frames[frame],
key=itemgetter(0))):
if real_idx != f_id:
self._update_png_header(f_path, real_idx, alignment, f_src)
this_file[frame].append(alignment)
self._update_png_header(f_path, real_idx, almt, f_src)
this_file[frame].append(almt)
aln_sorted[fname] = this_file
return aln_sorted