ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-05-16 04:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Incorporating MTCNN face detection with CE-CLM.

Browse Source 
Merge remote-tracking branch 'origin/feature/mtcnn_face_det' into feature/CE-CLM

# Conflicts:
#	exe/FaceLandmarkImg/FaceLandmarkImg.cpp
#	exe/FaceLandmarkVid/FaceLandmarkVid.cpp
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	lib/local/LandmarkDetector/LandmarkDetector.vcxproj
#	lib/local/LandmarkDetector/LandmarkDetector.vcxproj.filters
#	lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp
#	lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
This commit is contained in:
Tadas Baltrusaitis
2017-08-26 13:23:16 +01:00
parent 3f2e6f228a 92dde3b80f
commit e8e93c3f96
52 changed files with 3135 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/local/LandmarkDetector/src/LandmarkDetectorModel.cpp
View File

@@ -67,9 +67,9 @@ CLNF::CLNF(string fname)
// Copy constructor (makes a deep copy of CLNF)
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), face_detector_location(other.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)
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), face_detector_MTCNN(other.face_detector_MTCNN)
{
this->detection_success = other.detection_success;
this->tracking_initialised = other.tracking_initialised;
@@ -78,9 +78,9 @@ CLNF::CLNF(const CLNF& other): pdm(other.pdm), params_local(other.params_local.c
this->failures_in_a_row = other.failures_in_a_row;
// Load the CascadeClassifier (as it does not have a proper copy constructor)
if(!face_detector_location.empty())
if(!haar_face_detector_location.empty())
{
this->face_detector_HAAR.load(face_detector_location);
this->face_detector_HAAR.load(haar_face_detector_location);
}
// Make sure the matrices are allocated properly
this->triangulations.resize(other.triangulations.size());
@@ -114,7 +114,8 @@ CLNF & CLNF::operator= (const CLNF& other)
landmark_likelihoods =other.landmark_likelihoods.clone();
patch_experts = Patch_experts(other.patch_experts);
landmark_validator = DetectionValidator(other.landmark_validator);
face_detector_location = other.face_detector_location;
haar_face_detector_location = other.haar_face_detector_location;
mtcnn_face_detector_location = other.mtcnn_face_detector_location;
this->detection_success = other.detection_success;
this->tracking_initialised = other.tracking_initialised;
@@ -125,9 +126,9 @@ CLNF & CLNF::operator= (const CLNF& other)
this->eye_model = other.eye_model;
// Load the CascadeClassifier (as it does not have a proper copy constructor)
if(!face_detector_location.empty())
if(!haar_face_detector_location.empty())
{
this->face_detector_HAAR.load(face_detector_location);
this->face_detector_HAAR.load(haar_face_detector_location);
}
// Make sure the matrices are allocated properly
this->triangulations.resize(other.triangulations.size());
@@ -149,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;
}
@@ -172,7 +176,8 @@ CLNF::CLNF(const CLNF&& other)
landmark_likelihoods = other.landmark_likelihoods;
patch_experts = other.patch_experts;
landmark_validator = other.landmark_validator;
face_detector_location = other.face_detector_location;
haar_face_detector_location = other.haar_face_detector_location;
mtcnn_face_detector_location = other.mtcnn_face_detector_location;
face_detector_HAAR = other.face_detector_HAAR;
@@ -181,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;
@@ -207,7 +214,8 @@ CLNF & CLNF::operator= (const CLNF&& other)
landmark_likelihoods = other.landmark_likelihoods;
patch_experts = other.patch_experts;
landmark_validator = other.landmark_validator;
face_detector_location = other.face_detector_location;
haar_face_detector_location = other.haar_face_detector_location;
mtcnn_face_detector_location = other.mtcnn_face_detector_location;
face_detector_HAAR = other.face_detector_HAAR;
@@ -216,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;