Merge pull request #1199 from mikel-brostrom/cmc_abc

move preprocess to cmc interface class
mikel-brostrom · Nov 22, 2023 · f964fe4 · f964fe4
2 parents e4b02a1 + 7f65222
commit f964fe4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 72 deletions.
diff --git a/boxmot/motion/cmc/cmc_interface.py b/boxmot/motion/cmc/cmc_interface.py
@@ -1,5 +1,6 @@
 # Mikel Broström 🔥 Yolo Tracking 🧾 AGPL-3.0 license
 
+import cv2
 import numpy as np
 from abc import ABC, abstractmethod
 
@@ -21,3 +22,21 @@ def generate_mask(self, img, dets, scale):
                 mask[tlbr[1]:tlbr[3], tlbr[0]:tlbr[2]] = 0
 
         return mask
+
+    def preprocess(self, img):
+
+        # bgr2gray
+        if self.grayscale:
+            img = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
+
+        # resize
+        if self.scale is not None:
+            img = cv2.resize(
+                img,
+                (0, 0),
+                fx=self.scale,
+                fy=self.scale,
+                interpolation=cv2.INTER_LINEAR
+            )
+
+        return img
diff --git a/boxmot/motion/cmc/ecc.py b/boxmot/motion/cmc/ecc.py
@@ -56,24 +56,6 @@ def __init__(
         self.termination_criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, max_iter, eps)
         self.prev_img = None
 
-    def preprocess(self, img):
-
-        # bgr2gray
-        if self.grayscale:
-            img = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
-
-        # resize
-        if self.scale is not None:
-            img = cv2.resize(
-                img,
-                (0, 0),
-                fx=self.scale,
-                fy=self.scale,
-                interpolation=cv2.INTER_LINEAR
-            )
-
-        return img
-
     def apply(self, curr_img, dets):
 
         if self.warp_mode == cv2.MOTION_HOMOGRAPHY:

diff --git a/boxmot/motion/cmc/orb.py b/boxmot/motion/cmc/orb.py
@@ -53,24 +53,6 @@ def __init__(
         self.draw_keypoint_matches = draw_keypoint_matches
         self.align = align
 
-    def preprocess(self, img):
-
-        # bgr2gray
-        if self.grayscale:
-            img = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
-
-        # resize
-        if self.scale is not None:
-            img = cv2.resize(
-                img,
-                (0, 0),
-                fx=self.scale,
-                fy=self.scale,
-                interpolation=cv2.INTER_LINEAR
-            )
-
-        return img
-
     def apply(self, img, dets):
 
         H = np.eye(2, 3)

diff --git a/boxmot/motion/cmc/sift.py b/boxmot/motion/cmc/sift.py
@@ -70,24 +70,6 @@ def __init__(
         self.draw_keypoint_matches = draw_keypoint_matches
         self.align = align
 
-    def preprocess(self, img):
-
-        # bgr2gray
-        if self.grayscale:
-            img = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
-
-        # resize
-        if self.scale is not None:
-            img = cv2.resize(
-                img,
-                (0, 0),
-                fx=self.scale,
-                fy=self.scale,
-                interpolation=cv2.INTER_LINEAR
-            )
-
-        return img
-
     def apply(self, img, dets):
 
         H = np.eye(2, 3)

diff --git a/boxmot/motion/cmc/sof.py b/boxmot/motion/cmc/sof.py
@@ -61,24 +61,6 @@ def __init__(
         self.extractor = cv2.ORB_create(nfeatures=5)
         self.matcher = cv2.BFMatcher(cv2.NORM_HAMMING)
 
-    def preprocess(self, img):
-
-        # bgr2gray
-        if self.grayscale:
-            img = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
-
-        # resize
-        if self.scale is not None:
-            img = cv2.resize(
-                img,
-                (0, 0),
-                fx=self.scale,
-                fy=self.scale,
-                interpolation=cv2.INTER_LINEAR
-            )
-
-        return img
-
     def apply(self, img, dets):
 
         H = np.eye(2, 3)