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

added presharpen option in merger on key bind 8 + 9

Browse source
This commit is contained in:
Jan 2021-11-25 12:24:55 +01:00
commit d3334916d2
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
merger/InteractiveMergerSubprocessor.py
View file

@ -331,6 +331,8 @@ class InteractiveMergerSubprocessor(Subprocessor):
'x' : lambda cfg,shift_pressed: cfg.toggle_mask_mode(), 'x' : lambda cfg,shift_pressed: cfg.toggle_mask_mode(),
'c' : lambda cfg,shift_pressed: cfg.toggle_color_transfer_mode(), 'c' : lambda cfg,shift_pressed: cfg.toggle_color_transfer_mode(),
'n' : lambda cfg,shift_pressed: cfg.toggle_sharpen_mode(), 'n' : lambda cfg,shift_pressed: cfg.toggle_sharpen_mode(),
'9' : lambda cfg,shift_pressed: cfg.add_pre_sharpen_power(1),
'8' : lambda cfg,shift_pressed: cfg.add_pre_sharpen_power(-1),
} }
self.masked_keys = list(self.masked_keys_funcs.keys()) self.masked_keys = list(self.masked_keys_funcs.keys())

4
merger/MergeMasked.py
View file

@ -61,6 +61,10 @@ def MergeMaskedFace (predictor_func, predictor_input_shape,
dst_face_mask_a_0 = cv2.warpAffine( img_face_mask_a, face_mat, (output_size, output_size), flags=cv2.INTER_CUBIC ) dst_face_mask_a_0 = cv2.warpAffine( img_face_mask_a, face_mat, (output_size, output_size), flags=cv2.INTER_CUBIC )
dst_face_mask_a_0 = np.clip(dst_face_mask_a_0, 0, 1) dst_face_mask_a_0 = np.clip(dst_face_mask_a_0, 0, 1)
if cfg.pre_sharpen_power != 0:
dst_face_bgr = cv2.addWeighted(dst_face_bgr, 1.0 + (0.05 * cfg.pre_sharpen_power), cv2.GaussianBlur(dst_face_bgr, (0, 0), 1.0), -(0.05 * cfg.pre_sharpen_power), 0)
dst_face_bgr = np.clip(dst_face_bgr, 0, 1, out=dst_face_bgr)
predictor_input_bgr = cv2.resize (dst_face_bgr, (input_size,input_size) ) predictor_input_bgr = cv2.resize (dst_face_bgr, (input_size,input_size) )
predicted = predictor_func (predictor_input_bgr) predicted = predictor_func (predictor_input_bgr)

13
merger/MergerConfig.py
View file

@ -114,6 +114,7 @@ class MergerConfigMasked(MergerConfig):
image_denoise_power = 0, image_denoise_power = 0,
bicubic_degrade_power = 0, bicubic_degrade_power = 0,
color_degrade_power = 0, color_degrade_power = 0,
pre_sharpen_power = 0,
**kwargs **kwargs
): ):
@ -142,6 +143,7 @@ class MergerConfigMasked(MergerConfig):
self.image_denoise_power = image_denoise_power self.image_denoise_power = image_denoise_power
self.bicubic_degrade_power = bicubic_degrade_power self.bicubic_degrade_power = bicubic_degrade_power
self.color_degrade_power = color_degrade_power self.color_degrade_power = color_degrade_power
self.pre_sharpen_power = pre_sharpen_power
def copy(self): def copy(self):
return copy.copy(self) return copy.copy(self)
@ -188,6 +190,9 @@ class MergerConfigMasked(MergerConfig):
def add_bicubic_degrade_power(self, diff): def add_bicubic_degrade_power(self, diff):
self.bicubic_degrade_power = np.clip ( self.bicubic_degrade_power+diff, 0, 100) self.bicubic_degrade_power = np.clip ( self.bicubic_degrade_power+diff, 0, 100)
def add_pre_sharpen_power(self, diff):
self.pre_sharpen_power = np.clip ( self.pre_sharpen_power+diff, 0, 200)
def ask_settings(self): def ask_settings(self):
s = """Choose mode: \n""" s = """Choose mode: \n"""
for key in mode_dict.keys(): for key in mode_dict.keys():
@ -215,6 +220,9 @@ class MergerConfigMasked(MergerConfig):
self.blur_mask_modifier = np.clip ( io.input_int ("Choose blur mask modifier", 0, add_info="0..400"), 0, 400) self.blur_mask_modifier = np.clip ( io.input_int ("Choose blur mask modifier", 0, add_info="0..400"), 0, 400)
self.motion_blur_power = np.clip ( io.input_int ("Choose motion blur power", 0, add_info="0..100"), 0, 100) self.motion_blur_power = np.clip ( io.input_int ("Choose motion blur power", 0, add_info="0..100"), 0, 100)
self.pre_sharpen_power = np.clip (io.input_int ("Choose pre_sharpen power", 0, help_message="Can enhance results by pre sharping before feeding it to the network.", add_info="0..100" ), 0, 200)
self.output_face_scale = np.clip (io.input_int ("Choose output face scale modifier", 0, add_info="-50..50" ), -50, 50) self.output_face_scale = np.clip (io.input_int ("Choose output face scale modifier", 0, add_info="-50..50" ), -50, 50)
if 'raw' not in self.mode: if 'raw' not in self.mode:
@ -249,7 +257,8 @@ class MergerConfigMasked(MergerConfig):
self.super_resolution_power == other.super_resolution_power and \ self.super_resolution_power == other.super_resolution_power and \
self.image_denoise_power == other.image_denoise_power and \ self.image_denoise_power == other.image_denoise_power and \
self.bicubic_degrade_power == other.bicubic_degrade_power and \ self.bicubic_degrade_power == other.bicubic_degrade_power and \
self.color_degrade_power == other.color_degrade_power self.color_degrade_power == other.color_degrade_power and \
self.pre_sharpen_power == other.pre_sharpen_power
return False return False
@ -285,6 +294,8 @@ class MergerConfigMasked(MergerConfig):
f"""bicubic_degrade_power: {self.bicubic_degrade_power}\n""" f"""bicubic_degrade_power: {self.bicubic_degrade_power}\n"""
f"""color_degrade_power: {self.color_degrade_power}\n""") f"""color_degrade_power: {self.color_degrade_power}\n""")
r += f"""pre_sharpen_power: {self.pre_sharpen_power}\n"""
r += "================" r += "================"
return r return r