Skip to content

Corrects color channels in face restoration; Fixes #1167 #1175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2022
Merged

Corrects color channels in face restoration; Fixes #1167 #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ldm/invoke/restoration/codeformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import numpy as np
import warnings
import sys
import cv2

pretrained_model_url = 'https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth'

Expand Down Expand Up @@ -40,11 +41,12 @@ def process(self, image, strength, device, seed=None, fidelity=0.75):
cf.load_state_dict(checkpoint)
cf.eval()

image = image.convert('RGB')
# Codeformer expects BGR image data
bgrImage = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR)

face_helper = FaceRestoreHelper(upscale_factor=1, use_parse=True, device=device)
face_helper.clean_all()
face_helper.read_image(np.array(image, dtype=np.uint8))
face_helper.read_image(bgrImage)
face_helper.get_face_landmarks_5(resize=640, eye_dist_threshold=5)
face_helper.align_warp_face()

Expand All @@ -71,7 +73,8 @@ def process(self, image, strength, device, seed=None, fidelity=0.75):

restored_img = face_helper.paste_faces_to_input_image()

res = Image.fromarray(restored_img)
# Convert back to RGB for PIL
res = Image.fromarray(cv2.cvtColor(restored_img, cv2.COLOR_BGR2RGB))

if strength < 1.0:
# Resize the image to the new image if the sizes have changed
Expand Down
10 changes: 7 additions & 3 deletions ldm/invoke/restoration/gfpgan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import sys
import numpy as np
import cv2

from PIL import Image

Expand Down Expand Up @@ -53,15 +54,18 @@ def process(self, image, strength: float, seed: str = None):
f'>> Download https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.4.pth to {self.model_path}, \nor change GFPGAN directory with --gfpgan_dir.'
)

image = image.convert('RGB')
# GFPGAN expects BGR image data
bgrImage = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR)

_, _, restored_img = self.gfpgan.enhance(
np.array(image, dtype=np.uint8),
bgrImage,
has_aligned=False,
only_center_face=False,
paste_back=True,
)
res = Image.fromarray(restored_img)

# Convert back to RGB for PIL
res = Image.fromarray(cv2.cvtColor(restored_img, cv2.COLOR_BGR2RGB))

if strength < 1.0:
# Resize the image to the new image if the sizes have changed
Expand Down