refactoring

apps/DeepFaceLive/backend/BackendBase.py

@@ -8,7 +8,7 @@ from xlib import time as lib_time
 from xlib.mp import csw as lib_csw
 from xlib.python.EventListener import EventListener
 
-from xlib.facemeta import FRect, FLandmarks2D, FPose
+from xlib.face import FRect, FLandmarks2D, FPose
 
 class BackendFaceSwapInfo:
     def __init__(self):

apps/DeepFaceLive/backend/FaceDetector.py

@@ -4,7 +4,7 @@ from enum import IntEnum
 import numpy as np
 from modelhub import onnx as onnx_models
 from xlib import os as lib_os
-from xlib.facemeta import FRect
+from xlib.face import FRect
 from xlib.image import ImageProcessor
 from xlib.mp import csw as lib_csw
 from xlib.python import all_is_not_None

apps/DeepFaceLive/backend/FaceMarker.py

@@ -5,7 +5,7 @@ from modelhub import onnx as onnx_models
 from modelhub import cv as cv_models
 
 from xlib import os as lib_os
-from xlib.facemeta import ELandmarks2D, FLandmarks2D, FPose
+from xlib.face import ELandmarks2D, FLandmarks2D, FPose
 from xlib.image import ImageProcessor
 from xlib.mp import csw as lib_csw
 

apps/trainers/FaceAligner/FaceAlignerTrainer.py

@@ -1,18 +1,18 @@
-from xlib import facemeta as lib_fm
+from xlib import face as lib_face
 from xlib import time as lib_time
 
 
 class FaceAlignerTrainer:
     def __init__(self, faceset_path):
-        #fs = self._fs = lib_fm.Faceset(faceset_path)
-        fs = lib_fm.Faceset(faceset_path)
+        #fs = self._fs = lib_face.Faceset(faceset_path)
+        fs = lib_face.Faceset(faceset_path)
         #fs.close()
         
         with lib_time.timeit():
             for x in fs.iter_UImage():
                 x.get_image()
-            #fs = lib_fm.Faceset(faceset_path)
-            #fs.add_UFaceMark( [ lib_fm.UFaceMark() for _ in range(1000)] )
+            #fs = lib_face.Faceset(faceset_path)
+            #fs.add_UFaceMark( [ lib_face.UFaceMark() for _ in range(1000)] )
             
         import code
         code.interact(local=dict(globals(), **locals()))