nodes/dchatel-comfyui_facetools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug with new mask

Browse Source
This commit is contained in:
David Chatel
2024-03-13 12:20:51 +01:00
parent 49341156b6
commit 605b429760
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodes.py
+9 -9
View File
@@ -166,8 +166,8 @@ class CropFaces:
masks = []
warps = []
for face in faces:
M, crop = face.crop(crop_size, crop_factor)
mask = mask_crop(face, M, crop*255, mask_type)
M, crop, maskedcrop = face.crop(crop_size, crop_factor)
mask = mask_crop(face, M, maskedcrop, mask_type)
crops.append(np.array(crop))
masks.append(np.array(mask))
warps.append(M)
@@ -228,13 +228,13 @@ class WarpFaceBack:
def run(self, images, face, crop, mask, warp):
groups = defaultdict(list)
for f,c,m,w in zip(face, crop, mask, warp):
gray = cv2.cvtColor(c.numpy(), cv2.COLOR_RGB2GRAY)
_, gray = cv2.threshold(gray, 0.01, 1, cv2.THRESH_BINARY)
gray = gray.astype(np.uint8)
cnts, _ = cv2.findContours(gray, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_NONE)
largeCnts = list(filter(lambda x: cv2.contourArea(x) > 10000, cnts))
gray = cv2.drawContours(gray, largeCnts, -1, 1, -1)
m *= torch.from_numpy(gray)
# gray = cv2.cvtColor(c.numpy(), cv2.COLOR_RGB2GRAY)
# _, gray = cv2.threshold(gray, 0.01, 1, cv2.THRESH_BINARY)
# gray = gray.astype(np.uint8)
# cnts, _ = cv2.findContours(gray, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_NONE)
# largeCnts = list(filter(lambda x: cv2.contourArea(x) > 10000, cnts))
# gray = cv2.drawContours(gray, largeCnts, -1, 1, -1)
# m *= torch.from_numpy(gray)
groups[f.image_idx].append((f.image,c,m,w))
results = []
utils.py
+2 -1
View File
@@ -94,8 +94,9 @@ class Face:
T4 = np.array([[1, 0, cx], [0, 1, cy], [0, 0, 1]])
N = N @ T4 @ S @ T3
crop = cv2.warpAffine(self.image.numpy(), N, (size, size))
maskedcrop = cv2.warpAffine(self.img.numpy(), N, (size, size))
return N, crop
return N, crop, maskedcrop
def detect_faces(img, threshold):
img = pad_to_stride(img, stride=32)