change crop-size to crop-margin, to add more context for crop infer

lama_cleaner/lama/__init__.py

@@ -14,16 +14,16 @@ LAMA_MODEL_URL = os.environ.get(
 
 
 class LaMa:
-    def __init__(self, crop_trigger_size: List[int], crop_size: List[int], device):
+    def __init__(self, crop_trigger_size: List[int], crop_margin: int, device):
         """
 
         Args:
             crop_trigger_size: h, w
-            crop_size: h, w
+            crop_margin:
             device:
         """
         self.crop_trigger_size = crop_trigger_size
-        self.crop_size = crop_size
+        self.crop_margin = crop_margin
         self.device = device
 
         if os.environ.get("LAMA_MODEL"):
@@ -79,12 +79,10 @@ class LaMa:
         box_w = box[2] - box[0]
         cx = (box[0] + box[2]) // 2
         cy = (box[1] + box[3]) // 2
-        crop_h, crop_w = self.crop_size
         img_h, img_w = image.shape[1:]
 
-        # TODO: when box_w > crop_w, add some margin around?
-        w = max(crop_w, box_w)
-        h = max(crop_h, box_h)
+        w = box_w + self.crop_margin * 2
+        h = box_h + self.crop_margin * 2
 
         l = max(cx - w // 2, 0)
         t = max(cy - h // 2, 0)
@@ -94,7 +92,7 @@ class LaMa:
         crop_img = image[:, t:b, l:r]
         crop_mask = mask[:, t:b, l:r]
 
-        print(f"Apply zoom in size width x height: {crop_img.shape}")
+        print(f"box size: ({box_h},{box_w}) crop size: {crop_img.shape}")
 
         return self._run(crop_img, crop_mask), [l, t, r, b]
 

lama_cleaner/ldm/__init__.py

@@ -318,8 +318,10 @@ class LDM:
                 cx = box_x + box_w // 2
                 cy = box_y + box_h // 2
 
-                w = max(512, box_w)
-                h = max(512, box_h)
+                # w = max(512, box_w)
+                # h = max(512, box_h)
+                w = box_w + 512
+                h = box_h + 512
 
                 left = max(cx - w // 2, 0)
                 top = max(cy - h // 2, 0)