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

bugfix modes

Browse source
This commit is contained in:
Jan 2021-11-26 12:21:25 +01:00
commit e9f923b582
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/imagelib/blursharpen.py
View file

@ -39,7 +39,7 @@ def blursharpen (img, sharpen_mode=0, kernel_size=3, amount=100):
def gaussian_sharpen(img, amount=100, sigma=1.0):
img = cv2.addWeighted(img, 1.0 + (0.05 * amount), cv2.GaussianBlur(img, (0, 0), sigma), -(0.05 * amount), 0)
return np.clip(img, 0, 1, out=img)
return img
def unsharpen_mask(img, amount=100, sigma=0.0, threshold = (5.0 / 255.0)):
radius = max(1, round(img.shape[0] * (amount / 100)))

9
merger/MergeMasked.py
View file

@ -61,14 +61,13 @@ 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 = np.clip(dst_face_mask_a_0, 0, 1)
if cfg.pre_sharpen_power != 0:
if cfg.pre_sharpen_mode:
if cfg.pre_sharpen_mode > 0 and cfg.pre_sharpen_power != 0:
if cfg.pre_sharpen_mode==1:
dst_face_bgr = imagelib.gaussian_sharpen(dst_face_bgr, amount=cfg.pre_sharpen_power)
else:
elif cfg.pre_sharpen_mode==2:
dst_face_bgr = imagelib.unsharpen_mask(dst_face_bgr, amount=cfg.pre_sharpen_power)
#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)
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) )

2
merger/MergerConfig.py
View file

@ -97,7 +97,7 @@ mask_mode_dict = {0:'full',
ctm_dict = { 0: "None", 1:"rct", 2:"lct", 3:"mkl", 4:"mkl-m", 5:"idt", 6:"idt-m", 7:"sot-m", 8:"mix-m" }
ctm_str_dict = {None:0, "rct":1, "lct":2, "mkl":3, "mkl-m":4, "idt":5, "idt-m":6, "sot-m":7, "mix-m":8 }
pre_sharpen_dict = {0:'gaussian', 1:'unsharpen_mask'}
pre_sharpen_dict = {0:"None", 1:'gaussian', 2:'unsharpen_mask'}
class MergerConfigMasked(MergerConfig):