2 files changed, 24 insertions, 5 deletions
diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index fea47572..c256635b 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -21,6 +21,7 @@ DataStoreVar = click_utils.ParamVar(types.DataStore)
 # Face analysis
 HaarCascadeVar = click_utils.ParamVar(types.HaarCascade)
 FaceDetectNetVar = click_utils.ParamVar(types.FaceDetectNet)
+FaceExtractorVar = click_utils.ParamVar(types.FaceExtractor)
 FaceLandmark2D_5Var = click_utils.ParamVar(types.FaceLandmark2D_5)
 FaceLandmark2D_68Var = click_utils.ParamVar(types.FaceLandmark2D_68)
 FaceLandmark3D_68Var = click_utils.ParamVar(types.FaceLandmark3D_68)
@@ -96,8 +97,12 @@ HASH_TREE_DEPTH = 3
 HASH_BRANCH_SIZE = 3
 
 DLIB_FACEREC_JITTERS = 5  # number of face recognition jitters
-DLIB_FACEREC_PADDING = 0.25  # default dlib
-
+#DLIB_FACEREC_PADDING = 0.25  # default dlib
+FACEREC_PADDING = 0.3  # VGG FACE2 recommended
+DEFAULT_SIZE_FACE_DETECT = (480,480)
+DEFAULT_JITTER_AMT = 0.015  # used for OpenCV DNN face detector with VGG2 face feature extractor
+DEFAULT_NUM_JITTERS = 4  # used for smothing the facial feature extraction
+DEFAULT_FACE_PADDING_VGG_FACE2 = 0.3
 POSE_MINMAX_YAW = (-25,25)
 POSE_MINMAX_ROLL = (-15,15)
 POSE_MINMAX_PITCH = (-10,10)
@@ -105,6 +110,13 @@ POSE_MINMAX_PITCH = (-10,10)
 POSE_MINMAX_YAW = (-40,40)
 POSE_MINMAX_ROLL = (-35,35)
 POSE_MINMAX_PITCH = (-25,25)
+
+# -----------------------------------------------------------------------------
+# Pandas data
+# -----------------------------------------------------------------------------
+
+FILE_RECORD_DTYPES = {'fn':str, 'subdir': str}
+
 # -----------------------------------------------------------------------------
 # Logging options exposed for custom click Params
 # -----------------------------------------------------------------------------
diff --git a/megapixels/app/settings/types.py b/megapixels/app/settings/types.py
index 1d77fdbd..7a34ccc2 100644
--- a/megapixels/app/settings/types.py
+++ b/megapixels/app/settings/types.py
@@ -43,10 +43,12 @@ class LogLevel(Enum):
 
 class Metadata(Enum):
   IDENTITY, FILE_RECORD, FACE_VECTOR, FACE_POSE, \
-  FACE_ROI, FACE_LANDMARK_2D_68, FACE_LANDMARK_2D_5,FACE_LANDMARK_3D_68 = range(8)
+    FACE_ROI, FACE_LANDMARK_2D_68, FACE_LANDMARK_2D_5,FACE_LANDMARK_3D_68, \
+    FACE_ATTRIBUTES = range(9)
 
 class Dataset(Enum):
-  LFW, VGG_FACE2, MSCELEB, UCCS, UMD_FACES, SCUT_FBP, SELFIE_DATASET = range(7)
+  LFW, VGG_FACE2, MSCELEB, UCCS, UMD_FACES, SCUT_FBP, UCF_SELFIE, UTK, \
+    CASIA_WEBFACE, AFW, PUBFIG83, HELEN, PIPA, MEGAFACE = range(14)
 
 
 # ---------------------------------------------------------------------
@@ -54,7 +56,12 @@ class Dataset(Enum):
 # --------------------------------------------------------------------
 class FaceDetectNet(Enum):
   """Scene text detector networks"""
-  HAAR, DLIB_CNN, DLIB_HOG, CVDNN, MTCNN = range(5)
+  HAAR, DLIB_CNN, DLIB_HOG, CVDNN, MTCNN_TF, MTCNN_PT, MTCNN_CAFFE = range(7)
+
+class FaceExtractor(Enum):
+  """Type of face recognition feature extractor"""
+  # TODO deprecate DLIB resnet and use only CVDNN Caffe models
+  DLIB, VGG = range(2)
 
 class FaceLandmark2D_5(Enum):
   DLIB, MTCNN = range(2)