github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-08-22 14:24:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Brigham Lysenko 2019-08-12 16:19:27 -06:00
commit ca4979d1a9
1 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

46
mainscripts/Extractor.py
View file

@ -135,7 +135,7 @@ class ExtractSubprocessor(Subprocessor):
if filename_path.suffix == '.png': if filename_path.suffix == '.png':
src_dflimg = DFLPNG.load ( str(filename_path) ) src_dflimg = DFLPNG.load ( str(filename_path) )
if filename_path.suffix == '.jpg': if filename_path.suffix == '.jpg':
src_dflimg = DFLPNG.load ( str(filename_path) ) src_dflimg = DFLJPG.load ( str(filename_path) )
if 'rects' in self.type: if 'rects' in self.type:
if min(w,h) < 128: if min(w,h) < 128:
@ -242,23 +242,35 @@ class ExtractSubprocessor(Subprocessor):
if self.debug_dir is not None: if self.debug_dir is not None:
LandmarksProcessor.draw_rect_landmarks (debug_image, rect, image_landmarks, self.image_size, self.face_type, transparent_mask=True) LandmarksProcessor.draw_rect_landmarks (debug_image, rect, image_landmarks, self.image_size, self.face_type, transparent_mask=True)
if src_dflimg is not None and filename_path.suffix == '.jpg': if filename_path.suffix == '.jpg':
#if extracting from dflimg and jpg copy it in order not to lose quality
output_file = str(self.final_output_path / filename_path.name)
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), '.png')
cv2_imwrite(output_file, face_image, [int(cv2.IMWRITE_PNG_COMPRESSION), 0] )
DFLPNG.embed_data(output_file, face_type=FaceType.toString(self.face_type), # if extracting from dflimg and jpg copy it in order not to lose quality
landmarks=face_image_landmarks.tolist(), output_file = '{}_{}{}'.format(str(self.final_output_path / filename_path.stem),
source_filename=filename_path.name, str(face_idx), '.jpg')
source_rect=rect, if str(filename_path) != str(output_file):
source_landmarks=image_landmarks.tolist(), shutil.copy(str(filename_path), str(output_file))
image_to_face_mat=image_to_face_mat, cv2_imwrite(output_file, face_image, [int(cv2.IMWRITE_JPEG_QUALITY), 95])
pitch_yaw_roll=data.pitch_yaw_roll DFLJPG.embed_data(output_file, face_type=FaceType.toString(self.face_type),
) landmarks=face_image_landmarks.tolist(),
source_filename=filename_path.name,
source_rect=rect,
source_landmarks=image_landmarks.tolist(),
image_to_face_mat=image_to_face_mat,
pitch_yaw_roll=data.pitch_yaw_roll
)
else:
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), 3])
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,
source_landmarks=image_landmarks.tolist(),
image_to_face_mat=image_to_face_mat,
pitch_yaw_roll=data.pitch_yaw_roll
)
data.final_output_files.append (output_file) data.final_output_files.append (output_file)
face_idx += 1 face_idx += 1