Starting to incorporate MTCNN

This commit is contained in:
Tadas Baltrusaitis
2017-08-18 10:03:01 +01:00
parent a3be476d4d
commit a251415fea
12 changed files with 162 additions and 38 deletions

View File

@@ -69,7 +69,7 @@ CLNF::CLNF(string fname)
CLNF::CLNF(const CLNF& other): pdm(other.pdm), params_local(other.params_local.clone()), params_global(other.params_global), detected_landmarks(other.detected_landmarks.clone()),
landmark_likelihoods(other.landmark_likelihoods.clone()), patch_experts(other.patch_experts), landmark_validator(other.landmark_validator), haar_face_detector_location(other.haar_face_detector_location),
mtcnn_face_detector_location(other.mtcnn_face_detector_location), hierarchical_mapping(other.hierarchical_mapping), hierarchical_models(other.hierarchical_models), hierarchical_model_names(other.hierarchical_model_names),
hierarchical_params(other.hierarchical_params), eye_model(other.eye_model)
hierarchical_params(other.hierarchical_params), eye_model(other.eye_model), face_detector_MTCNN(other.face_detector_MTCNN)
{
this->detection_success = other.detection_success;
this->tracking_initialised = other.tracking_initialised;
@@ -150,9 +150,12 @@ CLNF & CLNF::operator= (const CLNF& other)
this->hierarchical_models = other.hierarchical_models;
this->hierarchical_model_names = other.hierarchical_model_names;
this->hierarchical_params = other.hierarchical_params;
mtcnn_face_detector_location = other.mtcnn_face_detector_location;
face_detector_MTCNN = other.face_detector_MTCNN;
}
face_detector_HOG = dlib::get_frontal_face_detector();
face_detector_HOG = dlib::get_frontal_face_detector();
return *this;
}
@@ -183,6 +186,8 @@ CLNF::CLNF(const CLNF&& other)
face_detector_HOG = dlib::get_frontal_face_detector();
face_detector_MTCNN = other.face_detector_MTCNN;
// Copy over the hierarchical models
this->hierarchical_mapping = other.hierarchical_mapping;
this->hierarchical_models = other.hierarchical_models;
@@ -219,6 +224,8 @@ CLNF & CLNF::operator= (const CLNF&& other)
face_detector_HOG = dlib::get_frontal_face_detector();
face_detector_MTCNN = other.face_detector_MTCNN;
// Copy over the hierarchical models
this->hierarchical_mapping = other.hierarchical_mapping;
this->hierarchical_models = other.hierarchical_models;