1

merger/FrameInfo.py

@@ -1,9 +1,8 @@
 from pathlib import Path
 
 class FrameInfo(object):
-    def __init__(self, filename=None, landmarks_list=None):
-        self.filename = filename
-        self.filename_short = str(Path(filename).name)
+    def __init__(self, filepath=None, landmarks_list=None):
+        self.filepath = filepath
         self.landmarks_list = landmarks_list or []
         self.motion_deg = 0
         self.motion_power = 0

merger/MergeMasked.py

@@ -334,7 +334,7 @@ def MergeMaskedFace (predictor_func, predictor_input_shape, cfg, frame_info, img
 
 
 def MergeMasked (predictor_func, predictor_input_shape, cfg, frame_info):
-    img_bgr_uint8 = cv2_imread(frame_info.filename)
+    img_bgr_uint8 = cv2_imread(frame_info.filepath)
     img_bgr_uint8 = imagelib.normalize_channels (img_bgr_uint8, 3)
     img_bgr = img_bgr_uint8.astype(np.float32) / 255.0