Merge branch 'feat/png-face-extraction' of https://github.com/faceshiftlabs/DeepFaceLab

This commit is contained in:
Brigham Lysenko 2019-08-11 15:25:39 -06:00
commit e89c191ddc

View file

@ -135,7 +135,7 @@ class ExtractSubprocessor(Subprocessor):
if filename_path.suffix == '.png':
src_dflimg = DFLPNG.load ( str(filename_path) )
if filename_path.suffix == '.jpg':
src_dflimg = DFLJPG.load ( str(filename_path) )
src_dflimg = DFLPNG.load ( str(filename_path) )
if 'rects' in self.type:
if min(w,h) < 128:
@ -248,10 +248,10 @@ class ExtractSubprocessor(Subprocessor):
if str(filename_path) != str(output_file):
shutil.copy ( str(filename_path), str(output_file) )
else:
output_file = '{}_{}{}'.format(str(self.final_output_path / filename_path.stem), str(face_idx), '.jpg')
cv2_imwrite(output_file, face_image, [int(cv2.IMWRITE_JPEG_QUALITY), 85] )
output_file = '{}_{}{}'.format(str(self.final_output_path / filename_path.stem), str(face_idx), '.png')
cv2_imwrite(output_file, face_image, [int(cv2.IMWRITE_PNG_COMPRESSION), 0] )
DFLJPG.embed_data(output_file, face_type=FaceType.toString(self.face_type),
DFLPNG.embed_data(output_file, face_type=FaceType.toString(self.face_type),
landmarks=face_image_landmarks.tolist(),
source_filename=filename_path.name,
source_rect=rect,