update tools

README.md

@@ -1,5 +1,5 @@
 ---
-title: mediapipe-face-crop-and-replace
+title: Mediapipe face crop and replace
 emoji: 📈
 colorFrom: indigo
 colorTo: indigo

app.py

@@ -42,7 +42,32 @@ def select_box(boxes,box_type):
     box = mp_box.xywh_to_xyxy(box)
     return box,box_width,box_height
 
+def resize_image_in_box(image,box_width,box_height,keep_aspect=True,resampling=None):
+
+    aspect_ratio = image.width / image.height
+    if box_width / box_height >= aspect_ratio:
+        new_width = int(box_height * aspect_ratio)
+        new_height = box_height
+    else:
+        new_width = box_width
+        new_height = int(box_width / aspect_ratio)
+
+
+    if resampling == None:#automatic
+        image_area = image.width * image.height
+        if box_width * box_height > image_area:
+            resampling = Image.Resampling.BICUBIC
+        else:
+            resampling = Image.Resampling.LANCZOS
+
+    resized = image.resize((new_width,new_height),resampling)
+    offset_x = int((box_width -new_width)/2)
+    offset_y = int((box_height -new_height)/2)
+    return resized,offset_x,offset_y
+
+
 def process_images(image,replace_image=None,replace_image_need_crop=False,box_type="type-3",fill_color_mode=False,fill_color="black",custom_color="rgba(255,255,255,1)",image_size=1024,margin_percent=0,filter_value="None",match_color=True,progress=gr.Progress(track_tqdm=True)):
+    
     if image == None:
         raise gr.Error("Need Image")
 
@@ -59,18 +84,21 @@ def process_images(image,replace_image=None,replace_image_need_crop=False,box_ty
             replace_boxes,mp_image,face_landmarker_result = mp_box.mediapipe_to_box(replace_image)
             replace_box,replace_box_width,replace_box_height = select_box(replace_boxes,box_type)
 
+        keep_aspect = True
         # this is for fill_color_mode exported image
         if fill_color_mode:
             if replace_image_need_crop:
                 cropped = replace_image.crop(replace_box)
-                cropped.resize((box_width,box_height))
+                cropped,off_x,off_y = resize_image_in_box(cropped,box_width,box_height,keep_aspect)
             else:
                 cropped = replace_image.crop(box)
-
+                off_x = int((box_width -cropped.width)/2)
+                off_y = int((box_height -cropped.height)/2)
+            
             if match_color:
                 cropped = color_match(image.crop(box),cropped)
             #just paste base-face area
-            image.paste(cropped,[box[0],box[1]])
+            image.paste(cropped,[box[0]+off_x,box[1]+off_y])
             return image
         else:#scale mode
                 # box expand by margin
@@ -87,11 +115,14 @@ def process_images(image,replace_image=None,replace_image_need_crop=False,box_ty
 
             if replace_image_need_crop:
                 replace_image = replace_image.crop(replace_box)
-            replace_resized = replace_image.resize((box_width,box_height),Image.Resampling.LANCZOS)
+
+            
+            
+            replace_resized,off_x,off_y = resize_image_in_box(replace_image,box_width,box_height,keep_aspect)
             if match_color:
                 replace_resized = color_match(image.crop(box),replace_resized)
             
-            image.paste(replace_resized,[box[0],box[1]])
+            image.paste(replace_resized,[box[0]+off_x,box[1]+off_y])
             return image
 
 
@@ -238,7 +269,7 @@ with gr.Blocks(css=css, elem_id="demo-container") as demo:
                     with gr.Accordion(label="Advanced Settings", open=False):
                         with gr.Row(equal_height=True):
                             fill_color_mode = gr.Checkbox(label="Fill Color Mode/No Resize",value=False)
-                            match_color = gr.Checkbox(label="Match Color",value=True)
+                            match_color = gr.Checkbox(label="Match Color",value=True,info="skimage match_histograms")
                             margin_percent = gr.Slider(
                                 label="Margin percent",info = "add extra space",
                                 minimum=0,

demo_header.html

@@ -3,11 +3,11 @@
         Mediapipe Face Crop and Replace
     </h1>
     <div  class="grid-container">
-        <img src="https://akjava.github.io/AIDiagramChatWithVoice-FaceCharacter/webp/128/00191245_09_00002200.webp" alt="Mediapipe Face Detection" class="image">
+        <img src="https://akjava.github.io/AIDiagramChatWithVoice-FaceCharacter/webp/128/00426245.webp" alt="Webp-talk-head" class="image">
        
         <p class="text">
             This Space use <a href="http://www.apache.org/licenses/LICENSE-2.0">the Apache 2.0</a> Licensed <a href="https://ai.google.dev/edge/mediapipe/solutions/vision/face_landmarker">Mediapipe FaceLandmarker</a> <br>
-
+            <a href="https://huggingface.co/blog/Akjava/img2img-pre-processing">[Article]</a> Better img2img results with Flux.1 schnell by using ScaleUp or Sharpen or FillColor pre-processing
             
         </p>
     </div>

demo_tools.html

@@ -1,4 +1,10 @@
 <div style="text-align: center;">
-    <p><a href="https://huggingface.co/spaces/Akjava/mediapipe-face-detect">Mediapipe Face detector</a></p>
+    <p>
+        <a href="https://huggingface.co/spaces/Akjava/mediapipe-face-detect">Mediapipe Face detector</a> | 
+        <a href="https://huggingface.co/spaces/Akjava/mediapipe-face-crop-and-replace">Face Crop and Replace</a>  | 
+        <a href="https://huggingface.co/spaces/Akjava/mediapipe-68-points-facial-landmark">68 points landmark</a> | 
+        <a href="https://huggingface.co/spaces/Akjava/mediapipe-68-points-facial-mask">Create 68 points Parts Mask</a> | 
+        <a href="https://huggingface.co/spaces/Akjava/histgram-color-matching">Histgram Color Matching</a>
+    </p>
     <p></p> 
 </div>