mirror of
https://github.com/iperov/DeepFaceLab.git
synced 2025-08-19 13:09:56 -07:00
Merge pull request #1 from faceshiftlabs/pull-request/fix/fs-aug-random-seeding
Fixes bug in fs-aug implementation
This commit is contained in:
commit
239e0fdd5d
2 changed files with 16 additions and 14 deletions
|
@ -1,7 +1,7 @@
|
|||
import cv2
|
||||
import numpy as np
|
||||
from numpy import linalg as npla
|
||||
from random import random, shuffle, choice
|
||||
import random
|
||||
from scipy.stats import special_ortho_group
|
||||
import scipy as sp
|
||||
|
||||
|
@ -371,23 +371,24 @@ def color_transfer(ct_mode, img_src, img_trg):
|
|||
|
||||
|
||||
# imported from faceswap
|
||||
def color_augmentation(img):
|
||||
def color_augmentation(img, seed=None):
|
||||
""" Color adjust RGB image """
|
||||
face = img
|
||||
face = np.clip(face*255.0, 0, 255).astype(np.uint8)
|
||||
face = random_clahe(face)
|
||||
face = random_lab(face)
|
||||
face = random_clahe(face, seed)
|
||||
face = random_lab(face, seed)
|
||||
img[:, :, :3] = face
|
||||
return (face / 255.0).astype(np.float32)
|
||||
|
||||
|
||||
def random_lab(image):
|
||||
def random_lab(image, seed=None):
|
||||
""" Perform random color/lightness adjustment in L*a*b* colorspace """
|
||||
random.seed(seed)
|
||||
amount_l = 30 / 100
|
||||
amount_ab = 8 / 100
|
||||
randoms = [(random() * amount_l * 2) - amount_l, # L adjust
|
||||
(random() * amount_ab * 2) - amount_ab, # A adjust
|
||||
(random() * amount_ab * 2) - amount_ab] # B adjust
|
||||
randoms = [(random.random() * amount_l * 2) - amount_l, # L adjust
|
||||
(random.random() * amount_ab * 2) - amount_ab, # A adjust
|
||||
(random.random() * amount_ab * 2) - amount_ab] # B adjust
|
||||
image = cv2.cvtColor( # pylint:disable=no-member
|
||||
image, cv2.COLOR_BGR2LAB).astype("float32") / 255.0 # pylint:disable=no-member
|
||||
|
||||
|
@ -400,15 +401,16 @@ def random_lab(image):
|
|||
cv2.COLOR_LAB2BGR) # pylint:disable=no-member
|
||||
return image
|
||||
|
||||
def random_clahe(image):
|
||||
def random_clahe(image, seed=None):
|
||||
""" Randomly perform Contrast Limited Adaptive Histogram Equalization """
|
||||
contrast_random = random()
|
||||
random.seed(seed)
|
||||
contrast_random = random.random()
|
||||
if contrast_random > 50 / 100:
|
||||
return image
|
||||
|
||||
# base_contrast = image.shape[0] // 128
|
||||
base_contrast = 1 # testing because it breaks on small sizes
|
||||
grid_base = random() * 4
|
||||
grid_base = random.random() * 4
|
||||
contrast_adjustment = int(grid_base * (base_contrast / 2))
|
||||
grid_size = base_contrast + contrast_adjustment
|
||||
|
||||
|
|
|
@ -204,7 +204,7 @@ class SampleProcessor(object):
|
|||
# Apply random color transfer
|
||||
if ct_mode is not None and ct_sample is not None or ct_mode == 'fs-aug':
|
||||
if ct_mode == 'fs-aug':
|
||||
img = imagelib.color_augmentation(img)
|
||||
img = imagelib.color_augmentation(img, sample_rnd_seed)
|
||||
else:
|
||||
if ct_sample_bgr is None:
|
||||
ct_sample_bgr = ct_sample.load_bgr()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue