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

added converter option --use-predicted-mask . By default converter uses model's predicted mask, but now you can use DST mask.

Browse source
This commit is contained in:
iperov 2018-12-19 23:28:48 +04:00
parent f32a44a778
commit b2d28e0b95
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.py
View file

@ -132,6 +132,11 @@ if __name__ == "__main__":
except: except:
arguments.hist_match_threshold = 255 arguments.hist_match_threshold = 255
try:
arguments.use_predicted_mask = bool ( {"1":True,"0":False}[input("Use predicted mask? [0 or 1] (default 1) : ").lower()] )
except:
arguments.use_predicted_mask = False
try: try:
arguments.erode_mask_modifier = int ( input ("Choose erode mask modifier [-200..200] (default 0) : ") ) arguments.erode_mask_modifier = int ( input ("Choose erode mask modifier [-200..200] (default 0) : ") )
except: except:
@ -179,6 +184,7 @@ if __name__ == "__main__":
mode = arguments.mode, mode = arguments.mode,
masked_hist_match = arguments.masked_hist_match, masked_hist_match = arguments.masked_hist_match,
hist_match_threshold = arguments.hist_match_threshold, hist_match_threshold = arguments.hist_match_threshold,
use_predicted_mask = arguments.use_predicted_mask,
erode_mask_modifier = arguments.erode_mask_modifier, erode_mask_modifier = arguments.erode_mask_modifier,
blur_mask_modifier = arguments.blur_mask_modifier, blur_mask_modifier = arguments.blur_mask_modifier,
output_face_scale_modifier = arguments.output_face_scale_modifier, output_face_scale_modifier = arguments.output_face_scale_modifier,
@ -198,6 +204,7 @@ if __name__ == "__main__":
convert_parser.add_argument('--mode', dest="mode", choices=['seamless','hist-match', 'hist-match-bw','seamless-hist-match'], default='seamless', help="Face overlaying mode. Seriously affects result.") convert_parser.add_argument('--mode', dest="mode", choices=['seamless','hist-match', 'hist-match-bw','seamless-hist-match'], default='seamless', help="Face overlaying mode. Seriously affects result.")
convert_parser.add_argument('--masked-hist-match', type=str2bool, nargs='?', const=True, default=True, help="True or False. Excludes background for hist match. Default - True.") convert_parser.add_argument('--masked-hist-match', type=str2bool, nargs='?', const=True, default=True, help="True or False. Excludes background for hist match. Default - True.")
convert_parser.add_argument('--hist-match-threshold', type=int, dest="hist_match_threshold", default=255, help="Hist match threshold. Decrease to hide artifacts of hist match. Valid range [0..255]. Default 255") convert_parser.add_argument('--hist-match-threshold', type=int, dest="hist_match_threshold", default=255, help="Hist match threshold. Decrease to hide artifacts of hist match. Valid range [0..255]. Default 255")
convert_parser.add_argument('--use-predicted-mask', action="store_true", dest="use_predicted_mask", default=True, help="Use predicted mask by model. Default - True.")
convert_parser.add_argument('--erode-mask-modifier', type=int, dest="erode_mask_modifier", default=0, help="Automatic erode mask modifier. Valid range [-200..200].") convert_parser.add_argument('--erode-mask-modifier', type=int, dest="erode_mask_modifier", default=0, help="Automatic erode mask modifier. Valid range [-200..200].")
convert_parser.add_argument('--blur-mask-modifier', type=int, dest="blur_mask_modifier", default=0, help="Automatic blur mask modifier. Valid range [-200..200].") convert_parser.add_argument('--blur-mask-modifier', type=int, dest="blur_mask_modifier", default=0, help="Automatic blur mask modifier. Valid range [-200..200].")
convert_parser.add_argument('--output-face-scale-modifier', type=int, dest="output_face_scale_modifier", default=0, help="Output face scale modifier. Valid range [-50..50].") convert_parser.add_argument('--output-face-scale-modifier', type=int, dest="output_face_scale_modifier", default=0, help="Output face scale modifier. Valid range [-50..50].")

6
models/ConverterMasked.py
View file

@ -18,6 +18,7 @@ class ConverterMasked(ConverterBase):
masked_hist_match = True, masked_hist_match = True,
hist_match_threshold = 255, hist_match_threshold = 255,
mode='seamless', mode='seamless',
use_predicted_mask = True,
erode_mask_modifier=0, erode_mask_modifier=0,
blur_mask_modifier=0, blur_mask_modifier=0,
output_face_scale_modifier=0.0, output_face_scale_modifier=0.0,
@ -31,6 +32,7 @@ class ConverterMasked(ConverterBase):
self.predictor_input_size = predictor_input_size self.predictor_input_size = predictor_input_size
self.output_size = output_size self.output_size = output_size
self.face_type = face_type self.face_type = face_type
self.use_predicted_mask = use_predicted_mask
self.erode_mask = erode_mask self.erode_mask = erode_mask
self.blur_mask = blur_mask self.blur_mask = blur_mask
self.clip_border_mask_per = clip_border_mask_per self.clip_border_mask_per = clip_border_mask_per
@ -82,6 +84,10 @@ class ConverterMasked(ConverterBase):
prd_face_bgr = np.clip (predicted_bgra[:,:,0:3], 0, 1.0 ) prd_face_bgr = np.clip (predicted_bgra[:,:,0:3], 0, 1.0 )
prd_face_mask_a_0 = np.clip (predicted_bgra[:,:,3], 0.0, 1.0) prd_face_mask_a_0 = np.clip (predicted_bgra[:,:,3], 0.0, 1.0)
if not self.use_predicted_mask:
prd_face_mask_a_0 = predictor_input_mask_a_0
prd_face_mask_a_0[ prd_face_mask_a_0 < 0.001 ] = 0.0 prd_face_mask_a_0[ prd_face_mask_a_0 < 0.001 ] = 0.0
prd_face_mask_a = np.expand_dims (prd_face_mask_a_0, axis=-1) prd_face_mask_a = np.expand_dims (prd_face_mask_a_0, axis=-1)