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

SAE+ConverterMasked now offer default values such as mode, erode, blur, values based on model settings.

Browse source
This commit is contained in:
iperov 2019-02-03 21:44:30 +04:00
parent e226ab5385
commit 707313eb47
2 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
models/ConverterMasked.py
View file

@ -6,6 +6,14 @@ import numpy as np
from utils import image_utils from utils import image_utils
from utils.console_utils import * from utils.console_utils import *
'''
default_mode = {1:'overlay',
2:'hist-match',
3:'hist-match-bw',
4:'seamless',
5:'seamless-hist-match',
6:'raw'}
'''
class ConverterMasked(ConverterBase): class ConverterMasked(ConverterBase):
#override #override
@ -13,8 +21,11 @@ class ConverterMasked(ConverterBase):
predictor_input_size=0, predictor_input_size=0,
output_size=0, output_size=0,
face_type=FaceType.FULL, face_type=FaceType.FULL,
default_mode = 4,
base_erode_mask_modifier = 0, base_erode_mask_modifier = 0,
base_blur_mask_modifier = 0, base_blur_mask_modifier = 0,
default_erode_mask_modifier = 0,
default_blur_mask_modifier = 0,
clip_hborder_mask_per = 0, clip_hborder_mask_per = 0,
**in_options): **in_options):
@ -25,13 +36,16 @@ class ConverterMasked(ConverterBase):
self.clip_hborder_mask_per = clip_hborder_mask_per self.clip_hborder_mask_per = clip_hborder_mask_per
self.TFLabConverter = None self.TFLabConverter = None
mode = input_int ("Choose mode: (1) overlay, (2) hist match, (3) hist match bw, (4) seamless (default), (5) seamless hist match, (6) raw : ", 4) mode = input_int ("Choose mode: (1) overlay, (2) hist match, (3) hist match bw, (4) seamless, (5) seamless hist match, (6) raw. Default - %d : " % (default_mode) , default_mode)
self.mode = {1:'overlay',
mode_dict = {1:'overlay',
2:'hist-match', 2:'hist-match',
3:'hist-match-bw', 3:'hist-match-bw',
4:'seamless', 4:'seamless',
5:'seamless-hist-match', 5:'seamless-hist-match',
6:'raw'}.get (mode, 'seamless') 6:'raw'}
self.mode = mode_dict.get (mode, mode_dict[default_mode] )
if self.mode == 'raw': if self.mode == 'raw':
mode = input_int ("Choose raw mode: (1) rgb, (2) rgb+mask (default), (3) mask only, (4) predicted only : ", 2) mode = input_int ("Choose raw mode: (1) rgb, (2) rgb+mask (default), (3) mask only, (4) predicted only : ", 2)
@ -50,8 +64,8 @@ class ConverterMasked(ConverterBase):
self.use_predicted_mask = input_bool("Use predicted mask? (y/n skip:y) : ", True) self.use_predicted_mask = input_bool("Use predicted mask? (y/n skip:y) : ", True)
if self.mode != 'raw': if self.mode != 'raw':
self.erode_mask_modifier = base_erode_mask_modifier + np.clip ( input_int ("Choose erode mask modifier [-200..200] (skip:0) : ", 0), -200, 200) self.erode_mask_modifier = base_erode_mask_modifier + np.clip ( input_int ("Choose erode mask modifier [-200..200] (skip:%d) : " % (default_erode_mask_modifier), default_erode_mask_modifier), -200, 200)
self.blur_mask_modifier = base_blur_mask_modifier + np.clip ( input_int ("Choose blur mask modifier [-200..200] (skip:0) : ", 0), -200, 200) self.blur_mask_modifier = base_blur_mask_modifier + np.clip ( input_int ("Choose blur mask modifier [-200..200] (skip:%d) : " % (default_blur_mask_modifier), default_blur_mask_modifier), -200, 200)
self.seamless_erode_mask_modifier = 0 self.seamless_erode_mask_modifier = 0
if self.mode == 'seamless' or self.mode == 'seamless-hist-match': if self.mode == 'seamless' or self.mode == 'seamless-hist-match':

11
models/Model_SAE/Model.py
View file

@ -338,8 +338,12 @@ class SAEModel(ModelBase):
def get_converter(self, **in_options): def get_converter(self, **in_options):
from models import ConverterMasked from models import ConverterMasked
base_erode_mask_modifier = 40 if self.options['face_type'] == 'f' else 100 base_erode_mask_modifier = 30 if self.options['face_type'] == 'f' else 100
base_blur_mask_modifier = 10 if self.options['face_type'] == 'f' else 100 base_blur_mask_modifier = 0 if self.options['face_type'] == 'f' else 100
default_erode_mask_modifier = 0
default_blur_mask_modifier = 100 if (self.options['face_style_power'] or self.options['bg_style_power']) and \
self.options['face_type'] == 'f' else 0
face_type = FaceType.FULL if self.options['face_type'] == 'f' else FaceType.HALF face_type = FaceType.FULL if self.options['face_type'] == 'f' else FaceType.HALF
@ -347,8 +351,11 @@ class SAEModel(ModelBase):
predictor_input_size=self.options['resolution'], predictor_input_size=self.options['resolution'],
output_size=self.options['resolution'], output_size=self.options['resolution'],
face_type=face_type, face_type=face_type,
default_mode = 1 if self.options['face_style_power'] or self.options['bg_style_power'] else 4,
base_erode_mask_modifier=base_erode_mask_modifier, base_erode_mask_modifier=base_erode_mask_modifier,
base_blur_mask_modifier=base_blur_mask_modifier, base_blur_mask_modifier=base_blur_mask_modifier,
default_erode_mask_modifier=default_erode_mask_modifier,
default_blur_mask_modifier=default_blur_mask_modifier,
clip_hborder_mask_per=0.0625 if self.options['face_type'] == 'f' else 0, clip_hborder_mask_per=0.0625 if self.options['face_type'] == 'f' else 0,
**in_options) **in_options)